diff --git a/.coderabbit.yaml b/.coderabbit.yaml
new file mode 100644
index 000000000..94eb553aa
--- /dev/null
+++ b/.coderabbit.yaml
@@ -0,0 +1,66 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+
+language: 'en-US'
+early_access: false
+tone_instructions: 'You are an expert code reviewer in TypeScript, JavaScript, NodeJS, and ElectronJS. You work in an enterprise software developer team, providing concise and clear code review advice. You only elaborate or provide detailed explanations when requested.'
+
+knowledge_base:
+  opt_out: false
+  code_guidelines:
+    enabled: true
+    filePatterns:
+      - '**/CODING_STANDARDS.md'
+
+reviews:
+  profile: 'chill'
+  request_changes_workflow: false
+  high_level_summary: true
+  poem: true
+  review_status: true
+  collapse_walkthrough: false
+  auto_review:
+    enabled: true
+    drafts: false
+    base_branches: ['main', 'release/*']
+  path_instructions:
+    - path: 'tests/**/**.*'
+      instructions: |
+        Review the following e2e test code written using the Playwright test library. Ensure that:
+        - Follow best practices for Playwright code and e2e automation
+        - Try to reduce usage of `page.waitForTimeout();` in code unless absolutely necessary and the locator cannot be found using existing `expect()` playwright calls
+        - Avoid using `page.pause()` in code
+        - Use locator variables for locators
+        - Avoid using test.only
+        - Use multiple assertions
+        - Promote the use of `test.step` as much as possible so the generated reports are easier to read
+        - Ensure that the `fixtures` like the collections are nested inside the `fixtures` folder 
+          
+
+
+          **Fixture Example***: Here's an example of possible fixture and test pair
+          ```
+          .
+          ├── fixtures
+          │   └── collection
+          │       ├── base.bru
+          │       ├── bruno.json
+          │       ├── collection.bru
+          │       ├── ws-test-request-with-headers.bru
+          │       ├── ws-test-request-with-subproto.bru
+          │       └── ws-test-request.bru
+          ├── connection.spec.ts # <- Depends on the collection in ./fixtures/collection
+          ├── headers.spec.ts
+          ├── persistence.spec.ts
+          ├── variable-interpolation
+          │   ├── fixtures
+          │   │   └── collection
+          │   │       ├── environments
+          │   │       ├── bruno.json
+          │   │       └── ws-interpolation-test.bru
+          │   ├── init-user-data
+          │   └── variable-interpolation.spec.ts # <- Depends on the collection in ./variable-interpolation/fixtures/collection
+          └── subproto.spec.ts
+          ```
+
+chat:
+  auto_reply: true
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b18db1b88..bcade316d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,10 @@
-# Description
+### Description
 
 <!-- Explain here the changes your PR introduces and text to help us understand the context of this change. -->
 
-### Contribution Checklist:
+#### Contribution Checklist:
 
+- [ ] **I've used AI significantly to create this pull request**
 - [ ] **The pull request only addresses one issue or adds one feature.**
 - [ ] **The pull request does not introduce any breaking changes**
 - [ ] **I have added screenshots or gifs to help explain the change if applicable.**
@@ -12,6 +13,6 @@
 
 Note: Keeping the PR small and focused helps make it easier to review and merge. If you have multiple changes you want to make, please consider submitting them as separate pull requests.
 
-### Publishing to New Package Managers
+#### Publishing to New Package Managers
 
 Please see [here](../publishing.md) for more information.
diff --git a/.github/actions/common/setup-node-deps/action.yml b/.github/actions/common/setup-node-deps/action.yml
index f99758768..66c32f298 100644
--- a/.github/actions/common/setup-node-deps/action.yml
+++ b/.github/actions/common/setup-node-deps/action.yml
@@ -23,4 +23,5 @@ runs:
         npm run sandbox:bundle-libraries --workspace=packages/bruno-js
         npm run build:bruno-converters
         npm run build:bruno-requests
+        npm run build:schema-types
         npm run build:bruno-filestore
diff --git a/.github/workflows/npm-bru-cli.yml b/.github/workflows/npm-bru-cli.yml
index 81771232a..1c323dd99 100644
--- a/.github/workflows/npm-bru-cli.yml
+++ b/.github/workflows/npm-bru-cli.yml
@@ -25,7 +25,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
@@ -40,7 +40,7 @@ jobs:
         run: |
           cd packages/bruno-tests/collection
           npm install
-          bru run --env Prod --output junit.xml --format junit
+          bru run --env Prod --output junit.xml --format junit --sandbox developer
 
       - name: Publish Test Report
         uses: dorny/test-reporter@v2
diff --git a/.github/workflows/ssl-tests.yml b/.github/workflows/ssl-tests.yml
index ffda21137..d2d7ec7fb 100644
--- a/.github/workflows/ssl-tests.yml
+++ b/.github/workflows/ssl-tests.yml
@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Node Dependencies
         uses: ./.github/actions/common/setup-node-deps
@@ -44,7 +44,7 @@ jobs:
       pull-requests: write
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Node Dependencies
         uses: ./.github/actions/common/setup-node-deps
@@ -73,7 +73,7 @@ jobs:
       pull-requests: write
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       
       - name: Setup Node Dependencies
         uses: ./.github/actions/common/setup-node-deps
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ffbe6df2f..833ceecff 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
@@ -30,6 +30,7 @@ jobs:
           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-schema-types
           npm run build --workspace=packages/bruno-filestore
 
       - name: Lint Check
@@ -66,7 +67,7 @@ jobs:
       pull-requests: write
       contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
@@ -83,6 +84,7 @@ jobs:
           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-schema-types
           npm run build --workspace=packages/bruno-filestore
 
       - name: Run Local Testbench
@@ -94,7 +96,7 @@ jobs:
         run: |
           cd packages/bruno-tests/collection
           npm install
-          node ../../bruno-cli/bin/bru.js run --env Prod --output junit.xml --format junit
+          node ../../bruno-cli/bin/bru.js run --env Prod --output junit.xml --format junit --sandbox developer
 
       - name: Publish Test Report
         uses: EnricoMi/publish-unit-test-result-action@v2
@@ -108,7 +110,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-node@v5
       with:
         node-version: v22.11.x
@@ -134,12 +136,13 @@ jobs:
         npm run sandbox:bundle-libraries --workspace=packages/bruno-js
         npm run build:bruno-converters
         npm run build:bruno-requests
+        npm run build:schema-types
         npm run build:bruno-filestore
 
     - name: Run Playwright tests
       run: |
         xvfb-run npm run test:e2e
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v5
       if: ${{ !cancelled() }}
       with:
         name: playwright-report
diff --git a/.gitignore b/.gitignore
index 9331b13ff..0ff231d00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,12 @@ bruno.iml
 
 # Playwright
 /blob-report/
+
+# Development plan files
+*.plan.md
+
+# packages dist
+packages/bruno-filestore/dist
+packages/bruno-requests/dist
+packages/bruno-schema-types/dist
+packages/bruno-converters/dist
diff --git a/CODING_STANDARDS.md b/CODING_STANDARDS.md
new file mode 100644
index 000000000..400e8f51a
--- /dev/null
+++ b/CODING_STANDARDS.md
@@ -0,0 +1,78 @@
+# Bruno Coding Standards
+
+- No diffs unless an actual change is made, the code changes need to be as minimal as possible, avoid making un-necessary whitespace diffs. This is already handled by eslint but make sure you check your code changes before commiting and raising a PR.
+
+## General Style Rules
+
+- Use 2 spaces for indentation. No tabs, just spaces – keeps everything neat and uniform.
+
+- Stick to single quotes for strings. Double quotes are cool elsewhere, but here we go single.
+
+- Always add semicolons at the end of statements. It's like putting a period at the end of a sentence – clarity matters.
+
+- JSX is enabled, so feel free to use it where it makes sense.
+
+## Punctuation and Spacing
+
+- No trailing commas. Keep it clean, no extra commas hanging around.
+
+- Always use parentheses around parameters in arrow functions. Even for single params – consistency is key.
+
+- For multiline constructs, put opening braces on the same line, and ensure consistency. Minimum 2 elements for multiline.
+
+- No newlines inside function parentheses. Keep 'em tight.
+
+- Space before and after the arrow in arrow functions. `() => {}` is good.
+
+- No space between function name and parentheses. `func()` not `func ()`.
+
+- Semicolons go at the end of the line, not on a new line.
+
+- No strict max length – write readable code, not cramped lines.
+
+- Multiple expressions per line in JSX are fine – flexibility is nice.
+
+Remember, these rules are here to make our codebase harmonious. If something doesn't fit perfectly, let's chat about it. Happy coding! 🚀
+
+
+## Tests 
+
+- Add tests for any new functionality or meaningful changes. If code is added, removed, or significantly modified, corresponding tests should be updated or created.
+ 
+- Prioritise high-value tests over maximum coverage. Focus on testing behaviour that is critical, complex, or likely to break—don’t chase coverage numbers for their own sake.
+
+- Write behaviour-driven tests, not implementation-driven ones. Tests should validate real expected output and observable behaviour, not internal details or mocked-out logic unless absolutely necessary.
+
+- Minimise mocking unless it meaningfully increases clarity or isolates external dependencies. Prefer real flows where practical; only mock external services, slow systems, or non-deterministic behaviour.
+
+- Keep tests readable and maintainable. Optimise for clarity over cleverness. Name tests descriptively, keep setup minimal, and avoid unnecessary abstraction.
+
+- Aim for tests that fail usefully. When a test fails, it should clearly indicate what behaviour broke and why.
+
+- Cover both the “happy path” and the realistically problematic paths. Validate expected success behaviour, but also validate error handling, edge cases, and degraded-mode behaviour when appropriate.
+
+- Ensure tests are deterministic and reproducible. No randomness, timing dependencies, or environment-specific assumptions without explicit control.
+
+- Avoid overfitting tests to current behaviour if future flexibility matters. Only assert what needs to be true, not incidental details.
+
+- Use consistent patterns and helper utilities where they improve clarity. Prefer shared test utilities over copy-pasted setup code, but only when it actually reduces complexity.
+
+- Tests should be fast enough to run continuously. Avoid long-running operations unless absolutely necessary; prefer lightweight fixtures and isolated units.
+
+
+## UI Specific instructions 
+
+### React
+
+- Use styled component's theme prop to manage CSS colors and not CSS variables when in the context of a styled component or any react component using the styled component 
+- Styled Components are used as wrappers to define both self and children components style, tailwind classes are used specifically for layout based styles. 
+- Styled Component CSS might also change layout but tailwind classes shouldn't define colors. 
+
+## Readability and Abstractions
+
+- Avoid abstractions unless the exact same code is being used in more than 3 places.
+- Names for functions need to be concise and descriptive.
+- Add in JSDoc comments to add more details to the abstractions if needed.
+- Follow functional programming but just enough to be readable, we don't need to go as deep as ADTs and Monads, we want to keep the code pipeline obvious and easy for everyone to read and contribute to.
+- Avoid single line abstractions where all that's being done is increasing the call stack with one additional function.
+- Add in meaningful comments instead of obvious ones where complex code flow is explained properly.
diff --git a/contributing.md b/contributing.md
index 6206d59f5..988dcf36d 100644
--- a/contributing.md
+++ b/contributing.md
@@ -70,6 +70,7 @@ npm run build:bruno-query
 npm run build:bruno-common
 npm run build:bruno-converters
 npm run build:bruno-requests
+npm run build:schema-types
 npm run build:bruno-filestore
 
 # bundle js sandbox libraries
diff --git a/eslint.config.js b/eslint.config.js
index 523623f28..2ac40a269 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,6 +1,6 @@
 // eslint.config.js
-const { defineConfig } = require("eslint/config");
-const globals = require("globals");
+const { defineConfig } = require('eslint/config');
+const globals = require('globals');
 const { fixupPluginRules } = require('@eslint/compat');
 const eslintPluginDiff = require('eslint-plugin-diff');
 
@@ -11,6 +11,16 @@ const runESMImports = async () => {
 };
 
 module.exports = runESMImports().then(() => defineConfig([
+  // Global ignores - must be a standalone object with ONLY ignores
+  {
+    ignores: [
+      '**/node_modules/**/*',
+      '**/dist/**/*',
+      '**/*.bru',
+      'packages/bruno-js/src/sandbox/bundle-browser-rollup.js',
+      'packages/bruno-app/public/static/**/*'
+    ]
+  },
   {
     plugins: {
       'diff': fixupPluginRules(eslintPluginDiff),
@@ -34,13 +44,13 @@ module.exports = runESMImports().then(() => defineConfig([
       'packages/bruno-converters/**/*.js',
       'packages/bruno-electron/**/*.js',
       'packages/bruno-filestore/**/*.ts',
+      'packages/bruno-schema-types/**/*.ts',
       'packages/bruno-js/**/*.js',
       'packages/bruno-lang/**/*.js',
       'packages/bruno-requests/**/*.ts',
       'packages/bruno-requests/**/*.js',
       'packages/bruno-tests/**/*.{js,ts}'
     ],
-    processor: 'diff/diff',
     rules: {
       ...stylistic.configs.customize({
         indent: 2,
@@ -56,7 +66,7 @@ module.exports = runESMImports().then(() => defineConfig([
         minElements: 2,
         consistent: true
       }],
-      '@stylistic/function-paren-newline': ['error', 'never'],
+      '@stylistic/function-paren-newline': ['off'],
       '@stylistic/array-bracket-spacing': ['error', 'never'],
       '@stylistic/arrow-spacing': ['error', { before: true, after: true }],
       '@stylistic/function-call-spacing': ['error', 'never'],
@@ -64,12 +74,14 @@ module.exports = runESMImports().then(() => defineConfig([
       '@stylistic/padding-line-between-statements': ['off'],
       '@stylistic/semi-style': ['error', 'last'],
       '@stylistic/max-len': ['off'],
-      '@stylistic/jsx-one-expression-per-line': ['off']
+      '@stylistic/jsx-one-expression-per-line': ['off'],
+      '@stylistic/max-statements-per-line': ['off'],
+      '@stylistic/no-mixed-operators': ['off']
     }
   },
   {
-    files: ["packages/bruno-app/**/*.{js,jsx,ts}"],
-    ignores: ["**/*.config.js", "**/public/**/*"],
+    files: ['packages/bruno-app/**/*.{js,jsx,ts}'],
+    ignores: ['**/*.config.js', '**/public/**/*'],
     languageOptions: {
       globals: {
         ...globals.browser,
@@ -82,114 +94,114 @@ module.exports = runESMImports().then(() => defineConfig([
       },
       parserOptions: {
         ecmaFeatures: {
-          jsx: true,
-        },
-      },
+          jsx: true
+        }
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      '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"],
+    files: ['packages/bruno-app/src/test-utils/mocks/codemirror.js'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
-      },
+        ...globals.jest
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-cli/**/*.js"],
-    ignores: ["**/*.config.js"],
+    files: ['packages/bruno-cli/**/*.js'],
+    ignores: ['**/*.config.js'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
+        ...globals.jest
       },
       parserOptions: {
-        ecmaVersion: "latest"
-      },
+        ecmaVersion: 'latest'
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-common/**/*.ts"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
+    files: ['packages/bruno-common/**/*.ts'],
+    ignores: ['**/*.config.js', '**/dist/**/*'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
+        ...globals.jest
       },
-      parser: require("@typescript-eslint/parser"),
+      parser: require('@typescript-eslint/parser'),
       parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-        project: "./packages/bruno-common/tsconfig.json",
-      },
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        project: './packages/bruno-common/tsconfig.json'
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-converters/**/*.js"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
+    files: ['packages/bruno-converters/**/*.js'],
+    ignores: ['**/*.config.js', '**/dist/**/*'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
+        ...globals.jest
       },
       parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
+        ecmaVersion: 'latest',
+        sourceType: 'module'
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-electron/**/*.js"],
-    ignores: ["**/*.config.js", "**/web/**/*"],
+    files: ['packages/bruno-electron/**/*.js'],
+    ignores: ['**/*.config.js', '**/web/**/*'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
-      },
+        ...globals.jest
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-filestore/**/*.ts"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
+    files: ['packages/bruno-filestore/**/*.ts'],
+    ignores: ['**/*.config.js', '**/dist/**/*'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
+        ...globals.jest
       },
-      parser: require("@typescript-eslint/parser"),
+      parser: require('@typescript-eslint/parser'),
       parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-        project: "./packages/bruno-filestore/tsconfig.json",
-      },
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        project: './packages/bruno-filestore/tsconfig.json'
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-js/**/*.js"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
+    files: ['packages/bruno-js/**/*.js'],
+    ignores: ['**/*.config.js', '**/dist/**/*'],
     languageOptions: {
       globals: {
         ...globals.node,
@@ -200,65 +212,65 @@ module.exports = runESMImports().then(() => defineConfig([
         typeDetectGlobalObject: false
       },
       parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
+        ecmaVersion: 'latest',
+        sourceType: 'module'
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-lang/**/*.js"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
+    files: ['packages/bruno-lang/**/*.js'],
+    ignores: ['**/*.config.js', '**/dist/**/*'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
+        ...globals.jest
       },
       parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
+        ecmaVersion: 'latest',
+        sourceType: 'module'
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-requests/**/*.ts"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
+    files: ['packages/bruno-requests/**/*.ts'],
+    ignores: ['**/*.config.js', '**/dist/**/*'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
+        ...globals.jest
       },
-      parser: require("@typescript-eslint/parser"),
+      parser: require('@typescript-eslint/parser'),
       parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-        project: "./packages/bruno-requests/tsconfig.json",
-      },
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        project: './packages/bruno-requests/tsconfig.json'
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
+      'no-undef': 'error'
+    }
   },
   {
-    files: ["packages/bruno-requests/**/*.js"],
-    ignores: ["**/*.config.js", "**/dist/**/*"],
+    files: ['packages/bruno-requests/**/*.js'],
+    ignores: ['**/*.config.js', '**/dist/**/*'],
     languageOptions: {
       globals: {
         ...globals.node,
-        ...globals.jest,
+        ...globals.jest
       },
       parserOptions: {
-        ecmaVersion: "latest",
-        sourceType: "module",
-      },
+        ecmaVersion: 'latest',
+        sourceType: 'module'
+      }
     },
     rules: {
-      "no-undef": "error",
-    },
-  },
+      'no-undef': 'error'
+    }
+  }
 ]));
diff --git a/package-lock.json b/package-lock.json
index decb6c7cc..769d50f48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
         "packages/bruno-common",
         "packages/bruno-converters",
         "packages/bruno-schema",
+        "packages/bruno-schema-types",
         "packages/bruno-query",
         "packages/bruno-js",
         "packages/bruno-lang",
@@ -3554,6 +3555,16 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/@develar/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/@develar/schema-utils/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -3906,7 +3917,7 @@
         "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
@@ -4469,9 +4480,9 @@
       }
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5067,6 +5078,98 @@
         "jsep": "^0.4.0||^1.0.0"
       }
     },
+    "node_modules/@lydell/node-pty": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lydell/node-pty/-/node-pty-1.1.0.tgz",
+      "integrity": "sha512-VDD8LtlMTOrPKWMXUAcB9+LTktzuunqrMwkYR1DMRBkS6LQrCt+0/Ws1o2rMml/n3guePpS7cxhHF7Nm5K4iMw==",
+      "license": "MIT",
+      "optionalDependencies": {
+        "@lydell/node-pty-darwin-arm64": "1.1.0",
+        "@lydell/node-pty-darwin-x64": "1.1.0",
+        "@lydell/node-pty-linux-arm64": "1.1.0",
+        "@lydell/node-pty-linux-x64": "1.1.0",
+        "@lydell/node-pty-win32-arm64": "1.1.0",
+        "@lydell/node-pty-win32-x64": "1.1.0"
+      }
+    },
+    "node_modules/@lydell/node-pty-darwin-arm64": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lydell/node-pty-darwin-arm64/-/node-pty-darwin-arm64-1.1.0.tgz",
+      "integrity": "sha512-7kFD+owAA61qmhJCtoMbqj3Uvff3YHDiU+4on5F2vQdcMI3MuwGi7dM6MkFG/yuzpw8LF2xULpL71tOPUfxs0w==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@lydell/node-pty-darwin-x64": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lydell/node-pty-darwin-x64/-/node-pty-darwin-x64-1.1.0.tgz",
+      "integrity": "sha512-XZdvqj5FjAMjH8bdp0YfaZjur5DrCIDD1VYiE9EkkYVMDQqRUPHYV3U8BVEQVT9hYfjmpr7dNaELF2KyISWSNA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@lydell/node-pty-linux-arm64": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lydell/node-pty-linux-arm64/-/node-pty-linux-arm64-1.1.0.tgz",
+      "integrity": "sha512-yyDBmalCfHpLiQMT2zyLcqL2Fay4Xy7rIs8GH4dqKLnEviMvPGOK7LADVkKAsbsyXBSISL3Lt1m1MtxhPH6ckg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@lydell/node-pty-linux-x64": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lydell/node-pty-linux-x64/-/node-pty-linux-x64-1.1.0.tgz",
+      "integrity": "sha512-NcNqRTD14QT+vXcEuqSSvmWY+0+WUBn2uRE8EN0zKtDpIEr9d+YiFj16Uqds6QfcLCHfZmC+Ls7YzwTaqDnanA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@lydell/node-pty-win32-arm64": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lydell/node-pty-win32-arm64/-/node-pty-win32-arm64-1.1.0.tgz",
+      "integrity": "sha512-JOMbCou+0fA7d/m97faIIfIU0jOv8sn2OR7tI45u3AmldKoKoLP8zHY6SAvDDnI3fccO1R2HeR1doVjpS7HM0w==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@lydell/node-pty-win32-x64": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lydell/node-pty-win32-x64/-/node-pty-win32-x64-1.1.0.tgz",
+      "integrity": "sha512-3N56BZ+WDFnUMYRtsrr7Ky2mhWGl9xXcyqR6cexfuCqcz9RNWL+KoXRv/nZylY5dYaXkft4JaR1uVu+roiZDAw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@malept/flatpak-bundler": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz",
@@ -5566,6 +5669,13 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@opencollection/types": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@opencollection/types/-/types-0.1.0.tgz",
+      "integrity": "sha512-/v64ShE+KyDUAfAlO6Qd5wBwPArd603VC44eife/CdmrtPUSIiFBYcZ9gxAD7LlW99J36wb5IkMpKFDvViINiA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@parcel/watcher": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
@@ -6964,25 +7074,6 @@
         "@rsbuild/core": "1.x"
       }
     },
-    "node_modules/@rsbuild/plugin-sass/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/@rsbuild/plugin-sass/node_modules/postcss": {
       "version": "8.4.49",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
@@ -8232,12 +8323,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/google-protobuf": {
-      "version": "3.15.12",
-      "resolved": "https://registry.npmjs.org/@types/google-protobuf/-/google-protobuf-3.15.12.tgz",
-      "integrity": "sha512-40um9QqwHjRS92qnOaDpL7RmDK15NuZYo9HihiJRbYkMQZlWnuH8AdvbMy8/o6lgLmKbDUKa+OALCltHdbOTpQ==",
-      "license": "MIT"
-    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -8373,9 +8458,9 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
-      "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
       "license": "MIT"
     },
     "node_modules/@types/lodash-es": {
@@ -8388,15 +8473,6 @@
         "@types/lodash": "*"
       }
     },
-    "node_modules/@types/lodash.set": {
-      "version": "4.3.9",
-      "resolved": "https://registry.npmjs.org/@types/lodash.set/-/lodash.set-4.3.9.tgz",
-      "integrity": "sha512-KOxyNkZpbaggVmqbpr82N2tDVTx05/3/j0f50Es1prxrWB0XYf9p3QNxqcbWb7P1Q9wlvsUSlCFnwlPCIJ46PQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
     "node_modules/@types/markdown-it": {
       "version": "12.2.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
@@ -8422,6 +8498,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/nanoid": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/nanoid/-/nanoid-2.1.0.tgz",
+      "integrity": "sha512-xdkn/oRTA0GSNPLIKZgHWqDTWZsVrieKomxJBOQUK9YDD+zfSgmwD5t4WJYra5S7XyhTw7tfvwznW+pFexaepQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/node": {
       "version": "22.15.17",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.17.tgz",
@@ -8858,6 +8943,10 @@
       "resolved": "packages/bruno-schema",
       "link": true
     },
+    "node_modules/@usebruno/schema-types": {
+      "resolved": "packages/bruno-schema-types",
+      "link": true
+    },
     "node_modules/@usebruno/tests": {
       "resolved": "packages/bruno-tests",
       "link": true
@@ -8866,22 +8955,6 @@
       "resolved": "packages/bruno-toml",
       "link": true
     },
-    "node_modules/@usebruno/vm2": {
-      "version": "3.9.19",
-      "resolved": "https://registry.npmjs.org/@usebruno/vm2/-/vm2-3.9.19.tgz",
-      "integrity": "sha512-WIrR9ODN2xkwUEoJb3awhCZO2dTgq8NWoObofAGuzFQOQ27rw96d2GJU/T8OKcygjfJiNei9nuqidyMh81kiug==",
-      "license": "MIT",
-      "dependencies": {
-        "acorn": "^8.7.0",
-        "acorn-walk": "^8.2.0"
-      },
-      "bin": {
-        "vm2": "bin/vm2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
     "node_modules/@web/rollup-plugin-copy": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/@web/rollup-plugin-copy/-/rollup-plugin-copy-0.5.1.tgz",
@@ -9152,6 +9225,21 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@xterm/addon-fit": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
+      "integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@xterm/xterm": "^5.0.0"
+      }
+    },
+    "node_modules/@xterm/xterm": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
+      "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==",
+      "license": "MIT"
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -9224,6 +9312,7 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -9257,6 +9346,7 @@
       "version": "8.3.4",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
       "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.0"
@@ -9321,16 +9411,6 @@
         }
       }
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/amdefine": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz",
@@ -11654,7 +11734,7 @@
       "dependencies": {
         "env-paths": "^2.2.1",
         "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "parse-json": "^5.2.0"
       },
       "engines": {
@@ -15183,9 +15263,9 @@
       }
     },
     "node_modules/google-protobuf": {
-      "version": "3.21.4",
-      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.4.tgz",
-      "integrity": "sha512-MnG7N936zcKTco4Jd2PX2U96Kf9PxygAPKBug+74LHzmHXmceN16MmRcdgZv+DGef/S9YvQAfRsNCn4cjf9yyQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-4.0.0.tgz",
+      "integrity": "sha512-b8wmenhUMf2WNL+xIJ/slvD/hEE6V3nRnG86O2bzkBrMweM9gnqZE1dfXlDjibY3aXJXDNbAHepevYyQ7qWKsQ==",
       "license": "(BSD-3-Clause AND Apache-2.0)"
     },
     "node_modules/gopd": {
@@ -15312,20 +15392,18 @@
         "node": ">= 6"
       }
     },
-    "node_modules/grpc-reflection-js": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/grpc-reflection-js/-/grpc-reflection-js-0.3.0.tgz",
-      "integrity": "sha512-3lhTlQluPxVgbowCXA3tAZC3RJW+GSOUkguLNYl1QffYRiutUB3RDfPkQFTcrCFJgNiIIxx+iJkr8s3uSp3zWA==",
+    "node_modules/grpc-js-reflection-client": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/grpc-js-reflection-client/-/grpc-js-reflection-client-1.3.0.tgz",
+      "integrity": "sha512-eJ5/m1pXpcheSjOGExktU69WPUKnL4Su3IxGJYYYjy3/w19vE8dH7Wi46G5T92bpM0eZWftjiM5HduX8CjPq9w==",
       "license": "MIT",
       "dependencies": {
-        "@types/google-protobuf": "^3.7.2",
-        "@types/lodash.set": "^4.3.6",
-        "google-protobuf": "^3.12.2",
-        "lodash.set": "^4.3.2",
-        "protobufjs": "^7.2.2"
+        "@types/lodash": "^4.17.15",
+        "lodash": "^4.17.21",
+        "protobufjs": "^7.4.0"
       },
       "peerDependencies": {
-        "@grpc/grpc-js": "^1.0.0"
+        "@grpc/grpc-js": "^1.12.6"
       }
     },
     "node_modules/har-schema": {
@@ -17804,9 +17882,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -18634,12 +18712,6 @@
       "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
       "license": "MIT"
     },
-    "node_modules/lodash.set": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
-      "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==",
-      "license": "MIT"
-    },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
@@ -19436,6 +19508,24 @@
       "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==",
       "license": "MIT"
     },
+    "node_modules/nanoid": {
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/native-reg": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/native-reg/-/native-reg-1.1.1.tgz",
@@ -21264,25 +21354,6 @@
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "license": "MIT"
     },
-    "node_modules/postcss/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/posthog-node": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-4.2.1.tgz",
@@ -22291,7 +22362,7 @@
         "config-file-ts": "^0.2.4",
         "dotenv": "^9.0.2",
         "dotenv-expand": "^5.1.0",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "json5": "^2.2.0",
         "lazy-val": "^1.0.4"
       },
@@ -23758,6 +23829,16 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/schema-utils/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -26867,6 +26948,8 @@
         "@usebruno/common": "0.1.0",
         "@usebruno/graphql-docs": "0.1.0",
         "@usebruno/schema": "0.7.0",
+        "@xterm/addon-fit": "^0.10.0",
+        "@xterm/xterm": "^5.5.0",
         "classnames": "^2.3.1",
         "codemirror": "5.65.2",
         "codemirror-graphql": "2.1.1",
@@ -26883,6 +26966,7 @@
         "graphiql": "3.7.1",
         "graphql": "^16.6.0",
         "graphql-request": "^3.7.0",
+        "hexy": "^0.3.5",
         "httpsnippet": "^3.0.9",
         "i18next": "24.1.2",
         "idb": "^7.0.0",
@@ -26893,6 +26977,7 @@
         "jsonc-parser": "^3.2.1",
         "jsonpath-plus": "^10.3.0",
         "know-your-http-well": "^0.5.0",
+        "linkify-it": "^5.0.0",
         "lodash": "^4.17.21",
         "markdown-it": "^13.0.2",
         "markdown-it-replace-link": "^1.2.0",
@@ -28442,6 +28527,15 @@
         "node": ">=18.0.0"
       }
     },
+    "packages/bruno-app/node_modules/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "license": "MIT",
+      "dependencies": {
+        "uc.micro": "^2.0.0"
+      }
+    },
     "packages/bruno-app/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -28449,24 +28543,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "packages/bruno-app/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "packages/bruno-app/node_modules/semver": {
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
@@ -28490,6 +28566,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "packages/bruno-app/node_modules/uc.micro": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "license": "MIT"
+    },
     "packages/bruno-app/node_modules/update-browserslist-db": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
@@ -28533,7 +28615,6 @@
         "@usebruno/js": "0.12.0",
         "@usebruno/lang": "0.12.0",
         "@usebruno/requests": "^0.1.0",
-        "@usebruno/vm2": "^3.9.13",
         "aws4-axios": "^3.3.0",
         "axios": "^1.8.3",
         "axios-ntlm": "^1.4.2",
@@ -28545,7 +28626,7 @@
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
         "iconv-lite": "^0.6.3",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "lodash": "^4.17.21",
         "qs": "^6.11.0",
         "socks-proxy-agent": "^8.0.2",
@@ -30169,7 +30250,7 @@
       "license": "MIT",
       "dependencies": {
         "@usebruno/schema": "^0.7.0",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "jscodeshift": "^17.3.0",
         "lodash": "^4.17.21",
         "nanoid": "3.3.8",
@@ -30239,24 +30320,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "packages/bruno-converters/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "packages/bruno-converters/node_modules/rimraf": {
       "version": "5.0.10",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
@@ -30280,6 +30343,7 @@
         "@aws-sdk/credential-providers": "3.750.0",
         "@grpc/grpc-js": "^1.13.2",
         "@grpc/proto-loader": "^0.7.13",
+        "@lydell/node-pty": "^1.1.0",
         "@usebruno/common": "0.1.0",
         "@usebruno/converters": "^0.1.0",
         "@usebruno/filestore": "^0.1.0",
@@ -30288,7 +30352,6 @@
         "@usebruno/node-machine-id": "^2.0.0",
         "@usebruno/requests": "^0.1.0",
         "@usebruno/schema": "0.7.0",
-        "@usebruno/vm2": "^3.9.13",
         "about-window": "^1.15.2",
         "aws4-axios": "^3.3.0",
         "axios": "^1.8.3",
@@ -30310,7 +30373,7 @@
         "https-proxy-agent": "^7.0.2",
         "iconv-lite": "^0.6.3",
         "is-valid-path": "^0.1.1",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "lodash": "^4.17.21",
         "mime-types": "^2.1.35",
         "nanoid": "3.3.8",
@@ -31550,7 +31613,7 @@
         "hosted-git-info": "^4.1.0",
         "is-ci": "^3.0.0",
         "isbinaryfile": "^5.0.0",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "lazy-val": "^1.0.5",
         "minimatch": "^5.1.1",
         "read-config-file": "6.3.2",
@@ -31597,7 +31660,7 @@
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.1",
         "is-ci": "^3.0.0",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "source-map-support": "^0.5.19",
         "stat-mode": "^1.0.0",
         "temp-file": "^3.4.0"
@@ -31728,7 +31791,7 @@
         "builder-util-runtime": "9.2.4",
         "fs-extra": "^10.1.0",
         "iconv-lite": "^0.6.2",
-        "js-yaml": "^4.1.0"
+        "js-yaml": "^4.1.1"
       },
       "optionalDependencies": {
         "dmg-license": "^1.0.11"
@@ -31811,24 +31874,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "packages/bruno-electron/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "packages/bruno-electron/node_modules/semver": {
       "version": "7.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
@@ -31858,20 +31903,27 @@
       "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
+        "@types/nanoid": "^2.1.0",
         "@usebruno/lang": "0.12.0",
-        "lodash": "^4.17.21"
+        "ajv": "^8.17.1",
+        "lodash": "^4.17.21",
+        "yaml": "^2.3.4"
       },
       "devDependencies": {
         "@babel/preset-env": "^7.22.0",
         "@babel/preset-typescript": "^7.22.0",
+        "@opencollection/types": "0.1.0",
         "@rollup/plugin-commonjs": "^23.0.2",
+        "@rollup/plugin-json": "^6.1.0",
         "@rollup/plugin-node-resolve": "^15.0.1",
-        "@rollup/plugin-typescript": "^9.0.2",
+        "@rollup/plugin-typescript": "^12.1.2",
         "@types/jest": "^29.5.11",
         "@types/lodash": "^4.14.191",
         "@types/node": "^24.1.0",
+        "@usebruno/schema-types": "0.0.1",
         "babel-jest": "^29.7.0",
         "jest": "^29.2.0",
+        "nanoid": "3.3.8",
         "rimraf": "^3.0.2",
         "rollup": "3.29.5",
         "rollup-plugin-dts": "^5.0.0",
@@ -31880,6 +31932,33 @@
         "typescript": "^4.8.4"
       }
     },
+    "packages/bruno-filestore/node_modules/@rollup/plugin-typescript": {
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
+      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.1.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0||^3.0.0||^4.0.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
+      }
+    },
     "packages/bruno-filestore/node_modules/@types/node": {
       "version": "24.1.0",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
@@ -31960,6 +32039,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "packages/bruno-filestore/node_modules/yaml": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+      "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      }
+    },
     "packages/bruno-graphql-docs": {
       "name": "@usebruno/graphql-docs",
       "version": "0.1.0",
@@ -32046,9 +32137,6 @@
         "@rollup/plugin-node-resolve": "^15.0.1",
         "rollup": "3.29.5",
         "rollup-plugin-terser": "^7.0.2"
-      },
-      "peerDependencies": {
-        "@usebruno/vm2": "^3.9.13"
       }
     },
     "packages/bruno-js/node_modules/axios": {
@@ -32062,24 +32150,6 @@
         "proxy-from-env": "^1.1.0"
       }
     },
-    "packages/bruno-js/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "packages/bruno-js/node_modules/xml-formatter": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/xml-formatter/-/xml-formatter-3.5.0.tgz",
@@ -32129,7 +32199,8 @@
         "@types/qs": "^6.9.18",
         "axios": "^1.9.0",
         "debug": "^4.4.3",
-        "grpc-reflection-js": "^0.3.0",
+        "google-protobuf": "^4.0.0",
+        "grpc-js-reflection-client": "^1.3.0",
         "is-ip": "^5.0.1",
         "system-ca": "^2.0.1",
         "tough-cookie": "^6.0.0",
@@ -32247,21 +32318,26 @@
         "yup": "^0.32.11"
       }
     },
-    "packages/bruno-schema/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
+    "packages/bruno-schema-types": {
+      "name": "@usebruno/schema-types",
+      "version": "0.0.1",
+      "license": "MIT",
+      "devDependencies": {
+        "typescript": "^5.0.0"
+      }
+    },
+    "packages/bruno-schema-types/node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
       "bin": {
-        "nanoid": "bin/nanoid.cjs"
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "node": ">=14.17"
       }
     },
     "packages/bruno-tests": {
@@ -32277,7 +32353,7 @@
         "express-basic-auth": "^1.2.1",
         "fast-xml-parser": "^5.0.8",
         "http-proxy": "^1.18.1",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "jsonwebtoken": "^9.0.2",
         "lodash": "^4.17.21",
         "multer": "^1.4.5-lts.1",
diff --git a/package.json b/package.json
index 520eaad33..c13afb087 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "packages/bruno-common",
     "packages/bruno-converters",
     "packages/bruno-schema",
+    "packages/bruno-schema-types",
     "packages/bruno-query",
     "packages/bruno-js",
     "packages/bruno-lang",
@@ -61,6 +62,7 @@
     "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:schema-types": "npm run build --workspace=packages/bruno-schema-types",
     "build:electron": "node ./scripts/build-electron.js",
     "build:electron:mac": "./scripts/build-electron.sh mac",
     "build:electron:win": "./scripts/build-electron.sh win",
diff --git a/packages/bruno-app/babel.config.js b/packages/bruno-app/babel.config.js
index e04b84e5e..a3be21ad1 100644
--- a/packages/bruno-app/babel.config.js
+++ b/packages/bruno-app/babel.config.js
@@ -6,4 +6,4 @@ module.exports = {
     }]
   ],
   plugins: ['babel-plugin-styled-components']
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-app/jest.config.js b/packages/bruno-app/jest.config.js
index fdab3f936..31cac61da 100644
--- a/packages/bruno-app/jest.config.js
+++ b/packages/bruno-app/jest.config.js
@@ -1,10 +1,10 @@
 module.exports = {
   rootDir: '.',
   transform: {
-    '^.+\\.[jt]sx?$': 'babel-jest',
+    '^.+\\.[jt]sx?$': 'babel-jest'
   },
   transformIgnorePatterns: [
-    "/node_modules/(?!strip-json-comments|nanoid|xml-formatter)/",
+    '/node_modules/(?!strip-json-comments|nanoid|xml-formatter)/'
   ],
   moduleNameMapper: {
     '^assets/(.*)$': '<rootDir>/src/assets/$1',
@@ -22,9 +22,9 @@ module.exports = {
   testEnvironment: 'jsdom',
   setupFilesAfterEnv: ['@testing-library/jest-dom'],
   setupFiles: [
-    '<rootDir>/jest.setup.js',
+    '<rootDir>/jest.setup.js'
   ],
   testMatch: [
     '<rootDir>/src/**/*.spec.[jt]s?(x)'
   ]
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-app/package.json b/packages/bruno-app/package.json
index a55bb9f64..9def0c5dd 100644
--- a/packages/bruno-app/package.json
+++ b/packages/bruno-app/package.json
@@ -21,6 +21,8 @@
     "@usebruno/common": "0.1.0",
     "@usebruno/graphql-docs": "0.1.0",
     "@usebruno/schema": "0.7.0",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/xterm": "^5.5.0",
     "classnames": "^2.3.1",
     "codemirror": "5.65.2",
     "codemirror-graphql": "2.1.1",
@@ -37,6 +39,7 @@
     "graphiql": "3.7.1",
     "graphql": "^16.6.0",
     "graphql-request": "^3.7.0",
+    "hexy": "^0.3.5",
     "httpsnippet": "^3.0.9",
     "i18next": "24.1.2",
     "idb": "^7.0.0",
@@ -47,6 +50,7 @@
     "jsonc-parser": "^3.2.1",
     "jsonpath-plus": "^10.3.0",
     "know-your-http-well": "^0.5.0",
+    "linkify-it": "^5.0.0",
     "lodash": "^4.17.21",
     "markdown-it": "^13.0.2",
     "markdown-it-replace-link": "^1.2.0",
diff --git a/packages/bruno-app/public/theme/dark.js b/packages/bruno-app/public/theme/dark.js
index b34340c81..417e6714a 100644
--- a/packages/bruno-app/public/theme/dark.js
+++ b/packages/bruno-app/public/theme/dark.js
@@ -1,6 +1,6 @@
 const darkTheme = {
-  brand: '#546de5',
-  text: 'rgb(52 52 52)',
+  'brand': '#546de5',
+  'text': 'rgb(52 52 52)',
   'primary-text': '#ffffff',
   'primary-theme': '#1e1e1e',
   'secondary-text': '#929292',
diff --git a/packages/bruno-app/public/theme/light.js b/packages/bruno-app/public/theme/light.js
index 6ba048f6a..ea37ebdae 100644
--- a/packages/bruno-app/public/theme/light.js
+++ b/packages/bruno-app/public/theme/light.js
@@ -1,6 +1,6 @@
 const lightTheme = {
-  brand: '#546de5',
-  text: 'rgb(52 52 52)',
+  'brand': '#546de5',
+  'text': 'rgb(52 52 52)',
   'primary-text': 'rgb(52 52 52)',
   'primary-theme': '#ffffff',
   'secondary-text': '#929292',
diff --git a/packages/bruno-app/src/components/Accordion/index.js b/packages/bruno-app/src/components/Accordion/index.js
index ed73921d7..e87e4bf9f 100644
--- a/packages/bruno-app/src/components/Accordion/index.js
+++ b/packages/bruno-app/src/components/Accordion/index.js
@@ -4,7 +4,7 @@ import { AccordionItem, AccordionHeader, AccordionContent } from './styledWrappe
 
 const AccordionContext = createContext();
 
-const Accordion = ({ children, defaultIndex }) => {
+const Accordion = ({ children, defaultIndex, dataTestId }) => {
   const [openIndex, setOpenIndex] = useState(defaultIndex);
 
   const toggleItem = (index) => {
@@ -13,7 +13,7 @@ const Accordion = ({ children, defaultIndex }) => {
 
   return (
     <AccordionContext.Provider value={{ openIndex, toggleItem }}>
-      <div>{children}</div>
+      <div data-testid={dataTestId}>{children}</div>
     </AccordionContext.Provider>
   );
 };
diff --git a/packages/bruno-app/src/components/BrunoSupport/index.js b/packages/bruno-app/src/components/BrunoSupport/index.js
index 190ef6ef4..545e1c56a 100644
--- a/packages/bruno-app/src/components/BrunoSupport/index.js
+++ b/packages/bruno-app/src/components/BrunoSupport/index.js
@@ -6,7 +6,7 @@ import StyledWrapper from './StyledWrapper';
 const BrunoSupport = ({ onClose }) => {
   return (
     <StyledWrapper>
-      <Modal size="sm" title={'Support'} handleCancel={onClose} hideFooter={true}>
+      <Modal size="sm" title="Support" handleCancel={onClose} hideFooter={true}>
         <div className="collection-options">
           <div className="mt-2">
             <a href="https://docs.usebruno.com" target="_blank" className="flex items-end">
diff --git a/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js b/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js
index ab007c662..fee6b92bc 100644
--- a/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CodeEditor/StyledWrapper.js
@@ -18,6 +18,33 @@ const StyledWrapper = styled.div`
     flex-direction: column-reverse;
   }
 
+  .CodeMirror-placeholder {
+    color: ${(props) => props.theme.text} !important;
+    opacity: 0.5 !important;
+  }
+
+  .CodeMirror-linenumber {
+    text-align: left !important;
+    padding-left: 3px !important;
+  }
+
+  /* Override default lint highlight background when emphasizing the gutter */
+  .CodeMirror-lint-line-error,
+  .CodeMirror-lint-line-warning {
+    background: none !important;
+  }
+
+  /* Style line numbers when there's a lint issue */
+  .CodeMirror-lint-line-error .CodeMirror-linenumber {
+    color: #d32f2f !important;
+    text-decoration: underline;
+  }
+
+  .CodeMirror-lint-line-warning .CodeMirror-linenumber {
+    color: #f57c00 !important;
+    text-decoration: underline;
+  }
+
   /* Removes the glow outline around the folded json */
   .CodeMirror-foldmarker {
     text-shadow: none;
@@ -73,41 +100,48 @@ const StyledWrapper = styled.div`
     }
   }
 
-  .cm-s-monokai span.cm-property,
-  .cm-s-monokai span.cm-attribute {
-    color: #9cdcfe !important;
-  }
-
-  .cm-s-monokai span.cm-string {
-    color: #ce9178 !important;
-  }
-
-  .cm-s-monokai span.cm-number {
-    color: #b5cea8 !important;
-  }
-
-  .cm-s-monokai span.cm-atom {
-    color: #569cd6 !important;
+  .cm-s-default, .cm-s-monokai {
+    span.cm-def {
+      color: ${(props) => props.theme.codemirror.tokens.definition} !important;
+    }
+    span.cm-property {
+      color: ${(props) => props.theme.codemirror.tokens.property} !important;
+    }
+    span.cm-string {
+      color: ${(props) => props.theme.codemirror.tokens.string} !important;
+    }
+    span.cm-number {
+      color: ${(props) => props.theme.codemirror.tokens.number} !important;
+    }
+    span.cm-atom {
+      color: ${(props) => props.theme.codemirror.tokens.atom} !important;
+    }
+    span.cm-variable {
+      color: ${(props) => props.theme.codemirror.tokens.variable} !important;
+    }
+    span.cm-keyword {
+      color: ${(props) => props.theme.codemirror.tokens.keyword} !important;
+    }
+    span.cm-comment {
+      color: ${(props) => props.theme.codemirror.tokens.comment} !important;
+    }
+    span.cm-operator {
+      color: ${(props) => props.theme.codemirror.tokens.operator} !important;
+    }
   }
 
+  /* Variable validation colors */
   .cm-variable-valid {
-    color: green;
+    color: #5fad89 !important; /* Soft sage */
   }
   .cm-variable-invalid {
-    color: red;
+    color: #d17b7b !important; /* Soft coral */
   }
 
   .CodeMirror-search-hint {
     display: inline;
   }
-
-  .cm-s-default span.cm-property {
-    color: #1f61a0 !important;
-  }
-
-  .cm-s-default span.cm-variable {
-    color: #397d13 !important;
-  }
+  
   
   //matching bracket fix
   .CodeMirror-matchingbracket {
@@ -126,6 +160,31 @@ const StyledWrapper = styled.div`
   .cm-search-current {
     background: rgba(255, 193, 7, 0.4);
   }
+
+  .lint-error-tooltip {
+    position: fixed;
+    z-index: 10000;
+    background: ${(props) => props.theme.codemirror.bg};
+    border-radius: ${(props) => props.theme.border.radius.base};
+    padding: 8px 12px;
+    max-width: 400px;
+    box-shadow: ${(props) => props.theme.shadow.sm};
+    font-size: ${(props) => props.theme.font.size.xs};
+    line-height: 1.5;
+    pointer-events: none;
+
+    .lint-tooltip-message {
+      padding: 2px 0;
+    }
+
+    .lint-tooltip-message.error {
+      color: ${(props) => props.theme.colors.text.danger};
+    }
+
+    .lint-tooltip-message.warning {
+      color: ${(props) => props.theme.colors.text.warning};
+    }
+  }
 `;
 
 export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/CodeEditor/index.js b/packages/bruno-app/src/components/CodeEditor/index.js
index 73fe15330..d139d1ec0 100644
--- a/packages/bruno-app/src/components/CodeEditor/index.js
+++ b/packages/bruno-app/src/components/CodeEditor/index.js
@@ -14,6 +14,8 @@ import * as jsonlint from '@prantlf/jsonlint';
 import { JSHINT } from 'jshint';
 import stripJsonComments from 'strip-json-comments';
 import { getAllVariables } from 'utils/collections';
+import { setupLinkAware } from 'utils/codemirror/linkAware';
+import { setupLintErrorTooltip } from 'utils/codemirror/lint-errors';
 import CodeMirrorSearch from 'components/CodeMirrorSearch';
 
 const CodeMirror = require('codemirror');
@@ -36,7 +38,8 @@ export default class CodeEditor extends React.Component {
     this.lintOptions = {
       esversion: 11,
       expr: true,
-      asi: true
+      asi: true,
+      highlightLines: true
     };
 
     this.state = {
@@ -49,19 +52,22 @@ export default class CodeEditor extends React.Component {
 
     const editor = (this.editor = CodeMirror(this._node, {
       value: this.props.value || '',
+      placeholder: '...',
       lineNumbers: true,
       lineWrapping: this.props.enableLineWrapping ?? true,
       tabSize: TAB_SIZE,
       mode: this.props.mode || 'application/ld+json',
-      brunoVarInfo: {
-        variables
-      },
+      brunoVarInfo: this.props.enableBrunoVarInfo !== false ? {
+        variables,
+        collection: this.props.collection,
+        item: this.props.item
+      } : false,
       keyMap: 'sublime',
       autoCloseBrackets: true,
       matchBrackets: true,
       showCursorWhenSelecting: true,
       foldGutter: true,
-      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter', 'CodeMirror-lint-markers'],
+      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
       lint: this.lintOptions,
       readOnly: this.props.readOnly,
       scrollbarStyle: 'overlay',
@@ -99,7 +105,7 @@ export default class CodeEditor extends React.Component {
         },
         'Cmd-H': 'replace',
         'Ctrl-H': 'replace',
-        Tab: function (cm) {
+        'Tab': function (cm) {
           cm.getSelection().includes('\n') || editor.getLine(cm.getCursor().line) == cm.getSelection()
             ? cm.execCommand('indentMore')
             : cm.replaceSelection('  ', 'end');
@@ -145,7 +151,7 @@ export default class CodeEditor extends React.Component {
           } else if (this.props.mode == 'application/xml') {
             var doc = new DOMParser();
             try {
-              //add header element and remove prefix namespaces for DOMParser
+              // add header element and remove prefix namespaces for DOMParser
               var dcm = doc.parseFromString(
                 '<a> ' + internal.replace(/(?<=\<|<\/)\w+:/g, '') + '</a>',
                 'application/xml'
@@ -182,7 +188,7 @@ 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);
@@ -191,7 +197,7 @@ export default class CodeEditor extends React.Component {
       this.addOverlay();
 
       const getAllVariablesHandler = () => getAllVariables(this.props.collection, this.props.item);
-      
+
       // Setup AutoComplete Helper for all modes
       const autoCompleteOptions = {
         showHintsFor: this.props.showHintsFor,
@@ -202,6 +208,11 @@ export default class CodeEditor extends React.Component {
         editor,
         autoCompleteOptions
       );
+
+      setupLinkAware(editor);
+
+      // Setup lint error tooltip on line number hover
+      this.cleanupLintErrorTooltip = setupLintErrorTooltip(editor);
     }
   }
 
@@ -227,6 +238,16 @@ export default class CodeEditor extends React.Component {
       if (!isEqual(variables, this.variables)) {
         this.addOverlay();
       }
+
+      // Update collection and item when they change
+      if (this.props.enableBrunoVarInfo !== false && this.editor.options.brunoVarInfo) {
+        if (!isEqual(this.props.collection, this.editor.options.brunoVarInfo.collection)) {
+          this.editor.options.brunoVarInfo.collection = this.props.collection;
+        }
+        if (!isEqual(this.props.item, this.editor.options.brunoVarInfo.item)) {
+          this.editor.options.brunoVarInfo.item = this.props.item;
+        }
+      }
     }
 
     if (this.props.theme !== prevProps.theme && this.editor) {
@@ -254,8 +275,13 @@ export default class CodeEditor extends React.Component {
 
   componentWillUnmount() {
     if (this.editor) {
+      this.editor?._destroyLinkAware?.();
       this.editor.off('change', this._onEdit);
       this.editor.off('scroll', this.onScroll);
+
+      // Clean up lint error tooltip
+      this.cleanupLintErrorTooltip?.();
+
       this.editor = null;
     }
   }
@@ -290,6 +316,11 @@ export default class CodeEditor extends React.Component {
     let variables = getAllVariables(this.props.collection, this.props.item);
     this.variables = variables;
 
+    // Update brunoVarInfo with latest variables
+    if (this.props.enableBrunoVarInfo !== false && this.editor.options.brunoVarInfo) {
+      this.editor.options.brunoVarInfo.variables = variables;
+    }
+
     defineCodeMirrorBrunoVariablesMode(variables, mode, false, this.props.enableVariableHighlighting);
     this.editor.setOption('mode', 'brunovariables');
   };
diff --git a/packages/bruno-app/src/components/CodeEditor/index.spec.js b/packages/bruno-app/src/components/CodeEditor/index.spec.js
index 973a8d3a9..b745890c0 100644
--- a/packages/bruno-app/src/components/CodeEditor/index.spec.js
+++ b/packages/bruno-app/src/components/CodeEditor/index.spec.js
@@ -10,10 +10,10 @@ jest.mock('codemirror', () => {
 
 const MOCK_THEME = {
   codemirror: {
-    bg: "#1e1e1e",
-    border: "#333",
+    bg: '#1e1e1e',
+    border: '#333'
   },
-  textLink: "#007acc",
+  textLink: '#007acc'
 };
 
 const setupEditorState = (editor, { value, cursorPosition }) => {
@@ -27,8 +27,8 @@ const setupEditorState = (editor, { value, cursorPosition }) => {
   });
 
   editor.state = {
-    completionActive: null,
-  }
+    completionActive: null
+  };
 };
 
 const setupEditorWithRef = () => {
@@ -47,5 +47,5 @@ describe('CodeEditor', () => {
     jest.resetModules();
   });
 
-  it("add CodeEditor related tests here", () => {});
-});
\ No newline at end of file
+  it('add CodeEditor related tests here', () => {});
+});
diff --git a/packages/bruno-app/src/components/CodeMirrorSearch/StyledWrapper.js b/packages/bruno-app/src/components/CodeMirrorSearch/StyledWrapper.js
index b50bb222b..d6265fe3e 100644
--- a/packages/bruno-app/src/components/CodeMirrorSearch/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CodeMirrorSearch/StyledWrapper.js
@@ -27,7 +27,7 @@ const StyledWrapper = styled.div`
     border: none;
     outline: none;
     padding: 1px 2px;
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     margin: 0 1px;
     height: 28px;
   }
@@ -50,7 +50,7 @@ const StyledWrapper = styled.div`
   .searchbar-result-count {
     min-width: 28px;
     text-align: center;
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     color: #aaa;
     margin: 0 8px 0 1px; 
     white-space: nowrap;
@@ -74,7 +74,7 @@ const StyledWrapper = styled.div`
     color: inherit;
     border: none;
     outline: none;
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     padding: 1px 2px;
     min-width: 80px;
   }
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/StyledWrapper.js
index aaa30d7f8..79d16da14 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/index.js b/packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/index.js
index 2de1495c8..b2f70923f 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/ApiKeyAuth/index.js
@@ -43,16 +43,16 @@ const ApiKeyAuth = ({ collection }) => {
   };
 
   useEffect(() => {
-    !apikeyAuth?.placement &&
-      dispatch(
-        updateCollectionAuth({
-          mode: 'apikey',
-          collectionUid: collection.uid,
-          content: {
-            placement: 'header'
-          }
-        })
-      );
+    !apikeyAuth?.placement
+    && dispatch(
+      updateCollectionAuth({
+        mode: 'apikey',
+        collectionUid: collection.uid,
+        content: {
+          placement: 'header'
+        }
+      })
+    );
   }, [apikeyAuth]);
 
   return (
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/StyledWrapper.js
index cdbdf8424..9cf2c5fa4 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
 
   .auth-mode-selector {
     background: transparent;
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/index.js b/packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/index.js
index f7bd8f0b1..781e9f477 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/AuthMode/index.js
@@ -87,7 +87,7 @@ const AuthMode = ({ collection }) => {
             }}
           >
             NTLM Auth
-          </div>          
+          </div>
           <div
             className="dropdown-item"
             onClick={() => {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/AwsV4Auth/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/AwsV4Auth/StyledWrapper.js
index c2bb5d207..eeaf2d45a 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/AwsV4Auth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/AwsV4Auth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/BasicAuth/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/BasicAuth/StyledWrapper.js
index c2bb5d207..eeaf2d45a 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/BasicAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/BasicAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/BearerAuth/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/BearerAuth/StyledWrapper.js
index c2bb5d207..eeaf2d45a 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/BearerAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/BearerAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/DigestAuth/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/DigestAuth/StyledWrapper.js
index c2bb5d207..eeaf2d45a 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/DigestAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/DigestAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/StyledWrapper.js
index 316d3a7c5..c2901f80b 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/index.js b/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/index.js
index 50e1bbbc6..a967ccb48 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/NTLMAuth/index.js
@@ -9,13 +9,7 @@ import { updateCollectionAuth } from 'providers/ReduxStore/slices/collections';
 import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
 import StyledWrapper from './StyledWrapper';
 
-
-
-
-
 const NTLMAuth = ({ collection }) => {
-
-
   const dispatch = useDispatch();
   const { storedTheme } = useTheme();
 
@@ -25,7 +19,6 @@ const NTLMAuth = ({ collection }) => {
 
   const handleSave = () => dispatch(saveCollectionSettings(collection.uid));
 
-
   const handleUsernameChange = (username) => {
     dispatch(
       updateCollectionAuth({
@@ -67,10 +60,7 @@ const NTLMAuth = ({ collection }) => {
         }
       })
     );
-  };  
-
-
-
+  };
 
   return (
     <StyledWrapper className="mt-2 w-full">
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/StyledWrapper.js
index 856f35b9b..65cb5cba9 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
   .single-line-editor-wrapper {
     max-width: 400px;
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/index.js b/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/index.js
index 2dfe54c44..da0f8a38d 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/OAuth2/index.js
@@ -10,7 +10,7 @@ import OAuth2ClientCredentials from 'components/RequestPane/Auth/OAuth2/ClientCr
 import OAuth2Implicit from 'components/RequestPane/Auth/OAuth2/Implicit/index';
 import GrantTypeSelector from 'components/RequestPane/Auth/OAuth2/GrantTypeSelector/index';
 
-const GrantTypeComponentMap = ({collection }) => {
+const GrantTypeComponentMap = ({ collection }) => {
   const dispatch = useDispatch();
 
   const save = () => {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/WsseAuth/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Auth/WsseAuth/StyledWrapper.js
index c2bb5d207..eeaf2d45a 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/WsseAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/WsseAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Auth/index.js b/packages/bruno-app/src/components/CollectionSettings/Auth/index.js
index af457e6f4..0e643c4e7 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Auth/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Auth/index.js
@@ -13,7 +13,6 @@ import StyledWrapper from './StyledWrapper';
 import OAuth2 from './OAuth2';
 import NTLMAuth from './NTLMAuth';
 
-
 const Auth = ({ collection }) => {
   const authMode = collection.draft?.root ? get(collection, 'draft.root.request.auth.mode') : get(collection, 'root.request.auth.mode');
   const dispatch = useDispatch();
@@ -36,7 +35,7 @@ const Auth = ({ collection }) => {
       }
       case 'ntlm': {
         return <NTLMAuth collection={collection} />;
-      }       
+      }
       case 'oauth2': {
         return <OAuth2 collection={collection} />;
       }
diff --git a/packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/index.js b/packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/index.js
index 083380c58..b871be3e3 100644
--- a/packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/ClientCertSettings/index.js
@@ -39,7 +39,7 @@ const ClientCertSettings = ({ collection }) => {
       domain: Yup.string()
         .required()
         .trim()
-        .test('not-empty-after-trim', 'Domain is required', value => value && value.trim().length > 0),
+        .test('not-empty-after-trim', 'Domain is required', (value) => value && value.trim().length > 0),
       type: Yup.string().required().oneOf(['cert', 'pfx']),
       certFilePath: Yup.string().when('type', {
         is: (type) => type == 'cert',
@@ -146,30 +146,30 @@ const ClientCertSettings = ({ collection }) => {
     <StyledWrapper className="w-full h-full">
       <div className="text-xs mb-4 text-muted">Add client certificates to be used for specific domains.</div>
 
-      <h1 className="font-semibold">Client Certificates</h1>
+      <h1 className="font-medium">Client Certificates</h1>
       <ul className="mt-4">
         {!clientCertConfig.length
           ? 'No client certificates added'
           : clientCertConfig.map((clientCert, index) => (
-            <li key={`client-cert-${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">
-                  <IconWorld className="mr-2" size={18} strokeWidth={1.5} />
-                  {clientCert.domain}
-                </div>
-                <div className="flex w-full items-center">
-                  <IconCertificate className="mr-2 flex-shrink-0" size={18} strokeWidth={1.5} />
-                  {clientCert.type === 'cert' ? clientCert.certFilePath : clientCert.pfxFilePath}
-                </div>
+              <li key={`client-cert-${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">
+                    <IconWorld className="mr-2" size={18} strokeWidth={1.5} />
+                    {clientCert.domain}
+                  </div>
+                  <div className="flex w-full items-center">
+                    <IconCertificate className="mr-2 flex-shrink-0" size={18} strokeWidth={1.5} />
+                    {clientCert.type === 'cert' ? clientCert.certFilePath : clientCert.pfxFilePath}
+                  </div>
                   <button onClick={() => handleRemove(index)} className="remove-certificate ml-2">
-                  <IconTrash size={18} strokeWidth={1.5} />
+                    <IconTrash size={18} strokeWidth={1.5} />
                   </button>
-              </div>
-            </li>
-          ))}
+                </div>
+              </li>
+            ))}
       </ul>
 
-      <h1 className="font-semibold mt-8 mb-2">Add Client Certificate</h1>
+      <h1 className="font-medium mt-8 mb-2">Add Client Certificate</h1>
       <form className="bruno-form" onSubmit={formik.handleSubmit}>
         <div className="mb-3 flex items-center">
           <label className="settings-label" htmlFor="domain">
diff --git a/packages/bruno-app/src/components/CollectionSettings/Docs/index.js b/packages/bruno-app/src/components/CollectionSettings/Docs/index.js
index 38d314de5..00e2271b0 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Docs/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Docs/index.js
@@ -38,21 +38,21 @@ const Docs = ({ collection }) => {
       }))
     );
     toggleViewMode();
-  }
+  };
 
   const onSave = () => {
     dispatch(saveCollectionSettings(collection.uid));
     toggleViewMode();
-  }
+  };
 
   return (
     <StyledWrapper className="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'>
+      <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} />
           Documentation
         </div>
-        <div className='flex flex-row gap-2 items-center justify-center'>
+        <div className="flex flex-row gap-2 items-center justify-center">
           {isEditing ? (
             <>
               <div className="editing-mode" role="tab" onClick={handleDiscardChanges}>
@@ -81,14 +81,13 @@ const Docs = ({ collection }) => {
           fontSize={get(preferences, 'font.codeFontSize')}
         />
       ) : (
-        <div className='h-full overflow-auto pl-1'>
-          <div className='h-[1px] min-h-[500px]'>
+        <div className="h-full overflow-auto pl-1">
+          <div className="h-[1px] min-h-[500px]">
             {
-              docs?.length > 0 ?
-                <Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={docs} />
-                :
-                <Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={documentationPlaceholder} />
-            }         
+              docs?.length > 0
+                ? <Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={docs} />
+                : <Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={documentationPlaceholder} />
+            }
           </div>
         </div>
       )}
@@ -98,7 +97,6 @@ const Docs = ({ collection }) => {
 
 export default Docs;
 
-
 const documentationPlaceholder = `
 Welcome to your collection documentation! This space is designed to help you document your API collection effectively.
 
diff --git a/packages/bruno-app/src/components/CollectionSettings/Headers/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Headers/StyledWrapper.js
index c4d03c5ed..405ca5d78 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Headers/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Headers/StyledWrapper.js
@@ -6,7 +6,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -16,7 +16,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -33,7 +33,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-header {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Headers/index.js b/packages/bruno-app/src/components/CollectionSettings/Headers/index.js
index 45e3e5834..e0846dff5 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Headers/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Headers/index.js
@@ -45,7 +45,8 @@ const Headers = ({ collection }) => {
     const header = cloneDeep(_header);
     switch (type) {
       case 'name': {
-        header.name = e.target.value;
+        // Strip newlines from header keys
+        header.name = e.target.value.replace(/[\r\n]/g, '');
         break;
       }
       case 'value': {
@@ -122,8 +123,7 @@ const Headers = ({ collection }) => {
                             },
                             header,
                             'name'
-                          )
-                        }
+                          )}
                         autocomplete={headerAutoCompleteList}
                         collection={collection}
                       />
@@ -142,8 +142,7 @@ const Headers = ({ collection }) => {
                             },
                             header,
                             'value'
-                          )
-                        }
+                          )}
                         collection={collection}
                         autocomplete={MimeTypes}
                       />
diff --git a/packages/bruno-app/src/components/CollectionSettings/Overview/Info/index.js b/packages/bruno-app/src/components/CollectionSettings/Overview/Info/index.js
index eb42be7cb..be15d598d 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Overview/Info/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Overview/Info/index.js
@@ -1,9 +1,9 @@
-import React from "react";
+import React from 'react';
 import { getTotalRequestCountInCollection } from 'utils/collections/';
-import { IconFolder, IconWorld, IconApi, IconShare } from '@tabler/icons';
-import { areItemsLoading, getItemsLoadStats } from "utils/collections/index";
-import { useState } from "react";
-import ShareCollection from "components/ShareCollection/index";
+import { IconBox, IconFolder, IconWorld, IconApi, IconShare } from '@tabler/icons';
+import { areItemsLoading, getItemsLoadStats } from 'utils/collections/index';
+import { useState } from 'react';
+import ShareCollection from 'components/ShareCollection/index';
 
 const Info = ({ collection }) => {
   const totalRequestsInCollection = getTotalRequestCountInCollection(collection);
@@ -11,23 +11,23 @@ const Info = ({ collection }) => {
   const isCollectionLoading = areItemsLoading(collection);
   const { loading: itemsLoadingCount, total: totalItems } = getItemsLoadStats(collection);
   const [showShareCollectionModal, toggleShowShareCollectionModal] = useState(false);
-  
+
   const handleToggleShowShareCollectionModal = (value) => (e) => {
     toggleShowShareCollectionModal(value);
-  }
+  };
 
   return (
     <div className="w-full flex flex-col h-fit">
       <div className="rounded-lg py-6">
-        <div className="grid gap-6">
+        <div className="grid gap-5">
           {/* Location Row */}
           <div className="flex items-start">
             <div className="flex-shrink-0 p-3 bg-blue-50 dark:bg-blue-900/20 rounded-lg">
               <IconFolder className="w-5 h-5 text-blue-500" stroke={1.5} />
             </div>
             <div className="ml-4">
-              <div className="font-semibold text-sm">Location</div>
-              <div className="mt-1 text-sm text-muted break-all">
+              <div className="font-medium">Location</div>
+              <div className="mt-1 text-muted break-all text-xs">
                 {collection.pathname}
               </div>
             </div>
@@ -39,8 +39,8 @@ const Info = ({ collection }) => {
               <IconWorld className="w-5 h-5 text-green-500" stroke={1.5} />
             </div>
             <div className="ml-4">
-              <div className="font-semibold text-sm">Environments</div>
-              <div className="mt-1 text-sm text-muted">
+              <div className="font-medium">Environments</div>
+              <div className="mt-1 text-muted text-xs">
                 {collection.environments?.length || 0} environment{collection.environments?.length !== 1 ? 's' : ''} configured
               </div>
             </div>
@@ -52,10 +52,10 @@ const Info = ({ collection }) => {
               <IconApi className="w-5 h-5 text-purple-500" stroke={1.5} />
             </div>
             <div className="ml-4">
-              <div className="font-semibold text-sm">Requests</div>
-              <div className="mt-1 text-sm text-muted">
+              <div className="font-medium">Requests</div>
+              <div className="mt-1 text-muted text-xs">
                 {
-                  isCollectionLoading? `${totalItems - itemsLoadingCount} out of ${totalItems} requests in the collection loaded` : `${totalRequestsInCollection} request${totalRequestsInCollection !== 1 ? 's' : ''} in collection`
+                  isCollectionLoading ? `${totalItems - itemsLoadingCount} out of ${totalItems} requests in the collection loaded` : `${totalRequestsInCollection} request${totalRequestsInCollection !== 1 ? 's' : ''} in collection`
                 }
               </div>
             </div>
@@ -66,8 +66,8 @@ const Info = ({ collection }) => {
               <IconShare className="w-5 h-5 text-indigo-500" stroke={1.5} />
             </div>
             <div className="ml-4 h-full flex flex-col justify-start">
-              <div className="font-semibold text-sm h-fit my-auto">Share</div>
-              <div className="mt-1 text-sm group-hover:underline text-link">
+              <div className="font-medium h-fit my-auto">Share</div>
+              <div className="group-hover:underline text-link text-xs">
                 Share Collection
               </div>
             </div>
@@ -79,4 +79,4 @@ const Info = ({ collection }) => {
   );
 };
 
-export default Info;
\ No newline at end of file
+export default Info;
diff --git a/packages/bruno-app/src/components/CollectionSettings/Overview/RequestsNotLoaded/index.js b/packages/bruno-app/src/components/CollectionSettings/Overview/RequestsNotLoaded/index.js
index 4c7406580..d498ca451 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Overview/RequestsNotLoaded/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Overview/RequestsNotLoaded/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
-import { flattenItems } from "utils/collections";
+import { flattenItems } from 'utils/collections';
 import { IconAlertTriangle } from '@tabler/icons';
-import StyledWrapper from "./StyledWrapper";
+import StyledWrapper from './StyledWrapper';
 import { useDispatch, useSelector } from 'react-redux';
 import { isItemARequest, itemIsOpenedInTabs } from 'utils/tabs/index';
 import { getDefaultRequestPaneTab } from 'utils/collections/index';
@@ -12,13 +12,13 @@ const RequestsNotLoaded = ({ collection }) => {
   const dispatch = useDispatch();
   const tabs = useSelector((state) => state.tabs.tabs);
   const flattenedItems = flattenItems(collection.items);
-  const itemsFailedLoading = flattenedItems?.filter(item => item?.partial && !item?.loading);
+  const itemsFailedLoading = flattenedItems?.filter((item) => item?.partial && !item?.loading);
 
   if (!itemsFailedLoading?.length) {
     return null;
   }
 
-  const handleRequestClick = (item) => e => {
+  const handleRequestClick = (item) => (e) => {
     e.preventDefault();
     if (isItemARequest(item)) {
       dispatch(hideHomePage());
@@ -39,7 +39,7 @@ const RequestsNotLoaded = ({ collection }) => {
       );
       return;
     }
-  }
+  };
 
   return (
     <StyledWrapper className="w-full card my-2">
@@ -61,7 +61,7 @@ const RequestsNotLoaded = ({ collection }) => {
         <tbody>
           {flattenedItems?.map((item, index) => (
             item?.partial && !item?.loading ? (
-              <tr key={index} className='cursor-pointer' onClick={handleRequestClick(item)}>
+              <tr key={index} className="cursor-pointer" onClick={handleRequestClick(item)}>
                 <td className="py-1.5 px-3">
                   {item?.pathname?.split(`${collection?.pathname}/`)?.[1]}
                 </td>
diff --git a/packages/bruno-app/src/components/CollectionSettings/Overview/index.js b/packages/bruno-app/src/components/CollectionSettings/Overview/index.js
index 87b461e9c..806ac2a53 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Overview/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Overview/index.js
@@ -1,16 +1,16 @@
-import StyledWrapper from "./StyledWrapper";
-import Docs from "../Docs";
-import Info from "./Info";
+import StyledWrapper from './StyledWrapper';
+import Docs from '../Docs';
+import Info from './Info';
 import { IconBox } from '@tabler/icons';
-import RequestsNotLoaded from "./RequestsNotLoaded";
+import RequestsNotLoaded from './RequestsNotLoaded';
 
 const Overview = ({ collection }) => {
   return (
     <div className="h-full">
-      <div className="grid grid-cols-5 gap-4 h-full">
+      <div className="grid grid-cols-5 gap-5 h-full">
         <div className="col-span-2">
-          <div className="text-xl font-semibold flex items-center gap-2">
-            <IconBox size={24} stroke={1.5} />
+          <div className="text-lg font-medium flex items-center gap-2">
+            <IconBox size={20} stroke={1.5} />
             {collection?.name}
           </div>
           <Info collection={collection} />
@@ -22,6 +22,6 @@ const Overview = ({ collection }) => {
       </div>
     </div>
   );
-}
+};
 
-export default Overview;
\ No newline at end of file
+export default Overview;
diff --git a/packages/bruno-app/src/components/CollectionSettings/Presets/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Presets/StyledWrapper.js
deleted file mode 100644
index db26e863b..000000000
--- a/packages/bruno-app/src/components/CollectionSettings/Presets/StyledWrapper.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  max-width: 800px;
-
-  .settings-label {
-    width: 110px;
-  }
-
-  .textbox {
-    border: 1px solid #ccc;
-    padding: 0.15rem 0.45rem;
-    box-shadow: none;
-    border-radius: 0px;
-    outline: none;
-    box-shadow: none;
-    transition: border-color ease-in-out 0.1s;
-    border-radius: 3px;
-    background-color: ${(props) => props.theme.modal.input.bg};
-    border: 1px solid ${(props) => props.theme.modal.input.border};
-
-    &:focus {
-      border: solid 1px ${(props) => props.theme.modal.input.focusBorder} !important;
-      outline: none !important;
-    }
-  }
-`;
-
-export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/CollectionSettings/Presets/index.js b/packages/bruno-app/src/components/CollectionSettings/Presets/index.js
deleted file mode 100644
index 30fd44081..000000000
--- a/packages/bruno-app/src/components/CollectionSettings/Presets/index.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React from 'react';
-import { useDispatch } from 'react-redux';
-import StyledWrapper from './StyledWrapper';
-import { updateCollectionPresets } from 'providers/ReduxStore/slices/collections';
-import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
-import { get } from 'lodash';
-
-const PresetsSettings = ({ collection }) => {
-  const dispatch = useDispatch();
-  const initialPresets = { requestType: 'http', requestUrl: '' };
-
-  // Get presets from draft.brunoConfig if it exists, otherwise from brunoConfig
-  const currentPresets = collection.draft?.brunoConfig
-    ? get(collection, 'draft.brunoConfig.presets', initialPresets)
-    : get(collection, 'brunoConfig.presets', initialPresets);
-
-  // Helper to update presets config
-  const updatePresets = (updates) => {
-    const updatedPresets = { ...currentPresets, ...updates };
-    dispatch(updateCollectionPresets({
-      collectionUid: collection.uid,
-      presets: updatedPresets
-    }));
-  };
-
-  const handleSave = () => dispatch(saveCollectionSettings(collection.uid));
-
-  const handleRequestTypeChange = (e) => {
-    updatePresets({ requestType: e.target.value });
-  };
-
-  const handleRequestUrlChange = (e) => {
-    updatePresets({ requestUrl: e.target.value });
-  };
-
-  return (
-    <StyledWrapper className="h-full w-full">
-      <div className="text-xs mb-4 text-muted">
-        These presets will be used as the default values for new requests in this collection.
-      </div>
-      <div className="bruno-form">
-        <div className="mb-3 flex items-center">
-          <label className="settings-label flex  items-center" htmlFor="enabled">
-            Request Type
-          </label>
-          <div className="flex items-center">
-            <input
-              id="http"
-              className="cursor-pointer"
-              type="radio"
-              name="requestType"
-              onChange={handleRequestTypeChange}
-              value="http"
-              checked={(currentPresets.requestType || 'http') === 'http'}
-            />
-            <label htmlFor="http" className="ml-1 cursor-pointer select-none">
-              HTTP
-            </label>
-
-            <input
-              id="graphql"
-              className="ml-4 cursor-pointer"
-              type="radio"
-              name="requestType"
-              onChange={handleRequestTypeChange}
-              value="graphql"
-              checked={(currentPresets.requestType || 'http') === 'graphql'}
-            />
-            <label htmlFor="graphql" className="ml-1 cursor-pointer select-none">
-              GraphQL
-            </label>
-
-            <input
-              id="grpc"
-              className="ml-4 cursor-pointer"
-              type="radio"
-              name="requestType"
-              onChange={handleRequestTypeChange}
-              value="grpc"
-              checked={(currentPresets.requestType || 'http') === 'grpc'}
-            />
-            <label htmlFor="grpc" className="ml-1 cursor-pointer select-none">
-              gRPC
-            </label>
-          </div>
-        </div>
-        <div className="mb-3 flex items-center">
-          <label className="settings-label" htmlFor="requestUrl">
-            Base URL
-          </label>
-          <div className="flex items-center w-full">
-            <div className="flex items-center flex-grow input-container h-full">
-              <input
-                id="request-url"
-                type="text"
-                name="requestUrl"
-                placeholder="Request URL"
-                className="block textbox"
-                autoComplete="off"
-                autoCorrect="off"
-                autoCapitalize="off"
-                spellCheck="false"
-                onChange={handleRequestUrlChange}
-                value={currentPresets.requestUrl || ''}
-                style={{ width: '100%' }}
-              />
-            </div>
-          </div>
-        </div>
-
-        <div className="mt-6">
-          <button type="submit" className="submit btn btn-sm btn-secondary" onClick={handleSave}>
-            Save
-          </button>
-        </div>
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default PresetsSettings;
diff --git a/packages/bruno-app/src/components/CollectionSettings/Protobuf/index.js b/packages/bruno-app/src/components/CollectionSettings/Protobuf/index.js
index 10385f6e7..36a88d54b 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Protobuf/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Protobuf/index.js
@@ -112,7 +112,7 @@ const ProtobufSettings = ({ collection }) => {
       <div className="mb-6" data-testid="protobuf-proto-files-section">
         <div className="flex items-center justify-between mb-3">
           <div className="flex items-center">
-            <label className="font-semibold text-sm flex items-center" htmlFor="protoFiles">
+            <label className="font-medium flex items-center" htmlFor="protoFiles">
               Proto Files (
               {protoFiles.length}
               )
@@ -156,7 +156,7 @@ const ProtobufSettings = ({ collection }) => {
                   <td colSpan="3" className="border border-gray-200 dark:border-gray-700 px-3 py-8 text-center">
                     <div className="flex flex-col items-center">
                       <IconFile size={24} className="text-gray-400 mb-2" />
-                      <span className="text-sm text-gray-500 dark:text-gray-400">No proto files added</span>
+                      <span className="text-gray-500 dark:text-gray-400">No proto files added</span>
                     </div>
                   </td>
                 </tr>
@@ -169,7 +169,7 @@ const ProtobufSettings = ({ collection }) => {
                       <td className="border border-gray-200 dark:border-gray-700 px-3 py-2">
                         <div className="flex items-center">
                           <IconFile size={16} className="text-gray-500 dark:text-gray-400 mr-2" />
-                          <span className="text-sm font-medium text-gray-900 dark:text-gray-100" data-testid="protobuf-proto-file-name">
+                          <span className="font-medium text-gray-900 dark:text-gray-100" data-testid="protobuf-proto-file-name">
                             {getBasename(collection.pathname, file.path)}
                           </span>
                           {!isValid && <IconAlertCircle size={12} className="text-red-600 dark:text-red-400 ml-2" />}
@@ -219,7 +219,7 @@ const ProtobufSettings = ({ collection }) => {
       <div className="mb-6" data-testid="protobuf-import-paths-section">
         <div className="flex items-center justify-between mb-3">
           <div className="flex items-center">
-            <label className="font-semibold text-sm flex items-center" htmlFor="importPaths">
+            <label className="font-medium flex items-center" htmlFor="importPaths">
               Import Paths (
               {importPaths.length}
               )
@@ -265,7 +265,7 @@ const ProtobufSettings = ({ collection }) => {
                   <td colSpan="4" className="border border-gray-200 dark:border-gray-700 px-3 py-8 text-center">
                     <div className="flex flex-col items-center">
                       <IconFolder size={24} className="text-gray-400 mb-2" />
-                      <span className="text-sm text-gray-500 dark:text-gray-400">No import paths added</span>
+                      <span className="text-gray-500 dark:text-gray-400">No import paths added</span>
                     </div>
                   </td>
                 </tr>
@@ -288,7 +288,7 @@ const ProtobufSettings = ({ collection }) => {
                       <td className="border border-gray-200 dark:border-gray-700 px-3 py-2">
                         <div className="flex items-center">
                           <IconFolder size={16} className="text-gray-500 dark:text-gray-400 mr-2" />
-                          <span className="text-sm font-medium text-gray-900 dark:text-gray-100">
+                          <span className="font-medium text-gray-900 dark:text-gray-100">
                             {getBasename(collection.pathname, importPath.path)}
                           </span>
                           {!isValid && <IconAlertCircle size={12} className="text-red-600 dark:text-red-400 ml-2" />}
diff --git a/packages/bruno-app/src/components/CollectionSettings/ProxySettings/index.js b/packages/bruno-app/src/components/CollectionSettings/ProxySettings/index.js
index 039b2eab8..9b7f07073 100644
--- a/packages/bruno-app/src/components/CollectionSettings/ProxySettings/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/ProxySettings/index.js
@@ -156,9 +156,9 @@ const ProxySettings = ({ collection }) => {
             <InfoTip infotipId="request-var">
               <div>
                 <ul>
-                  <li><span style={{width: "50px", display: "inline-block"}}>global</span> - use global proxy config</li>
-                  <li><span style={{width: "50px", display: "inline-block"}}>enabled</span> - use collection proxy config</li>
-                  <li><span style={{width: "50px", display: "inline-block"}}>disable</span> - disable proxy</li>
+                  <li><span style={{ width: '50px', display: 'inline-block' }}>global</span> - use global proxy config</li>
+                  <li><span style={{ width: '50px', display: 'inline-block' }}>enabled</span> - use collection proxy config</li>
+                  <li><span style={{ width: '50px', display: 'inline-block' }}>disable</span> - disable proxy</li>
                 </ul>
               </div>
             </InfoTip>
@@ -367,4 +367,4 @@ const ProxySettings = ({ collection }) => {
   );
 };
 
-export default ProxySettings;
\ No newline at end of file
+export default ProxySettings;
diff --git a/packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/StyledWrapper.js b/packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/StyledWrapper.js
index efacc8288..a44141c79 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/StyledWrapper.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -31,7 +31,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-var {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/index.js b/packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/index.js
index fd15eee8c..25136bfa3 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Vars/VarsTable/index.js
@@ -4,7 +4,7 @@ import { IconTrash } from '@tabler/icons';
 import { useDispatch } from 'react-redux';
 import { useTheme } from 'providers/Theme';
 import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
-import SingleLineEditor from 'components/SingleLineEditor';
+import MultiLineEditor from 'components/MultiLineEditor';
 import InfoTip from 'components/InfoTip';
 import StyledWrapper from './StyledWrapper';
 import toast from 'react-hot-toast';
@@ -114,7 +114,7 @@ const VarsTable = ({ collection, vars, varType }) => {
                       />
                     </td>
                     <td>
-                      <SingleLineEditor
+                      <MultiLineEditor
                         value={_var.value}
                         theme={storedTheme}
                         onSave={onSave}
@@ -127,8 +127,7 @@ const VarsTable = ({ collection, vars, varType }) => {
                             },
                             _var,
                             'value'
-                          )
-                        }
+                          )}
                         collection={collection}
                       />
                     </td>
diff --git a/packages/bruno-app/src/components/CollectionSettings/Vars/index.js b/packages/bruno-app/src/components/CollectionSettings/Vars/index.js
index 02375f19a..b0fa78af0 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Vars/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Vars/index.js
@@ -4,22 +4,18 @@ import VarsTable from './VarsTable';
 import StyledWrapper from './StyledWrapper';
 import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
 import { useDispatch } from 'react-redux';
+import DeprecationWarning from 'components/DeprecationWarning';
 
 const Vars = ({ collection }) => {
   const dispatch = useDispatch();
   const requestVars = collection.draft?.root ? get(collection, 'draft.root.request.vars.req', []) : get(collection, 'root.request.vars.req', []);
-  const responseVars = collection.draft?.root ? get(collection, 'draft.root.request.vars.res', []) : get(collection, 'root.request.vars.res', []);
   const handleSave = () => dispatch(saveCollectionSettings(collection.uid));
+
   return (
     <StyledWrapper className="w-full flex flex-col">
       <div className="flex-1 mt-2">
-        <div className="mb-1 title text-xs">Pre Request</div>
         <VarsTable collection={collection} vars={requestVars} varType="request" />
       </div>
-      <div className="flex-1">
-        <div className="mt-1 mb-1 title text-xs">Post Response</div>
-        <VarsTable collection={collection} vars={responseVars} varType="response" />
-      </div>
       <div className="mt-6">
         <button type="submit" className="submit btn btn-sm btn-secondary" onClick={handleSave}>
           Save
diff --git a/packages/bruno-app/src/components/CollectionSettings/index.js b/packages/bruno-app/src/components/CollectionSettings/index.js
index 7d053a0c8..d4cf08932 100644
--- a/packages/bruno-app/src/components/CollectionSettings/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/index.js
@@ -9,7 +9,6 @@ import Headers from './Headers';
 import Auth from './Auth';
 import Script from './Script';
 import Test from './Tests';
-import Presets from './Presets';
 import Protobuf from './Protobuf';
 import StyledWrapper from './StyledWrapper';
 import Vars from './Vars/index';
@@ -37,13 +36,9 @@ const CollectionSettings = ({ collection }) => {
   const activeHeadersCount = headers.filter((header) => header.enabled).length;
 
   const requestVars = collection.draft?.root ? get(collection, 'draft.root.request.vars.req', []) : get(collection, 'root.request.vars.req', []);
-  const responseVars = collection.draft?.root ? get(collection, 'draft.root.request.vars.res', []) : get(collection, 'root.request.vars.res', []);
-  const activeVarsCount = requestVars.filter((v) => v.enabled).length + responseVars.filter((v) => v.enabled).length;
+  const activeVarsCount = requestVars.filter((v) => v.enabled).length;
   const authMode = (collection.draft?.root ? get(collection, 'draft.root.request.auth', {}) : get(collection, 'root.request.auth', {})).mode || 'none';
 
-  const presets = collection.draft?.brunoConfig ? get(collection, 'draft.brunoConfig.presets', []) : get(collection, 'brunoConfig.presets', []);
-  const hasPresets = presets && presets.requestUrl !== '';
-
   const proxyConfig = collection.draft?.brunoConfig ? get(collection, 'draft.brunoConfig.proxy', {}) : get(collection, 'brunoConfig.proxy', {});
   const proxyEnabled = proxyConfig.hostname ? true : false;
   const clientCertConfig = collection.draft?.brunoConfig ? get(collection, 'draft.brunoConfig.clientCertificates.certs', []) : get(collection, 'brunoConfig.clientCertificates.certs', []);
@@ -69,9 +64,6 @@ const CollectionSettings = ({ collection }) => {
       case 'tests': {
         return <Test collection={collection} />;
       }
-      case 'presets': {
-        return <Presets collection={collection} />;
-      }
       case 'proxy': {
         return <ProxySettings collection={collection} />;
       }
@@ -120,10 +112,6 @@ const CollectionSettings = ({ collection }) => {
           Tests
           {hasTests && <StatusDot />}
         </div>
-        <div className={getTabClassname('presets')} role="tab" onClick={() => setTab('presets')}>
-          Presets
-          {hasPresets && <StatusDot />}
-        </div>
         <div className={getTabClassname('proxy')} role="tab" onClick={() => setTab('proxy')}>
           Proxy
           {Object.keys(proxyConfig).length > 0 && proxyEnabled && <StatusDot />}
diff --git a/packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js b/packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js
index 5f7f66867..a59e5ed9f 100644
--- a/packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js
+++ b/packages/bruno-app/src/components/Cookies/ModifyCookieModal/index.js
@@ -125,7 +125,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
         );
 
         if (!isEmpty(validationErrors)) {
-          toast.error(Object.values(validationErrors).join("\n"));
+          toast.error(Object.values(validationErrors).join('\n'));
           return;
         }
 
@@ -208,9 +208,9 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
       onClose={onClose}
       handleCancel={onClose}
       handleConfirm={onSubmit}
-      customHeader={
+      customHeader={(
         <div className="flex items-center justify-between w-full">
-          <h2 className="text-sm font-bold">{title}</h2>
+          <h2 className="font-bold">{title}</h2>
           <div className="ml-auto flex items-center ">
             <ToggleSwitch
               className="mr-2"
@@ -220,16 +220,16 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                 setIsRawMode(e.target.checked);
               }}
             />
-            <label className="text-sm font-normal mr-4 normal-case">Edit Raw</label>
+            <label className="font-normal mr-4 normal-case">Edit Raw</label>
           </div>
         </div>
-      }
+      )}
     >
       <form onSubmit={(e) => e.preventDefault()} className="px-2">
         {isRawMode ? (
           <div>
             <div className="flex items-center gap-2 mb-1">
-              <label className="block text-sm">Set-Cookie String</label>
+              <label className="block">Set-Cookie String</label>
               <IconInfoCircle id="cookie-raw-info" size={16} strokeWidth={1.5} className="text-gray-400" />
               <Tooltip
                 anchorId="cookie-raw-info"
@@ -248,7 +248,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
           <div className="space-y-4">
             <div className="grid grid-cols-2 gap-4">
               <div>
-                <label className="block text-sm mb-1">
+                <label className="block mb-1">
                   Domain<span className="text-red-600">*</span>{' '}
                 </label>
                 <input
@@ -262,11 +262,11 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   disabled={!!cookie}
                 />
                 {formik.touched.domain && formik.errors.domain && (
-                  <div className="text-red-500 text-sm mt-1">{formik.errors.domain}</div>
+                  <div className="text-red-500 mt-1">{formik.errors.domain}</div>
                 )}
               </div>
               <div>
-                <label className="block text-sm mb-1">Path</label>
+                <label className="block mb-1">Path</label>
                 <input
                   type="text"
                   name="path"
@@ -276,11 +276,11 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   disabled={!!cookie}
                 />
                 {formik.touched.path && formik.errors.path && (
-                  <div className="text-red-500 text-sm mt-1">{formik.errors.path}</div>
+                  <div className="text-red-500 mt-1">{formik.errors.path}</div>
                 )}
               </div>
               <div>
-                <label className="block text-sm mb-1">
+                <label className="block mb-1">
                   Key<span className="text-red-600">*</span>{' '}
                 </label>
                 <input
@@ -294,12 +294,12 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   disabled={!!cookie}
                 />
                 {formik.touched.key && formik.errors.key && (
-                  <div className="text-red-500 text-sm mt-1">{formik.errors.key}</div>
+                  <div className="text-red-500 mt-1">{formik.errors.key}</div>
                 )}
               </div>
 
               <div>
-                <label className="block text-sm mb-1">
+                <label className="block mb-1">
                   Value<span className="text-red-600">*</span>{' '}
                 </label>
                 <input
@@ -312,7 +312,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   className="block textbox non-passphrase-input w-full"
                 />
                 {formik.touched.value && formik.errors.value && (
-                  <div className="text-red-500 text-sm mt-1">{formik.errors.value}</div>
+                  <div className="text-red-500 mt-1">{formik.errors.value}</div>
                 )}
               </div>
             </div>
@@ -320,7 +320,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
             {/* Date Picker */}
             <div className="w-full flex items-end">
               <div>
-                <label className="block text-sm mb-1">Expiration ({moment.tz.guess()})</label>
+                <label className="block mb-1">Expiration ({moment.tz.guess()})</label>
                 <input
                   type="datetime-local"
                   name="expires"
@@ -332,7 +332,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                   min={moment().format(moment.HTML5_FMT.DATETIME_LOCAL)}
                 />
                 {formik.touched.expires && formik.errors.expires && (
-                  <div className="text-red-500 text-sm mt-1">{formik.errors.expires}</div>
+                  <div className="text-red-500 mt-1">{formik.errors.expires}</div>
                 )}
               </div>
 
@@ -346,7 +346,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                     onChange={formik.handleChange}
                     className="mr-2"
                   />
-                  <span className="text-sm">Secure</span>
+                  <span>Secure</span>
                 </label>
 
                 <label className="flex items-center">
@@ -357,7 +357,7 @@ const ModifyCookieModal = ({ onClose, domain, cookie }) => {
                     onChange={formik.handleChange}
                     className="mr-2"
                   />
-                  <span className="text-sm">HTTP Only</span>
+                  <span>HTTP Only</span>
                 </label>
               </div>
             </div>
diff --git a/packages/bruno-app/src/components/Cookies/StyledWrapper.js b/packages/bruno-app/src/components/Cookies/StyledWrapper.js
index 5e3cdd125..7ccc622fe 100644
--- a/packages/bruno-app/src/components/Cookies/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Cookies/StyledWrapper.js
@@ -7,7 +7,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
   }
diff --git a/packages/bruno-app/src/components/Cookies/index.js b/packages/bruno-app/src/components/Cookies/index.js
index 2afa3d37d..c5138bcbb 100644
--- a/packages/bruno-app/src/components/Cookies/index.js
+++ b/packages/bruno-app/src/components/Cookies/index.js
@@ -14,7 +14,7 @@ const ClearDomainCookiesModal = ({ onClose, domain, onClear }) => (
   <Modal onClose={onClose} handleCancel={onClose} title="Clear Domain Cookies" hideFooter={true}>
     <div className="flex items-center font-normal">
       <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-      <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+      <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
     </div>
     <div className="font-normal mt-4">
       Are you sure you want to clear all cookies for the domain {domain}?
@@ -39,7 +39,7 @@ const DeleteCookieModal = ({ onClose, cookieName, onDelete }) => (
   <Modal onClose={onClose} handleCancel={onClose} title="Delete Cookie" hideFooter={true}>
     <div className="flex items-center font-normal">
       <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-      <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+      <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
     </div>
     <div className="font-normal mt-4">
       Are you sure you want to delete the cookie {cookieName}?
@@ -72,7 +72,7 @@ const CollectionProperties = ({ onClose }) => {
   const [searchText, setSearchText] = useState(null);
 
   const handleAddCookie = (domain) => {
-    if(domain) setCurrentDomain(domain);
+    if (domain) setCurrentDomain(domain);
     setIsModifyCookieModalOpen(true);
   };
 
@@ -157,7 +157,7 @@ const CollectionProperties = ({ onClose }) => {
             // No cookies found
             <div className="flex items-center justify-center flex-col">
               <IconCookieOff size={48} strokeWidth={1.5} className="text-gray-500" />
-              <h2 className="text-lg font-semibold mt-4">No cookies found</h2>
+              <h2 className="text-lg font-medium mt-4">No cookies found</h2>
               <p className="text-gray-500 mt-2">Add cookies to get started</p>
               <button
                 type="submit"
@@ -175,7 +175,7 @@ const CollectionProperties = ({ onClose }) => {
             // No search results
             <div className="flex items-center justify-center flex-col">
               <IconSearch size={48} />
-              <h2 className="text-lg font-semibold mt-4">No search results</h2>
+              <h2 className="text-lg font-medium mt-4">No search results</h2>
               <p className="text-gray-500 mt-2">Try a different search term</p>
             </div>
           ) : (
@@ -219,13 +219,13 @@ const CollectionProperties = ({ onClose }) => {
                         <table className="w-full">
                           <thead>
                             <tr className="text-left border-b border-gray-200 dark:border-neutral-600 text-gray-700 dark:text-gray-300">
-                              <th className="py-2 px-4 font-semibold w-32">Name</th>
-                              <th className="py-2 px-4 font-semibold w-52">Value</th>
-                              <th className="py-2 px-4 font-semibold">Path</th>
-                              <th className="py-2 px-4 font-semibold">Expires</th>
-                              <th className="py-2 px-4 font-semibold text-center">Secure</th>
-                              <th className="py-2 px-4 font-semibold text-center">HTTP Only</th>
-                              <th className="py-2 px-4 font-semibold text-right w-24">Actions</th>
+                              <th className="py-2 px-4 font-medium w-32">Name</th>
+                              <th className="py-2 px-4 font-medium w-52">Value</th>
+                              <th className="py-2 px-4 font-medium">Path</th>
+                              <th className="py-2 px-4 font-medium">Expires</th>
+                              <th className="py-2 px-4 font-medium text-center">Secure</th>
+                              <th className="py-2 px-4 font-medium text-center">HTTP Only</th>
+                              <th className="py-2 px-4 font-medium text-right w-24">Actions</th>
                             </tr>
                           </thead>
                           <tbody>
diff --git a/packages/bruno-app/src/components/DeprecationWarning/StyledWrapper.js b/packages/bruno-app/src/components/DeprecationWarning/StyledWrapper.js
new file mode 100644
index 000000000..4f23edf69
--- /dev/null
+++ b/packages/bruno-app/src/components/DeprecationWarning/StyledWrapper.js
@@ -0,0 +1,42 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  .deprecation-warning {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 8px;
+    gap: 4px;
+    margin-bottom: 8px;
+    background: ${(props) => props.theme.deprecationWarning.bg};
+    border: 1px solid ${(props) => props.theme.deprecationWarning.border};
+    border-radius: 6px;
+
+    .warning-icon {
+      color: ${(props) => props.theme.deprecationWarning.icon};
+      flex-shrink: 0;
+      width: 16px;
+      height: 16px;
+    }
+
+    .warning-text {
+      font-family: 'Inter', sans-serif;
+      font-style: normal;
+      font-size: 14px;
+      line-height: 17px;
+      color: ${(props) => props.theme.deprecationWarning.text};
+
+      a {
+        color: ${(props) => props.theme.textLink};
+        text-decoration: underline;
+
+        &:hover {
+          text-decoration: none;
+        }
+      }
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/DeprecationWarning/index.js b/packages/bruno-app/src/components/DeprecationWarning/index.js
new file mode 100644
index 000000000..31128dd25
--- /dev/null
+++ b/packages/bruno-app/src/components/DeprecationWarning/index.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import IconAlertTriangleFilled from '../Icons/IconAlertTriangleFilled';
+import StyledWrapper from './StyledWrapper';
+
+const DeprecationWarning = ({ featureName, learnMoreUrl }) => {
+  return (
+    <StyledWrapper>
+      <div className="deprecation-warning">
+        <IconAlertTriangleFilled className="warning-icon" size={16} />
+        <span className="warning-text">
+          {featureName} will be removed in <strong>v3.0.0</strong>. They are deprecated and will no longer be supported. Learn more in{' '}
+          <a href={learnMoreUrl} target="_blank" rel="noreferrer">this post</a> or contact us at{' '}
+          <a href="mailto:support@usebruno.com">support@usebruno.com</a> with questions.
+        </span>
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default DeprecationWarning;
diff --git a/packages/bruno-app/src/components/Devtools/Console/DebugTab/StyledWrapper.js b/packages/bruno-app/src/components/Devtools/Console/DebugTab/StyledWrapper.js
index a9c71b8c2..1180739fd 100644
--- a/packages/bruno-app/src/components/Devtools/Console/DebugTab/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/DebugTab/StyledWrapper.js
@@ -22,12 +22,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     font-weight: 500;
 
     .error-count {
       color: ${(props) => props.theme.console.countColor};
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       font-weight: 400;
     }
   }
@@ -73,12 +73,12 @@ const StyledWrapper = styled.div`
 
     p {
       margin: 0;
-      font-size: 14px;
+      font-size: ${(props) => props.theme.font.size.base};
       font-weight: 500;
     }
 
     span {
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       opacity: 0.7;
     }
   }
@@ -98,8 +98,8 @@ const StyledWrapper = styled.div`
     padding: 8px 16px;
     background: ${(props) => props.theme.console.headerBg};
     border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: 11px;
-    font-weight: 600;
+    font-size: ${(props) => props.theme.font.size.xs};
+    font-weight: 500;
     color: ${(props) => props.theme.console.titleColor};
     text-transform: uppercase;
     letter-spacing: 0.5px;
@@ -121,7 +121,7 @@ const StyledWrapper = styled.div`
     border-bottom: 1px solid ${(props) => props.theme.console.border};
     cursor: pointer;
     transition: background-color 0.1s ease;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     align-items: center;
 
     &:hover {
@@ -149,15 +149,15 @@ const StyledWrapper = styled.div`
     text-overflow: ellipsis;
     white-space: nowrap;
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
   }
 
   .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;
+    font-size: ${(props) => props.theme.font.size.xs};
     text-align: right;
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Devtools/Console/DebugTab/index.js b/packages/bruno-app/src/components/Devtools/Console/DebugTab/index.js
index 1faa14ec7..a5810e3bc 100644
--- a/packages/bruno-app/src/components/Devtools/Console/DebugTab/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/DebugTab/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { IconBug } from '@tabler/icons';
-import { 
+import {
   setSelectedError,
   clearDebugErrors
 } from 'providers/ReduxStore/slices/logs';
@@ -10,10 +10,10 @@ 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', 
+    return date.toLocaleTimeString('en-US', {
+      hour12: false,
+      hour: '2-digit',
+      minute: '2-digit',
       second: '2-digit',
       fractionalSecondDigits: 3
     });
@@ -38,18 +38,18 @@ const ErrorRow = ({ error, isSelected, onClick }) => {
   };
 
   return (
-    <div 
+    <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>
@@ -59,7 +59,7 @@ const ErrorRow = ({ error, isSelected, onClick }) => {
 
 const DebugTab = () => {
   const dispatch = useDispatch();
-  const { debugErrors, selectedError } = useSelector(state => state.logs);
+  const { debugErrors, selectedError } = useSelector((state) => state.logs);
 
   const handleErrorClick = (error) => {
     dispatch(setSelectedError(error));
@@ -85,7 +85,7 @@ const DebugTab = () => {
               <div>Location</div>
               <div className="text-right">Time</div>
             </div>
-            
+
             <div className="errors-list">
               {debugErrors.map((error, index) => (
                 <ErrorRow
@@ -103,4 +103,4 @@ const DebugTab = () => {
   );
 };
 
-export default DebugTab; 
\ No newline at end of file
+export default DebugTab;
diff --git a/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/StyledWrapper.js b/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/StyledWrapper.js
index 94900df8f..09299b0df 100644
--- a/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/StyledWrapper.js
@@ -26,12 +26,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     font-weight: 500;
 
     .error-time {
       color: ${(props) => props.theme.console.countColor};
-      font-size: 11px;
+      font-size: ${(props) => props.theme.font.size.xs};
       font-weight: 400;
     }
   }
@@ -73,7 +73,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
 
     &:hover {
@@ -111,8 +111,8 @@ const StyledWrapper = styled.div`
 
     h4 {
       margin: 0 0 12px 0;
-      font-size: 13px;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.base};
+      font-weight: 500;
       color: ${(props) => props.theme.console.titleColor};
       text-transform: uppercase;
       letter-spacing: 0.5px;
@@ -131,15 +131,15 @@ const StyledWrapper = styled.div`
     gap: 4px;
 
     label {
-      font-size: 11px;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.xs};
+      font-weight: 500;
       color: ${(props) => props.theme.console.titleColor};
       text-transform: uppercase;
       letter-spacing: 0.5px;
     }
 
     span {
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       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;
@@ -167,7 +167,7 @@ const StyledWrapper = styled.div`
 
     p {
       margin: 0;
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       color: ${(props) => props.theme.console.messageColor};
       line-height: 1.4;
     }
@@ -184,7 +184,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     text-decoration: none;
     align-self: flex-start;
@@ -212,7 +212,7 @@ const StyledWrapper = styled.div`
   .arguments {
     margin: 0;
     padding: 16px;
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     line-height: 1.5;
     color: ${(props) => props.theme.console.messageColor};
     background: transparent;
@@ -225,4 +225,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/index.js b/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/index.js
index 91499b4a3..e4017f10d 100644
--- a/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/ErrorDetailsPanel/index.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { 
+import {
   IconX,
   IconBug,
   IconFileText,
@@ -15,7 +15,7 @@ import StyledWrapper from './StyledWrapper';
 
 const ErrorInfoTab = ({ error }) => {
   const { version } = useApp();
-  
+
   const formatTimestamp = (timestamp) => {
     const date = new Date(timestamp);
     return date.toLocaleString();
@@ -23,7 +23,7 @@ const ErrorInfoTab = ({ error }) => {
 
   const generateGitHubIssueUrl = () => {
     const title = `Bug: ${error.message.substring(0, 50)}${error.message.length > 50 ? '...' : ''}`;
-    
+
     const body = `## Bug Report
 
 ### Error Details
@@ -66,7 +66,7 @@ ${error.args ? error.args.map((arg, index) => {
 
     const encodedTitle = encodeURIComponent(title);
     const encodedBody = encodeURIComponent(body);
-    
+
     return `https://github.com/usebruno/bruno/issues/new?template=BLANK_ISSUE&title=${encodedTitle}&body=${encodedBody}`;
   };
 
@@ -84,33 +84,33 @@ ${error.args ? error.args.map((arg, index) => {
             <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 
+          <button
             className="report-button"
             onClick={handleReportIssue}
             title="Report this error on GitHub"
@@ -127,11 +127,11 @@ ${error.args ? error.args.map((arg, index) => {
 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)
+      .map((line) => line.trim())
+      .filter((line) => line.length > 0)
       .join('\n');
   };
 
@@ -152,18 +152,18 @@ const StackTraceTab = ({ error }) => {
 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) {
@@ -187,7 +187,7 @@ const ArgumentsTab = ({ error }) => {
 
 const ErrorDetailsPanel = () => {
   const dispatch = useDispatch();
-  const { selectedError } = useSelector(state => state.logs);
+  const { selectedError } = useSelector((state) => state.logs);
   const [activeTab, setActiveTab] = useState('info');
 
   if (!selectedError) return null;
@@ -222,8 +222,8 @@ const ErrorDetailsPanel = () => {
           <span>Error Details</span>
           <span className="error-time">({formatTime(selectedError.timestamp)})</span>
         </div>
-        
-        <button 
+
+        <button
           className="close-button"
           onClick={handleClose}
           title="Close details panel"
@@ -233,23 +233,23 @@ const ErrorDetailsPanel = () => {
       </div>
 
       <div className="panel-tabs">
-        <button 
+        <button
           className={`tab-button ${activeTab === 'info' ? 'active' : ''}`}
           onClick={() => setActiveTab('info')}
         >
           <IconFileText size={14} strokeWidth={1.5} />
           Info
         </button>
-        
-        <button 
+
+        <button
           className={`tab-button ${activeTab === 'stack' ? 'active' : ''}`}
           onClick={() => setActiveTab('stack')}
         >
           <IconStack size={14} strokeWidth={1.5} />
           Stack
         </button>
-        
-        <button 
+
+        <button
           className={`tab-button ${activeTab === 'args' ? 'active' : ''}`}
           onClick={() => setActiveTab('args')}
         >
@@ -265,4 +265,4 @@ const ErrorDetailsPanel = () => {
   );
 };
 
-export default ErrorDetailsPanel; 
\ No newline at end of file
+export default ErrorDetailsPanel;
diff --git a/packages/bruno-app/src/components/Devtools/Console/NetworkTab/StyledWrapper.js b/packages/bruno-app/src/components/Devtools/Console/NetworkTab/StyledWrapper.js
index 2fc45bafe..9cf4bd328 100644
--- a/packages/bruno-app/src/components/Devtools/Console/NetworkTab/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/NetworkTab/StyledWrapper.js
@@ -22,12 +22,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     font-weight: 500;
 
     .request-count {
       color: ${(props) => props.theme.console.countColor};
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       font-weight: 400;
     }
   }
@@ -59,12 +59,12 @@ const StyledWrapper = styled.div`
 
     p {
       margin: 0;
-      font-size: 14px;
+      font-size: ${(props) => props.theme.font.size.base};
       font-weight: 500;
     }
 
     span {
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       opacity: 0.7;
     }
   }
@@ -84,8 +84,8 @@ const StyledWrapper = styled.div`
     padding: 8px 16px;
     background: ${(props) => props.theme.console.headerBg};
     border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: 11px;
-    font-weight: 600;
+    font-size: ${(props) => props.theme.font.size.xs};
+    font-weight: 500;
     color: ${(props) => props.theme.console.titleColor};
     text-transform: uppercase;
     letter-spacing: 0.5px;
@@ -107,7 +107,7 @@ const StyledWrapper = styled.div`
     border-bottom: 1px solid ${(props) => props.theme.console.border};
     cursor: pointer;
     transition: background-color 0.1s ease;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     align-items: center;
 
     &:hover {
@@ -127,7 +127,7 @@ const StyledWrapper = styled.div`
     padding: 2px 6px;
     border-radius: 4px;
     font-size: 10px;
-    font-weight: 600;
+    font-weight: 500;
     color: white;
     text-transform: uppercase;
     letter-spacing: 0.5px;
@@ -135,8 +135,8 @@ const StyledWrapper = styled.div`
   }
 
   .status-badge {
-    font-weight: 600;
-    font-size: 12px;
+    font-weight: 500;
+    font-size: ${(props) => props.theme.font.size.sm};
   }
 
   .request-domain {
@@ -158,20 +158,20 @@ const StyledWrapper = styled.div`
   .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;
+    font-size: ${(props) => props.theme.font.size.xs};
   }
 
   .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;
+    font-size: ${(props) => props.theme.font.size.xs};
     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;
+    font-size: ${(props) => props.theme.font.size.xs};
     text-align: right;
   }
 
@@ -190,7 +190,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
 
     &:hover {
       background: ${(props) => props.theme.console.buttonHoverBg};
@@ -225,7 +225,7 @@ const StyledWrapper = styled.div`
     padding: 8px 12px;
     background: ${(props) => props.theme.console.dropdownHeaderBg};
     border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     color: ${(props) => props.theme.console.titleColor};
   }
@@ -235,7 +235,7 @@ const StyledWrapper = styled.div`
     border: none;
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     font-weight: 500;
     padding: 2px 4px;
     border-radius: 2px;
@@ -278,16 +278,16 @@ const StyledWrapper = styled.div`
 
   .filter-option-label {
     color: ${(props) => props.theme.console.optionLabelColor};
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 400;
   }
 
   .filter-option-count {
     color: ${(props) => props.theme.console.optionCountColor};
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     font-weight: 400;
     margin-left: auto;
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Devtools/Console/NetworkTab/index.js b/packages/bruno-app/src/components/Devtools/Console/NetworkTab/index.js
index 6e4480398..54565c676 100644
--- a/packages/bruno-app/src/components/Devtools/Console/NetworkTab/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/NetworkTab/index.js
@@ -1,13 +1,13 @@
 import React, { useState, useRef, useEffect, useMemo } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { 
+import {
   IconFilter,
   IconChevronDown,
-  IconNetwork,
+  IconNetwork
 } from '@tabler/icons';
-import { 
-  updateNetworkFilter, 
-  toggleAllNetworkFilters, 
+import {
+  updateNetworkFilter,
+  toggleAllNetworkFilters,
   setSelectedRequest
 } from 'providers/ReduxStore/slices/logs';
 import StyledWrapper from './StyledWrapper';
@@ -27,8 +27,8 @@ const MethodBadge = ({ method }) => {
   };
 
   return (
-    <span 
-      className="method-badge" 
+    <span
+      className="method-badge"
       style={{ backgroundColor: getMethodColor(method) }}
     >
       {method?.toUpperCase() || 'GET'}
@@ -46,10 +46,10 @@ const StatusBadge = ({ status, statusCode }) => {
   };
 
   const displayStatus = statusCode || status;
-  
+
   return (
-    <span 
-      className="status-badge" 
+    <span
+      className="status-badge"
       style={{ color: getStatusColor(statusCode) }}
     >
       {displayStatus}
@@ -61,7 +61,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
   const [isOpen, setIsOpen] = useState(false);
   const dropdownRef = useRef(null);
 
-  const allFiltersEnabled = Object.values(filters).every(f => f);
+  const allFiltersEnabled = Object.values(filters).every((f) => f);
   const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
 
   useEffect(() => {
@@ -77,7 +77,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
 
   return (
     <div className="filter-dropdown" ref={dropdownRef}>
-      <button 
+      <button
         className="filter-dropdown-trigger"
         onClick={() => setIsOpen(!isOpen)}
         title="Filter requests by method"
@@ -88,21 +88,21 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
         </span>
         <IconChevronDown size={14} strokeWidth={1.5} />
       </button>
-      
+
       {isOpen && (
-        <div className={`filter-dropdown-menu right`}>
+        <div className="filter-dropdown-menu right">
           <div className="filter-dropdown-header">
             <span>Filter by Method</span>
-            <button 
+            <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 => (
+            {Object.keys(filters).map((method) => (
               <label key={method} className="filter-option">
                 <input
                   type="checkbox"
@@ -126,13 +126,13 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
 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', 
+    return date.toLocaleTimeString('en-US', {
+      hour12: false,
+      hour: '2-digit',
+      minute: '2-digit',
       second: '2-digit',
       fractionalSecondDigits: 3
     });
@@ -174,34 +174,34 @@ const RequestRow = ({ request, isSelected, onClick }) => {
   };
 
   return (
-    <div 
+    <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>
@@ -211,17 +211,17 @@ const RequestRow = ({ request, isSelected, onClick }) => {
 
 const NetworkTab = () => {
   const dispatch = useDispatch();
-  const { networkFilters, selectedRequest } = useSelector(state => state.logs);
-  const collections = useSelector(state => state.collections.collections);
+  const { networkFilters, selectedRequest } = useSelector((state) => state.logs);
+  const collections = useSelector((state) => state.collections.collections);
 
   const allRequests = useMemo(() => {
     const requests = [];
-    
-    collections.forEach(collection => {
+
+    collections.forEach((collection) => {
       if (collection.timeline) {
         collection.timeline
-          .filter(entry => entry.type === 'request')
-          .forEach(entry => {
+          .filter((entry) => entry.type === 'request')
+          .forEach((entry) => {
             requests.push({
               ...entry,
               collectionName: collection.name,
@@ -230,12 +230,12 @@ const NetworkTab = () => {
           });
       }
     });
-    
+
     return requests.sort((a, b) => a.timestamp - b.timestamp);
   }, [collections]);
 
   const filteredRequests = useMemo(() => {
-    return allRequests.filter(request => {
+    return allRequests.filter((request) => {
       const method = request.data?.request?.method?.toUpperCase() || 'GET';
       return networkFilters[method];
     });
@@ -281,7 +281,7 @@ const NetworkTab = () => {
               <div className="text-right">Duration</div>
               <div className="text-right">Size</div>
             </div>
-            
+
             <div className="requests-list">
               {filteredRequests.map((request, index) => (
                 <RequestRow
@@ -299,4 +299,4 @@ const NetworkTab = () => {
   );
 };
 
-export default NetworkTab; 
\ No newline at end of file
+export default NetworkTab;
diff --git a/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/StyledWrapper.js b/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/StyledWrapper.js
index 3cc9ba03d..b03b1bd3e 100644
--- a/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/StyledWrapper.js
@@ -26,12 +26,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     font-weight: 500;
 
     .request-time {
       color: ${(props) => props.theme.console.countColor};
-      font-size: 11px;
+      font-size: ${(props) => props.theme.font.size.xs};
       font-weight: 400;
     }
   }
@@ -73,7 +73,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
 
     &:hover {
@@ -111,8 +111,8 @@ const StyledWrapper = styled.div`
 
     h4 {
       margin: 0;
-      font-size: 13px;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.base};
+      font-weight: 500;
       color: ${(props) => props.theme.console.titleColor};
       padding-bottom: 4px;
       border-bottom: 1px solid ${(props) => props.theme.console.border};
@@ -131,15 +131,15 @@ const StyledWrapper = styled.div`
     gap: 2px;
 
     .label {
-      font-size: 11px;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.xs};
+      font-weight: 500;
       color: ${(props) => props.theme.console.countColor};
       text-transform: uppercase;
       letter-spacing: 0.5px;
     }
 
     .value {
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       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;
@@ -160,7 +160,7 @@ const StyledWrapper = styled.div`
     table {
       width: 100%;
       border-collapse: collapse;
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       background: ${(props) => props.theme.console.headerBg};
 
       thead {
@@ -171,10 +171,10 @@ const StyledWrapper = styled.div`
         
         td {
           padding: 8px 12px;
-          font-weight: 600;
+          font-weight: 500;
           color: ${(props) => props.theme.console.titleColor};
           text-transform: uppercase;
-          font-size: 11px;
+          font-size: ${(props) => props.theme.font.size.xs};
           letter-spacing: 0.5px;
           border-bottom: 1px solid ${(props) => props.theme.console.border};
         }
@@ -209,7 +209,7 @@ const StyledWrapper = styled.div`
   .header-name,
   .timeline-phase {
     color: ${(props) => props.theme.console.countColor};
-    font-weight: 600;
+    font-weight: 500;
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
     min-width: 120px;
   }
@@ -234,7 +234,7 @@ const StyledWrapper = styled.div`
     border-radius: 4px;
     padding: 12px;
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     line-height: 1.4;
     color: ${(props) => props.theme.console.messageColor};
     overflow: auto;
@@ -249,7 +249,7 @@ const StyledWrapper = styled.div`
     text-align: center;
     color: ${(props) => props.theme.console.emptyColor};
     font-style: italic;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     background: ${(props) => props.theme.console.headerBg};
     border: 1px solid ${(props) => props.theme.console.border};
     border-radius: 4px;
@@ -285,7 +285,7 @@ const StyledWrapper = styled.div`
       
       > div {
         color: ${(props) => props.theme.console.buttonColor};
-        font-size: 12px !important;
+        font-size: ${(props) => props.theme.font.size.sm} !important;
         padding: 6px 12px !important;
         border-radius: 4px;
         transition: all 0.2s ease;
@@ -336,7 +336,7 @@ const StyledWrapper = styled.div`
       
       pre {
         color: ${(props) => props.theme.console.messageColor} !important;
-        font-size: 11px !important;
+        font-size: ${(props) => props.theme.font.size.xs} !important;
         line-height: 1.4 !important;
         padding: 12px !important;
       }
@@ -344,4 +344,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/index.js b/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/index.js
index d9af83aad..f6f45569c 100644
--- a/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/RequestDetailsPanel/index.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { 
+import {
   IconX,
   IconFileText,
   IconArrowRight,
@@ -117,7 +117,7 @@ const ResponseTab = ({ response, request, collection }) => {
         <div className="response-body-container">
           {response?.data || response?.dataBuffer ? (
             <QueryResult
-              item={{ uid:  uuid()}}
+              item={{ uid: uuid() }}
               collection={collection}
               data={response.data}
               dataBuffer={response.dataBuffer}
@@ -155,8 +155,8 @@ const NetworkTab = ({ response }) => {
 
 const RequestDetailsPanel = () => {
   const dispatch = useDispatch();
-  const { selectedRequest } = useSelector(state => state.logs);
-  const collections = useSelector(state => state.collections.collections);
+  const { selectedRequest } = useSelector((state) => state.logs);
+  const collections = useSelector((state) => state.collections.collections);
   const [activeTab, setActiveTab] = useState('request');
 
   if (!selectedRequest) return null;
@@ -164,7 +164,7 @@ const RequestDetailsPanel = () => {
   const { data } = selectedRequest;
   const { request, response } = data;
 
-  const collection = collections.find(c => c.uid === selectedRequest.collectionUid);
+  const collection = collections.find((c) => c.uid === selectedRequest.collectionUid);
 
   const handleClose = () => {
     dispatch(clearSelectedRequest());
@@ -196,8 +196,8 @@ const RequestDetailsPanel = () => {
           <span>Request Details</span>
           <span className="request-time">({formatTime(selectedRequest.timestamp)})</span>
         </div>
-        
-        <button 
+
+        <button
           className="close-button"
           onClick={handleClose}
           title="Close details panel"
@@ -207,23 +207,23 @@ const RequestDetailsPanel = () => {
       </div>
 
       <div className="panel-tabs">
-        <button 
+        <button
           className={`tab-button ${activeTab === 'request' ? 'active' : ''}`}
           onClick={() => setActiveTab('request')}
         >
           <IconArrowRight size={14} strokeWidth={1.5} />
           Request
         </button>
-        
-        <button 
+
+        <button
           className={`tab-button ${activeTab === 'response' ? 'active' : ''}`}
           onClick={() => setActiveTab('response')}
         >
           <IconFileText size={14} strokeWidth={1.5} />
           Response
         </button>
-        
-        <button 
+
+        <button
           className={`tab-button ${activeTab === 'network' ? 'active' : ''}`}
           onClick={() => setActiveTab('network')}
         >
@@ -239,4 +239,4 @@ const RequestDetailsPanel = () => {
   );
 };
 
-export default RequestDetailsPanel; 
+export default RequestDetailsPanel;
diff --git a/packages/bruno-app/src/components/Devtools/Console/StyledWrapper.js b/packages/bruno-app/src/components/Devtools/Console/StyledWrapper.js
index 117d176e6..a15849747 100644
--- a/packages/bruno-app/src/components/Devtools/Console/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Console/StyledWrapper.js
@@ -37,7 +37,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     border-radius: 4px 4px 0 0;
 
@@ -89,12 +89,12 @@ const StyledWrapper = styled.div`
     align-items: center;
     gap: 8px;
     color: ${(props) => props.theme.console.titleColor};
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     font-weight: 500;
 
     .log-count {
       color: ${(props) => props.theme.console.countColor};
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       font-weight: 400;
     }
   }
@@ -194,7 +194,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
     transition: all 0.2s ease;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
 
     &:hover {
       background: ${(props) => props.theme.console.buttonHoverBg};
@@ -235,7 +235,7 @@ const StyledWrapper = styled.div`
     padding: 8px 12px;
     background: ${(props) => props.theme.console.dropdownHeaderBg};
     border-bottom: 1px solid ${(props) => props.theme.console.border};
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     color: ${(props) => props.theme.console.titleColor};
   }
@@ -245,7 +245,7 @@ const StyledWrapper = styled.div`
     border: none;
     color: ${(props) => props.theme.console.buttonColor};
     cursor: pointer;
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     font-weight: 500;
     padding: 2px 4px;
     border-radius: 2px;
@@ -288,13 +288,13 @@ const StyledWrapper = styled.div`
 
   .filter-option-label {
     color: ${(props) => props.theme.console.optionLabelColor};
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 400;
   }
 
   .filter-option-count {
     color: ${(props) => props.theme.console.optionCountColor};
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     font-weight: 400;
     margin-left: auto;
   }
@@ -312,12 +312,12 @@ const StyledWrapper = styled.div`
 
     p {
       margin: 0;
-      font-size: 14px;
+      font-size: ${(props) => props.theme.font.size.base};
       font-weight: 500;
     }
 
     span {
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       opacity: 0.7;
     }
   }
@@ -333,7 +333,7 @@ const StyledWrapper = styled.div`
     padding: 2px 6px;
     border-radius: 4px;
     font-size: 10px;
-    font-weight: 600;
+    font-weight: 500;
     color: white;
     text-transform: uppercase;
     letter-spacing: 0.5px;
@@ -346,7 +346,7 @@ const StyledWrapper = styled.div`
     gap: 12px;
     padding: 4px 16px;
     font-family: ui-monospace, 'SF Mono', 'Monaco', 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     line-height: 1.4;
     border-left: 2px solid transparent;
     transition: background-color 0.1s ease;
@@ -431,13 +431,13 @@ const StyledWrapper = styled.div`
 
   .log-timestamp {
     color: ${(props) => props.theme.console.timestampColor};
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     font-weight: 400;
   }
 
   .log-level {
     font-size: 9px;
-    font-weight: 600;
+    font-weight: 500;
     padding: 2px 4px;
     border-radius: 2px;
     text-transform: uppercase;
@@ -465,7 +465,7 @@ const StyledWrapper = styled.div`
         background: transparent !important;
         
         .object-key-val {
-          font-size: 12px !important;
+          font-size: ${(props) => props.theme.font.size.sm} !important;
         }
         
         .object-key {
@@ -517,4 +517,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Devtools/Console/TerminalTab/SessionList.js b/packages/bruno-app/src/components/Devtools/Console/TerminalTab/SessionList.js
new file mode 100644
index 000000000..5e26b4bbd
--- /dev/null
+++ b/packages/bruno-app/src/components/Devtools/Console/TerminalTab/SessionList.js
@@ -0,0 +1,151 @@
+import React from 'react';
+import { IconTerminal, IconX } from '@tabler/icons';
+import styled from 'styled-components';
+import ToolHint from 'components/ToolHint/index';
+
+const StyledSessionList = styled.div`
+  .session-list-item {
+    padding: 10px 12px;
+    cursor: pointer;
+    border-bottom: 1px solid ${(props) => props.theme.border || 'rgba(255, 255, 255, 0.05)'};
+    transition: all 0.2s;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    position: relative;
+
+    &:hover {
+      background: ${(props) => props.theme.sidebarHover || 'rgba(255, 255, 255, 0.05)'};
+      
+      .session-close-btn {
+        opacity: 1;
+      }
+    }
+
+    &.active {
+      background: ${(props) => props.theme.sidebarActive || 'rgba(59, 142, 234, 0.12)'};
+      border-left: 2px solid ${(props) => props.theme.brandColor || '#3b8eea'};
+    }
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .session-close-btn {
+    position: absolute;
+    right: 8px;
+    top: 50%;
+    transform: translateY(-50%);
+    opacity: 0;
+    transition: opacity 0.2s;
+    padding: 4px;
+    cursor: pointer;
+    color: ${(props) => props.theme.textSecondary || '#888'};
+    
+    &:hover {
+      color: ${(props) => props.theme.text};
+      background: ${(props) => props.theme.sidebarHover || 'rgba(255, 255, 255, 0.1)'};
+      border-radius: 4px;
+    }
+  }
+
+  .session-name {
+    font-size: 13px;
+    font-weight: 500;
+    color: ${(props) => props.theme.text};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    padding-right: 24px;
+    display: flex;
+    align-items: center;
+    gap: 6px;
+  }
+
+  .session-icon {
+    flex-shrink: 0;
+    opacity: 0.7;
+  }
+
+  .session-path {
+    font-size: 11px;
+    color: ${(props) => props.theme.textSecondary || '#888'};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+`;
+
+const SessionList = ({ sessions, activeSessionId, onSelectSession, onCloseSession }) => {
+  const getSessionDisplayInfo = (session) => {
+    if (session.name) {
+      return { name: session.name };
+    }
+
+    if (session.cwd) {
+      // Normalize path and get the last directory name
+      const normalizedPath = session.cwd.replace(/\\/g, '/').replace(/\/$/, '');
+      const pathParts = normalizedPath.split('/').filter((p) => p);
+
+      if (pathParts.length > 0) {
+        const folderName = pathParts[pathParts.length - 1];
+        return { name: folderName };
+      }
+
+      // If it's root or home directory
+      if (normalizedPath === '' || normalizedPath === '/' || normalizedPath.match(/^[A-Z]:\/?$/)) {
+        return { name: 'Root' };
+      }
+    }
+
+    // Fallback: use a cool name based on session ID
+    const shortId = session.sessionId.split('_')[1]?.slice(-6) || session.sessionId.slice(-6);
+    return { name: `Terminal ${shortId}` };
+  };
+
+  const getFullPath = (session) => {
+    if (session.cwd) {
+      return session.cwd;
+    }
+    return '~ (Home Directory)';
+  };
+
+  return (
+    <StyledSessionList>
+      {sessions.map((session) => {
+        const { name } = getSessionDisplayInfo(session);
+        return (
+          <ToolHint
+            key={session.sessionId}
+            text={getFullPath(session)}
+            toolhintId={`session-path-${session.sessionId}`}
+            place="bottom-start"
+            delayShow={100}
+          >
+            <div
+              className={`session-list-item ${activeSessionId === session.sessionId ? 'active' : ''}`}
+              onClick={() => onSelectSession(session.sessionId)}
+            >
+              <div className="session-name">
+                <IconTerminal className="session-icon" size={14} />
+                <span>{name}</span>
+              </div>
+              <div
+                className="session-close-btn"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  onCloseSession(session.sessionId);
+                }}
+              >
+                <IconX size={14} />
+              </div>
+            </div>
+          </ToolHint>
+        );
+      })}
+    </StyledSessionList>
+  );
+};
+
+export default SessionList;
diff --git a/packages/bruno-app/src/components/Devtools/Console/TerminalTab/StyledWrapper.js b/packages/bruno-app/src/components/Devtools/Console/TerminalTab/StyledWrapper.js
new file mode 100644
index 000000000..378fa7494
--- /dev/null
+++ b/packages/bruno-app/src/components/Devtools/Console/TerminalTab/StyledWrapper.js
@@ -0,0 +1,201 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  color: ${(props) => props.theme.text};
+
+  .xterm-rows {
+    color: ${(props) => props.theme.text} !important;
+  }
+
+  .terminal-content {
+    height: 100%;
+    width: 100%;
+    position: relative;
+    display: flex;
+    flex-direction: row;
+  }
+
+  .terminal-sessions-sidebar {
+    width: 200px;
+    min-width: 200px;
+    border-right: 1px solid ${(props) => props.theme.border || 'rgba(255, 255, 255, 0.08)'};
+    background: ${(props) => props.theme.sidebarBackground || props.theme.background};
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+  }
+
+  .terminal-sessions-header {
+    padding: 12px;
+    font-weight: 600;
+    font-size: 13px;
+    color: ${(props) => props.theme.text};
+    border-bottom: 1px solid ${(props) => props.theme.border || 'rgba(255, 255, 255, 0.08)'};
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .terminal-sessions-list {
+    flex: 1;
+    overflow-y: auto;
+
+    /* Custom scrollbar styling - subtle */
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    &::-webkit-scrollbar-track {
+      background: transparent;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: rgba(255, 255, 255, 0.1);
+      border-radius: 3px;
+    }
+
+    &::-webkit-scrollbar-thumb:hover {
+      background: rgba(255, 255, 255, 0.15);
+    }
+  }
+
+  .terminal-session-item {
+    padding: 10px 12px;
+    cursor: pointer;
+    border-bottom: 1px solid ${(props) => props.theme.border};
+    transition: background 0.2s;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+
+    &:hover {
+      background: ${(props) => props.theme.sidebarHover || 'rgba(255, 255, 255, 0.05)'};
+    }
+
+    &.active {
+      background: ${(props) => props.theme.sidebarActive || 'rgba(59, 142, 234, 0.15)'};
+      border-left: 3px solid ${(props) => props.theme.brandColor || '#3b8eea'};
+    }
+  }
+
+  .terminal-session-name {
+    font-size: 13px;
+    font-weight: 500;
+    color: ${(props) => props.theme.text};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .terminal-session-path {
+    font-size: 11px;
+    color: ${(props) => props.theme.textSecondary || '#888'};
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .terminal-display-container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+  }
+
+  .terminal-loading {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 12px;
+    color: #888;
+    font-size: 14px;
+    z-index: 10;
+
+    svg {
+      opacity: 0.7;
+    }
+
+    span {
+      font-weight: 500;
+    }
+  }
+
+  .terminal-container {
+    flex: 1;
+    position: relative;
+    
+    .xterm {
+      height: 100% !important;
+      width: 100% !important;
+      padding: 8px;
+    }
+
+    .xterm-viewport {
+      background: transparent !important;
+    }
+
+    .xterm-screen {
+      background: transparent !important;
+    }
+
+    .xterm-decoration-overview-ruler {
+      display: none;
+    }
+
+    /* Custom scrollbar for terminal */
+    .xterm-viewport::-webkit-scrollbar {
+      width: 8px;
+    }
+
+    .xterm-viewport::-webkit-scrollbar-track {
+      background: rgba(255, 255, 255, 0.05);
+      border-radius: 4px;
+    }
+
+    .xterm-viewport::-webkit-scrollbar-thumb {
+      background: rgba(255, 255, 255, 0.2);
+      border-radius: 4px;
+    }
+
+    .xterm-viewport::-webkit-scrollbar-thumb:hover {
+      background: rgba(255, 255, 255, 0.3);
+    }
+  }
+
+  /* Dark theme adjustments */
+  .xterm-helper-textarea {
+    position: absolute !important;
+    left: -9999px !important;
+    top: -9999px !important;
+  }
+
+  /* Selection styling */
+  .xterm .xterm-selection div {
+    background-color: rgba(255, 255, 255, 0.3) !important;
+  }
+
+  /* Cursor styling */
+  .xterm .xterm-cursor-layer .xterm-cursor {
+    background-color: #d4d4d4 !important;
+  }
+
+  /* Link styling */
+  .xterm .xterm-decoration-link {
+    text-decoration: underline;
+    color: #3b8eea;
+  }
+
+  .xterm .xterm-decoration-link:hover {
+    color: #5ba7f7;
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Devtools/Console/TerminalTab/index.js b/packages/bruno-app/src/components/Devtools/Console/TerminalTab/index.js
new file mode 100644
index 000000000..5d1046070
--- /dev/null
+++ b/packages/bruno-app/src/components/Devtools/Console/TerminalTab/index.js
@@ -0,0 +1,449 @@
+import React, { useRef, useEffect, useState, useCallback } from 'react';
+import { Terminal } from '@xterm/xterm';
+import { FitAddon } from '@xterm/addon-fit';
+import { IconTerminal2, IconPlus } from '@tabler/icons';
+import StyledWrapper from './StyledWrapper';
+import SessionList from './SessionList';
+import '@xterm/xterm/css/xterm.css';
+
+// Terminal instances per session - Map<sessionId, { terminal, fitAddon, inputDisposable, resizeDisposable }>
+const terminalInstances = new Map();
+
+// Data listeners per session - Map<sessionId, { onData, onExit }>
+const sessionListeners = new Map();
+
+// Parking host for terminal DOM when view unmounts
+let parkingHost = null;
+
+// Export function to get current session ID (for backward compatibility)
+export const getSessionId = () => {
+  // Return the first active session ID if any
+  if (terminalInstances.size > 0) {
+    return Array.from(terminalInstances.keys())[0];
+  }
+  return null;
+};
+
+const ensureParkingHost = () => {
+  if (parkingHost && document.body.contains(parkingHost)) return parkingHost;
+  parkingHost = document.createElement('div');
+  parkingHost.style.display = 'none';
+  parkingHost.setAttribute('data-terminal-parking-host', 'true');
+  document.body.appendChild(parkingHost);
+  return parkingHost;
+};
+
+const createTerminalForSession = (sessionId) => {
+  if (terminalInstances.has(sessionId)) {
+    return terminalInstances.get(sessionId);
+  }
+
+  const terminal = new Terminal({
+    cursorBlink: true,
+    fontSize: 14,
+    fontFamily: 'Menlo, Monaco, "Courier New", monospace',
+    theme: {
+      background: '#1e1e1e',
+      foreground: '#d4d4d4',
+      cursor: '#d4d4d4',
+      selection: '#264f78',
+      black: '#1e1e1e',
+      red: '#f14c4c',
+      green: '#23d18b',
+      yellow: '#f5f543',
+      blue: '#3b8eea',
+      magenta: '#d670d6',
+      cyan: '#29b8db',
+      white: '#e5e5e5',
+      brightBlack: '#666666',
+      brightRed: '#f14c4c',
+      brightGreen: '#23d18b',
+      brightYellow: '#f5f543',
+      brightBlue: '#3b8eea',
+      brightMagenta: '#d670d6',
+      brightCyan: '#29b8db',
+      brightWhite: '#e5e5e5'
+    },
+    allowProposedApi: true
+  });
+
+  const fitAddon = new FitAddon();
+  terminal.loadAddon(fitAddon);
+
+  const inputDisposable = terminal.onData((data) => {
+    if (data && sessionId && window.ipcRenderer) {
+      window.ipcRenderer.send('terminal:input', sessionId, data);
+    }
+  });
+
+  const resizeDisposable = terminal.onResize(({ cols, rows }) => {
+    if (sessionId && window.ipcRenderer) {
+      window.ipcRenderer.send('terminal:resize', sessionId, { cols, rows });
+    }
+  });
+
+  const instance = {
+    terminal,
+    fitAddon,
+    inputDisposable,
+    resizeDisposable
+  };
+
+  terminalInstances.set(sessionId, instance);
+
+  // Setup IPC listeners for this session
+  if (window.ipcRenderer && !sessionListeners.has(sessionId)) {
+    const onData = (data) => {
+      if (!data) return;
+      const instance = terminalInstances.get(sessionId);
+      if (instance && instance.terminal) {
+        try {
+          instance.terminal.write(data);
+        } catch (err) {
+          console.warn('Failed to write terminal data:', err);
+        }
+      }
+    };
+
+    const onExit = ({ exitCode, signal } = {}) => {
+      const msg = `\r\n[Process exited with code ${exitCode ?? ''} ${signal ? `(signal ${signal})` : ''}]\r\n`;
+      const instance = terminalInstances.get(sessionId);
+      if (instance && instance.terminal) {
+        try {
+          instance.terminal.write(msg);
+        } catch (err) {
+          console.warn('Failed to write terminal exit message:', err);
+        }
+      }
+      // Cleanup on exit
+      cleanupTerminalInstance(sessionId);
+    };
+
+    window.ipcRenderer.on(`terminal:data:${sessionId}`, onData);
+    window.ipcRenderer.on(`terminal:exit:${sessionId}`, onExit);
+
+    sessionListeners.set(sessionId, { onData, onExit });
+  }
+
+  return instance;
+};
+
+const cleanupTerminalInstance = (sessionId) => {
+  const instance = terminalInstances.get(sessionId);
+  if (instance) {
+    try {
+      if (instance.inputDisposable) instance.inputDisposable.dispose();
+      if (instance.resizeDisposable) instance.resizeDisposable.dispose();
+      if (instance.terminal) {
+        instance.terminal.dispose();
+      }
+    } catch (err) {
+      console.warn('Error disposing terminal instance:', err);
+    }
+    terminalInstances.delete(sessionId);
+  }
+
+  // Remove IPC listeners
+  const listeners = sessionListeners.get(sessionId);
+  if (listeners && window.ipcRenderer) {
+    try {
+      window.ipcRenderer.removeAllListeners(`terminal:data:${sessionId}`);
+      window.ipcRenderer.removeAllListeners(`terminal:exit:${sessionId}`);
+    } catch (err) {
+      console.warn('Error removing IPC listeners:', err);
+    }
+    sessionListeners.delete(sessionId);
+  }
+};
+
+const openTerminalIntoContainer = async (container, sessionId) => {
+  if (!container || !sessionId) return;
+
+  const instance = createTerminalForSession(sessionId);
+  const { terminal, fitAddon } = instance;
+
+  if (!terminal.element) {
+    terminal.open(container);
+  } else {
+    // Move terminal element to new container
+    if (terminal.element.parentElement !== container) {
+      container.appendChild(terminal.element);
+    }
+  }
+
+  await new Promise((resolve) => setTimeout(resolve, 50));
+  try {
+    fitAddon.fit();
+    const { cols, rows } = terminal;
+    if (cols && rows && window.ipcRenderer) {
+      window.ipcRenderer.send('terminal:resize', sessionId, { cols, rows });
+    }
+  } catch (e) {
+    console.warn('Error fitting terminal:', e);
+  }
+};
+
+const TerminalTab = () => {
+  const terminalRef = useRef(null);
+  const [sessions, setSessions] = useState([]);
+  const [activeSessionId, setActiveSessionId] = useState(null);
+  const [isLoading, setIsLoading] = useState(true);
+
+  // Load sessions list
+  const loadSessions = useCallback(async (currentActiveSessionId = null) => {
+    if (!window.ipcRenderer) return [];
+
+    try {
+      const sessionList = await window.ipcRenderer.invoke('terminal:list-sessions');
+      setSessions(sessionList);
+
+      // Use functional state updates to get the current activeSessionId
+      setActiveSessionId((prevActiveSessionId) => {
+        const activeId = currentActiveSessionId !== null ? currentActiveSessionId : prevActiveSessionId;
+
+        // Auto-select first session if none selected
+        if (!activeId && sessionList.length > 0) {
+          return sessionList[0].sessionId;
+        }
+
+        // If active session no longer exists, select first available
+        if (activeId && !sessionList.find((s) => s.sessionId === activeId)) {
+          return sessionList.length > 0 ? sessionList[0].sessionId : null;
+        }
+
+        // Keep current selection if it still exists
+        return activeId;
+      });
+
+      return sessionList;
+    } catch (err) {
+      console.error('Failed to load sessions:', err);
+      return [];
+    }
+  }, []);
+
+  // Create new terminal session
+  const createNewSession = useCallback(async (cwd = null) => {
+    if (!window.ipcRenderer) return null;
+
+    try {
+      const options = cwd ? { cwd } : {};
+      const newSessionId = await window.ipcRenderer.invoke('terminal:create', options);
+      if (newSessionId) {
+        await loadSessions(newSessionId);
+        setActiveSessionId(newSessionId);
+        return newSessionId;
+      }
+    } catch (err) {
+      console.error('Failed to create terminal session:', err);
+    }
+    return null;
+  }, [loadSessions]);
+
+  // Listen for requests to open terminal at specific CWD
+  useEffect(() => {
+    const normalizePath = (path) => {
+      if (!path) return '';
+      // Normalize path separators and remove trailing separators for comparison
+      return path.replace(/\\/g, '/').replace(/\/$/, '') || '/';
+    };
+
+    const handleOpenTerminalAtCwd = async (event) => {
+      const { cwd } = event.detail;
+      if (!cwd) return;
+
+      const normalizedCwd = normalizePath(cwd);
+
+      // Check if session already exists at this CWD
+      const sessionList = await window.ipcRenderer.invoke('terminal:list-sessions');
+      const existingSession = sessionList.find((s) => normalizePath(s.cwd) === normalizedCwd);
+
+      if (existingSession) {
+        // Switch to existing session
+        await loadSessions(existingSession.sessionId);
+        setActiveSessionId(existingSession.sessionId);
+      } else {
+        // Create new session at this CWD
+        await createNewSession(cwd);
+      }
+    };
+
+    window.addEventListener('terminal:open-at-cwd', handleOpenTerminalAtCwd);
+
+    return () => {
+      window.removeEventListener('terminal:open-at-cwd', handleOpenTerminalAtCwd);
+    };
+  }, [loadSessions, createNewSession]);
+
+  // Close terminal session
+  const closeSession = async (sessionId) => {
+    if (!window.ipcRenderer) return;
+
+    try {
+      window.ipcRenderer.send('terminal:kill', sessionId);
+      cleanupTerminalInstance(sessionId);
+
+      // Load updated sessions (this will also handle active session switching)
+      const updatedSessions = await loadSessions();
+
+      // If we closed the active session and there are no sessions left, clear selection
+      if (activeSessionId === sessionId && updatedSessions.length === 0) {
+        setActiveSessionId(null);
+      }
+    } catch (err) {
+      console.error('Failed to close terminal session:', err);
+    }
+  };
+
+  // Load sessions on mount and set up polling
+  useEffect(() => {
+    if (!window.ipcRenderer) {
+      setIsLoading(false);
+      return;
+    }
+
+    let mounted = true;
+
+    const initialLoad = async () => {
+      const sessionList = await loadSessions();
+      if (mounted) {
+        setIsLoading(false);
+      }
+    };
+
+    initialLoad();
+
+    // Poll for session updates every 2 seconds
+    // Note: We don't pass currentActiveSessionId here to avoid stale closures
+    // The functional update inside loadSessions will use the current state
+    const pollInterval = setInterval(() => {
+      if (mounted) {
+        loadSessions();
+      }
+    }, 2000);
+
+    return () => {
+      mounted = false;
+      clearInterval(pollInterval);
+    };
+  }, []);
+
+  // Handle terminal display for active session
+  useEffect(() => {
+    if (!activeSessionId || !terminalRef.current) return;
+
+    let mounted = true;
+
+    const setupTerminal = async () => {
+      await openTerminalIntoContainer(terminalRef.current, activeSessionId);
+
+      if (mounted) {
+        const instance = terminalInstances.get(activeSessionId);
+        if (instance && instance.fitAddon) {
+          const onResize = () => {
+            try {
+              instance.fitAddon.fit();
+            } catch (e) {}
+          };
+
+          window.addEventListener('resize', onResize);
+
+          // Initial resize
+          setTimeout(() => {
+            try {
+              instance.fitAddon.fit();
+              const { cols, rows } = instance.terminal;
+              if (cols && rows && window.ipcRenderer) {
+                window.ipcRenderer.send('terminal:resize', activeSessionId, { cols, rows });
+              }
+            } catch (err) {
+              console.warn('Failed to perform initial resize:', err);
+            }
+          }, 100);
+
+          return () => {
+            window.removeEventListener('resize', onResize);
+
+            // Park terminal element when switching sessions
+            if (instance.terminal && instance.terminal.element) {
+              const host = ensureParkingHost();
+              if (instance.terminal.element.parentElement !== host) {
+                host.appendChild(instance.terminal.element);
+              }
+            }
+          };
+        }
+      }
+    };
+
+    const cleanup = setupTerminal();
+
+    return () => {
+      mounted = false;
+      Promise.resolve(cleanup).then((fn) => {
+        if (typeof fn === 'function') fn();
+      });
+    };
+  }, [activeSessionId]);
+
+  return (
+    <StyledWrapper>
+      <div className="terminal-content">
+        {/* Left Sidebar */}
+        <div className="terminal-sessions-sidebar">
+          <div className="terminal-sessions-header">
+            <span>Sessions</span>
+            <IconPlus
+              size={16}
+              style={{ cursor: 'pointer', color: '#888' }}
+              onClick={(e) => {
+                e.stopPropagation();
+                createNewSession();
+              }}
+              title="New Terminal Session"
+            />
+          </div>
+          <div className="terminal-sessions-list">
+            {isLoading ? (
+              <div style={{ padding: '12px', color: '#888', fontSize: '13px' }}>
+                Loading sessions...
+              </div>
+            ) : sessions.length === 0 ? (
+              <div style={{ padding: '12px', color: '#888', fontSize: '13px' }}>
+                No active sessions
+              </div>
+            ) : (
+              <SessionList
+                sessions={sessions}
+                activeSessionId={activeSessionId}
+                onSelectSession={setActiveSessionId}
+                onCloseSession={closeSession}
+              />
+            )}
+          </div>
+        </div>
+
+        {/* Right Terminal Display */}
+        <div className="terminal-display-container">
+          {!activeSessionId && window.ipcRenderer && (
+            <div className="terminal-loading">
+              <IconTerminal2 size={24} strokeWidth={1.5} />
+              <span>No terminal session selected</span>
+            </div>
+          )}
+          <div
+            ref={terminalRef}
+            className="terminal-container"
+            style={{
+              height: '100%',
+              width: '100%',
+              display: activeSessionId ? 'block' : 'none'
+            }}
+          />
+        </div>
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default TerminalTab;
diff --git a/packages/bruno-app/src/components/Devtools/Console/index.js b/packages/bruno-app/src/components/Devtools/Console/index.js
index 72bdf3487..62411f5e0 100644
--- a/packages/bruno-app/src/components/Devtools/Console/index.js
+++ b/packages/bruno-app/src/components/Devtools/Console/index.js
@@ -2,12 +2,12 @@ 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, 
+import {
+  IconX,
+  IconTrash,
   IconFilter,
-  IconAlertTriangle, 
-  IconAlertCircle, 
+  IconAlertTriangle,
+  IconAlertCircle,
   IconBug,
   IconCode,
   IconChevronDown,
@@ -15,10 +15,10 @@ import {
   IconNetwork,
   IconDashboard
 } from '@tabler/icons';
-import { 
-  closeConsole, 
-  clearLogs, 
-  updateFilter, 
+import {
+  closeConsole,
+  clearLogs,
+  updateFilter,
   toggleAllFilters,
   setActiveTab,
   clearDebugErrors,
@@ -27,6 +27,7 @@ import {
 } from 'providers/ReduxStore/slices/logs';
 
 import NetworkTab from './NetworkTab';
+import TerminalTab from './TerminalTab';
 import RequestDetailsPanel from './RequestDetailsPanel';
 // import DebugTab from './DebugTab';
 import ErrorDetailsPanel from './ErrorDetailsPanel';
@@ -35,7 +36,7 @@ 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} />;
@@ -52,20 +53,20 @@ const LogIcon = ({ type }) => {
 
 const LogTimestamp = ({ timestamp }) => {
   const date = new Date(timestamp);
-  const time = date.toLocaleTimeString('en-US', { 
-    hour12: false, 
-    hour: '2-digit', 
-    minute: '2-digit', 
+  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) => {
@@ -84,7 +85,7 @@ const LogMessage = ({ message, args }) => {
                 name={false}
                 style={{
                   backgroundColor: 'transparent',
-                  fontSize: '12px',
+                  fontSize: '${(props) => props.theme.font.size.sm}',
                   fontFamily: 'ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono", monospace'
                 }}
               />
@@ -98,7 +99,7 @@ const LogMessage = ({ message, args }) => {
   };
 
   const formattedMessage = formatMessage(message, args);
-  
+
   return (
     <span className="log-message">
       {Array.isArray(formattedMessage) ? formattedMessage.map((item, index) => (
@@ -112,7 +113,7 @@ const FilterDropdown = ({ filters, logCounts, onFilterToggle, onToggleAll }) =>
   const [isOpen, setIsOpen] = useState(false);
   const dropdownRef = useRef(null);
 
-  const allFiltersEnabled = Object.values(filters).every(f => f);
+  const allFiltersEnabled = Object.values(filters).every((f) => f);
   const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
 
   useEffect(() => {
@@ -128,7 +129,7 @@ const FilterDropdown = ({ filters, logCounts, onFilterToggle, onToggleAll }) =>
 
   return (
     <div className="filter-dropdown" ref={dropdownRef}>
-      <button 
+      <button
         className="filter-dropdown-trigger"
         onClick={() => setIsOpen(!isOpen)}
         title="Filter logs by type"
@@ -139,19 +140,19 @@ const FilterDropdown = ({ filters, logCounts, onFilterToggle, onToggleAll }) =>
         </span>
         <IconChevronDown size={14} strokeWidth={1.5} />
       </button>
-      
+
       {isOpen && (
-        <div className={`filter-dropdown-menu right`}>
+        <div className="filter-dropdown-menu right">
           <div className="filter-dropdown-header">
             <span>Filter by Type</span>
-            <button 
+            <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">
@@ -178,7 +179,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
   const [isOpen, setIsOpen] = useState(false);
   const dropdownRef = useRef(null);
 
-  const allFiltersEnabled = Object.values(filters).every(f => f);
+  const allFiltersEnabled = Object.values(filters).every((f) => f);
   const activeFilters = Object.entries(filters).filter(([_, enabled]) => enabled);
 
   const getMethodColor = (method) => {
@@ -207,7 +208,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
 
   return (
     <div className="filter-dropdown" ref={dropdownRef}>
-      <button 
+      <button
         className="filter-dropdown-trigger"
         onClick={() => setIsOpen(!isOpen)}
         title="Filter requests by method"
@@ -218,19 +219,19 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
         </span>
         <IconChevronDown size={14} strokeWidth={1.5} />
       </button>
-      
+
       {isOpen && (
-        <div className={`filter-dropdown-menu right`}>
+        <div className="filter-dropdown-menu right">
           <div className="filter-dropdown-header">
             <span>Filter by Method</span>
-            <button 
+            <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">
@@ -258,7 +259,7 @@ const NetworkFilterDropdown = ({ filters, requestCounts, onFilterToggle, onToggl
 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) {
@@ -267,7 +268,7 @@ const ConsoleTab = ({ logs, filters, logCounts, onFilterToggle, onToggleAll, onC
     prevLogsCountRef.current = logs.length;
   }, [logs]);
 
-  const filteredLogs = logs.filter(log => filters[log.type]);
+  const filteredLogs = logs.filter((log) => filters[log.type]);
 
   return (
     <div className="tab-content">
@@ -299,8 +300,8 @@ const ConsoleTab = ({ logs, filters, logCounts, onFilterToggle, onToggleAll, onC
 
 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 { 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) => {
@@ -310,12 +311,12 @@ const Console = () => {
 
   const allRequests = React.useMemo(() => {
     const requests = [];
-    
-    collections.forEach(collection => {
+
+    collections.forEach((collection) => {
       if (collection.timeline) {
         collection.timeline
-          .filter(entry => entry.type === 'request')
-          .forEach(entry => {
+          .filter((entry) => entry.type === 'request')
+          .forEach((entry) => {
             requests.push({
               ...entry,
               collectionName: collection.name,
@@ -324,12 +325,12 @@ const Console = () => {
           });
       }
     });
-    
+
     return requests.sort((a, b) => a.timestamp - b.timestamp);
   }, [collections]);
 
-  const filteredLogs = logs.filter(log => filters[log.type]);
-  const filteredRequests = allRequests.filter(request => {
+  const filteredLogs = logs.filter((log) => filters[log.type]);
+  const filteredRequests = allRequests.filter((request) => {
     const method = request.data?.request?.method?.toUpperCase() || 'GET';
     return networkFilters[method];
   });
@@ -389,6 +390,8 @@ const Console = () => {
         return <NetworkTab />;
       case 'performance':
         return <Performance />;
+      case 'terminal':
+        return <TerminalTab />;
       // case 'debug':
       //   return <DebugTab />;
       default:
@@ -419,7 +422,7 @@ const Console = () => {
               />
             </div>
             <div className="action-controls">
-              <button 
+              <button
                 className="control-button"
                 onClick={handleClearLogs}
                 title="Clear all logs"
@@ -442,12 +445,14 @@ const Console = () => {
             </div>
           </div>
         );
+      case 'terminal':
+        return null; // No controls needed for terminal
       // case 'debug':
       //   return (
       //     <div className="tab-controls">
       //       <div className="action-controls">
       //         {debugErrors.length > 0 && (
-      //           <button 
+      //           <button
       //             className="control-button"
       //             onClick={handleClearDebugErrors}
       //             title="Clear all errors"
@@ -463,32 +468,30 @@ const Console = () => {
     }
   };
 
-
-
   return (
     <StyledWrapper ref={consoleRef}>
-      <div 
+      <div
         className="console-resize-handle"
       />
-      
+
       <div className="console-header">
         <div className="console-tabs">
-          <button 
+          <button
             className={`console-tab ${activeTab === 'console' ? 'active' : ''}`}
             onClick={() => handleTabChange('console')}
           >
             <IconTerminal2 size={16} strokeWidth={1.5} />
             <span>Console</span>
           </button>
-          
-          <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 === 'performance' ? 'active' : ''}`}
             onClick={() => handleTabChange('performance')}
@@ -497,7 +500,15 @@ const Console = () => {
             <span>Performance</span>
           </button>
 
-          {/* <button 
+          <button
+            className={`console-tab ${activeTab === 'terminal' ? 'active' : ''}`}
+            onClick={() => handleTabChange('terminal')}
+          >
+            <IconTerminal2 size={16} strokeWidth={1.5} />
+            <span>Terminal</span>
+          </button>
+
+          {/* <button
             className={`console-tab ${activeTab === 'debug' ? 'active' : ''}`}
             onClick={() => handleTabChange('debug')}
           >
@@ -508,7 +519,7 @@ const Console = () => {
 
         <div className="console-controls">
           {renderTabControls()}
-          <button 
+          <button
             className="control-button close-button"
             onClick={handlecloseConsole}
             title="Close console"
@@ -541,4 +552,4 @@ const Console = () => {
   );
 };
 
-export default Console; 
\ No newline at end of file
+export default Console;
diff --git a/packages/bruno-app/src/components/Devtools/Performance/StyledWrapper.js b/packages/bruno-app/src/components/Devtools/Performance/StyledWrapper.js
index 7f6cb79a8..96060e14d 100644
--- a/packages/bruno-app/src/components/Devtools/Performance/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Devtools/Performance/StyledWrapper.js
@@ -35,13 +35,13 @@ const StyledWrapper = styled.div`
     h3 {
       margin: 0 0 4px 0;
       font-size: 16px;
-      font-weight: 600;
+      font-weight: 500;
       color: ${(props) => props.theme.console.titleColor};
     }
 
     p {
       margin: 0;
-      font-size: 13px;
+      font-size: ${(props) => props.theme.font.size.base};
       color: ${(props) => props.theme.console.textMuted};
     }
   }
@@ -51,8 +51,8 @@ const StyledWrapper = styled.div`
 
     h2 {
       margin: 0 0 8px 0;
-      font-size: 14px;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.base};
+      font-weight: 500;
       color: ${(props) => props.theme.console.titleColor};
     }
   }
@@ -80,19 +80,19 @@ const StyledWrapper = styled.div`
   }
 
   .resource-title {
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
   }
 
   .resource-value {
     font-size: 18px;
-    font-weight: 600;
+    font-weight: 500;
     color: ${(props) => props.theme.console.titleColor};
     margin-bottom: 2px;
   }
 
   .resource-subtitle {
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     color: ${(props) => props.theme.console.buttonColor};
   }
 
@@ -100,7 +100,7 @@ const StyledWrapper = styled.div`
     display: flex;
     align-items: center;
     gap: 4px;
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     margin-top: 8px;
 
     &.up {
@@ -115,6 +115,237 @@ const StyledWrapper = styled.div`
       color: ${(props) => props.theme.console.buttonColor};
     }
   }
+
+  .performance-header {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid ${(props) => props.theme.console.border};
+    padding: 12px 16px;
+    background: ${(props) => props.theme.console.headerBg};
+  }
+
+  .performance-selector-wrapper {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+  }
+
+  .performance-selector-label {
+    font-size: 13px;
+    font-weight: 500;
+    color: ${(props) => props.theme.console.titleColor};
+    user-select: none;
+  }
+
+  .performance-selector {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+  }
+
+  .performance-select {
+    appearance: none;
+    background: ${(props) => props.theme.console.bg};
+    border: 1px solid ${(props) => props.theme.console.border};
+    border-radius: 4px;
+    padding: 6px 32px 6px 12px;
+    font-size: 13px;
+    font-weight: 500;
+    color: ${(props) => props.theme.console.titleColor};
+    cursor: pointer;
+    outline: none;
+    transition: all 0.2s ease;
+    min-width: 250px;
+    max-width: 400px;
+
+    &:hover {
+      border-color: ${(props) => props.theme.colors.primary};
+    }
+
+    &:focus {
+      border-color: ${(props) => props.theme.colors.primary};
+      box-shadow: 0 0 0 2px ${(props) => props.theme.colors.primary}33;
+    }
+
+    option {
+      background: ${(props) => props.theme.console.bg};
+      color: ${(props) => props.theme.console.titleColor};
+      padding: 8px;
+    }
+  }
+
+  .performance-select-icon {
+    position: absolute;
+    right: 10px;
+    pointer-events: none;
+    color: ${(props) => props.theme.console.buttonColor};
+  }
+
+  .processes-table-container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    min-height: 0;
+
+    h2 {
+      margin: 0 0 16px 0;
+      font-size: 14px;
+      font-weight: 600;
+      color: ${(props) => props.theme.console.titleColor};
+      flex-shrink: 0;
+    }
+  }
+
+  .no-processes {
+    padding: 32px;
+    text-align: center;
+    color: ${(props) => props.theme.console.buttonColor};
+    font-size: 13px;
+  }
+
+  .processes-table-wrapper {
+    flex: 1;
+    min-height: 0;
+    overflow: auto;
+  }
+
+  .processes-table {
+    width: 100%;
+    border-collapse: collapse;
+    background: ${(props) => props.theme.console.headerBg};
+    border: 1px solid ${(props) => props.theme.console.border};
+    border-radius: 4px;
+    overflow: hidden;
+
+    thead {
+      background: ${(props) => props.theme.console.bg};
+      border-bottom: 1px solid ${(props) => props.theme.console.border};
+
+      th {
+        padding: 10px 12px;
+        text-align: left;
+        font-size: 12px;
+        font-weight: 600;
+        color: ${(props) => props.theme.console.titleColor};
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+
+        &:first-child {
+          padding-left: 16px;
+        }
+
+        &:last-child {
+          padding-right: 16px;
+        }
+      }
+    }
+
+    tbody {
+      tr {
+        border-bottom: 1px solid ${(props) => props.theme.console.border};
+        transition: background 0.15s ease;
+
+        &:hover {
+          background: ${(props) => props.theme.console.bg};
+        }
+
+        &:last-child {
+          border-bottom: none;
+        }
+      }
+
+      td {
+        padding: 10px 12px;
+        font-size: 13px;
+        color: ${(props) => props.theme.console.textColor};
+
+        &:first-child {
+          padding-left: 16px;
+        }
+
+        &:last-child {
+          padding-right: 16px;
+        }
+      }
+    }
+
+    .pid-cell {
+      font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+      font-size: 12px;
+      color: ${(props) => props.theme.console.buttonColor};
+    }
+
+    .type-cell {
+      .process-type-badge {
+        display: inline-block;
+        padding: 2px 8px;
+        border-radius: 3px;
+        font-size: 11px;
+        font-weight: 500;
+        text-transform: lowercase;
+        background: ${(props) => props.theme.console.border};
+        color: ${(props) => props.theme.console.buttonColor};
+
+        &.Browser {
+          background: rgba(59, 130, 246, 0.2);
+          color: #3b82f6;
+        }
+
+        &.Renderer {
+          background: rgba(16, 185, 129, 0.2);
+          color: #10b981;
+        }
+
+        &.Utility {
+          background: rgba(139, 92, 246, 0.2);
+          color: #8b5cf6;
+        }
+
+        &.Zygote {
+          background: rgba(245, 158, 11, 0.2);
+          color: #f59e0b;
+        }
+
+        &.Sandbox {
+          background: rgba(239, 68, 68, 0.2);
+          color: #ef4444;
+        }
+      }
+    }
+
+    .title-cell {
+      max-width: 300px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    .cpu-cell {
+      font-weight: 500;
+
+      .high-cpu {
+        color: #ef4444;
+      }
+
+      .medium-cpu {
+        color: #f59e0b;
+      }
+
+      .low-cpu {
+        color: ${(props) => props.theme.console.buttonColor};
+      }
+    }
+
+    .memory-cell {
+      font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+      font-size: 12px;
+    }
+
+    .created-cell {
+      font-size: 12px;
+      color: ${(props) => props.theme.console.buttonColor};
+    }
+  }
 `;
 
 export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Devtools/Performance/index.js b/packages/bruno-app/src/components/Devtools/Performance/index.js
index 91ec547a2..a118e84d9 100644
--- a/packages/bruno-app/src/components/Devtools/Performance/index.js
+++ b/packages/bruno-app/src/components/Devtools/Performance/index.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import StyledWrapper from './StyledWrapper';
 import {
@@ -6,11 +6,23 @@ import {
   IconDatabase,
   IconClock,
   IconServer,
+  IconChevronDown,
   IconChartLine
 } from '@tabler/icons';
 
+const getProcessOptions = (processes) => {
+  return [
+    { value: 'cumulative', label: 'Cumulative (All Processes)' },
+    ...(processes ?? []).map((process) => ({
+      value: String(process.pid),
+      label: `PID ${process.pid}${process.title ? ` - ${process.title}` : ''}${process.type ? ` (${process.type})` : ''}`
+    }))
+  ];
+};
+
 const Performance = () => {
   const { systemResources } = useSelector((state) => state.performance);
+  const [selectedPid, setSelectedPid] = useState('cumulative');
 
   useEffect(() => {
     const { ipcRenderer } = window;
@@ -82,47 +94,140 @@ const Performance = () => {
     </div>
   );
 
+  // Get process options for dropdown
+  const processOptions = useMemo(() => getProcessOptions(systemResources.processes), [systemResources.processes]);
+
+  // Get selected process data
+  const selectedProcess = useMemo(() => {
+    if (selectedPid === 'cumulative') {
+      return null; // Show cumulative view
+    }
+    const processes = systemResources.processes || [];
+    return processes.find((p) => String(p.pid) === selectedPid) || null;
+  }, [selectedPid, systemResources.processes]);
+
+  // Reset to cumulative if selected PID no longer exists
+  useEffect(() => {
+    if (selectedPid !== 'cumulative' && !selectedProcess) {
+      setSelectedPid('cumulative');
+    }
+  }, [selectedPid, selectedProcess]);
+
+  const renderCumulativeView = () => (
+    <div className="system-resources">
+      <h2>System Resources</h2>
+      <div className="resource-cards">
+        <SystemResourceCard
+          icon={IconCpu}
+          title="CPU Usage"
+          value={`${systemResources.cpu.toFixed(1)}%`}
+          subtitle="Total CPU usage"
+          color={systemResources.cpu > 80 ? 'danger' : systemResources.cpu > 60 ? 'warning' : 'success'}
+        />
+
+        <SystemResourceCard
+          icon={IconDatabase}
+          title="Memory Usage"
+          value={formatBytes(systemResources.memory)}
+          subtitle="Total memory usage"
+          color={systemResources.memory > (500 * 1024 * 1024) ? 'danger' : 'default'}
+        />
+
+        <SystemResourceCard
+          icon={IconClock}
+          title="Uptime"
+          value={formatUptime(systemResources.uptime)}
+          subtitle="Process runtime"
+          color="info"
+        />
+
+        <SystemResourceCard
+          icon={IconServer}
+          title="Process ID"
+          value={systemResources.pid || 'N/A'}
+          subtitle="Main process PID"
+          color="default"
+        />
+      </div>
+    </div>
+  );
+
+  const renderProcessView = (process) => {
+    if (!process) return null;
+
+    // Calculate uptime for individual process
+    const processUptime = process.creationTime
+      ? (new Date() - new Date(process.creationTime)) / 1000
+      : 0;
+
+    return (
+      <div className="system-resources">
+        <h2>System Resources</h2>
+        <div className="resource-cards">
+          <SystemResourceCard
+            icon={IconCpu}
+            title="CPU Usage"
+            value={`${process.cpu.toFixed(1)}%`}
+            subtitle="Current CPU usage"
+            color={process.cpu > 80 ? 'danger' : process.cpu > 60 ? 'warning' : 'success'}
+          />
+
+          <SystemResourceCard
+            icon={IconDatabase}
+            title="Memory Usage"
+            value={formatBytes(process.memory)}
+            subtitle="Current memory usage"
+            color={process.memory > (500 * 1024 * 1024) ? 'danger' : 'default'}
+          />
+
+          <SystemResourceCard
+            icon={IconClock}
+            title="Uptime"
+            value={formatUptime(processUptime)}
+            subtitle="Process runtime"
+            color="info"
+          />
+
+          <SystemResourceCard
+            icon={IconServer}
+            title="Process ID"
+            value={process.pid}
+            subtitle="Process PID"
+            color="default"
+          />
+        </div>
+      </div>
+    );
+  };
+
   return (
     <StyledWrapper>
       <div className="tab-content">
-        <div className="tab-content-area">
-          <div className="system-resources">
-            <h2>System Resources</h2>
-            <div className="resource-cards">
-              <SystemResourceCard
-                icon={IconCpu}
-                title="CPU Usage"
-                value={`${systemResources.cpu.toFixed(1)}%`}
-                subtitle="Current process"
-                color={systemResources.cpu > 80 ? 'danger' : systemResources.cpu > 60 ? 'warning' : 'success'}
-              />
-
-              <SystemResourceCard
-                icon={IconDatabase}
-                title="Memory Usage"
-                value={formatBytes(systemResources.memory)}
-                subtitle="Current process"
-                color={systemResources.memory > 500 * 1024 * 1024 ? 'danger' : 'default'}
-              />
-
-              <SystemResourceCard
-                icon={IconClock}
-                title="Uptime"
-                value={formatUptime(systemResources.uptime)}
-                subtitle="Process runtime"
-                color="info"
-              />
-
-              <SystemResourceCard
-                icon={IconServer}
-                title="Process ID"
-                value={systemResources.pid || 'N/A'}
-                subtitle="Current PID"
-                color="default"
-              />
+        <div className="performance-header">
+          <div className="performance-selector-wrapper">
+            <label htmlFor="process-selector" className="performance-selector-label">
+              View:
+            </label>
+            <div className="performance-selector">
+              <select
+                id="process-selector"
+                value={selectedPid}
+                onChange={(e) => setSelectedPid(e.target.value)}
+                className="performance-select"
+              >
+                {processOptions.map((option) => (
+                  <option key={option.value} value={option.value}>
+                    {option.label}
+                  </option>
+                ))}
+              </select>
+              <IconChevronDown size={16} className="performance-select-icon" />
             </div>
           </div>
         </div>
+        <div className="tab-content-area">
+          {selectedPid === 'cumulative' ? renderCumulativeView() : renderProcessView(selectedProcess)}
+        </div>
       </div>
     </StyledWrapper>
   );
diff --git a/packages/bruno-app/src/components/Devtools/index.js b/packages/bruno-app/src/components/Devtools/index.js
index b943e4502..d324f4615 100644
--- a/packages/bruno-app/src/components/Devtools/index.js
+++ b/packages/bruno-app/src/components/Devtools/index.js
@@ -18,11 +18,11 @@ const Devtools = ({ mainSectionRef }) => {
 
   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));
@@ -43,7 +43,7 @@ const Devtools = ({ mainSectionRef }) => {
       document.addEventListener('mousemove', handleDevtoolsResize);
       document.addEventListener('mouseup', handleDevtoolsResizeEnd);
       document.body.style.userSelect = 'none';
-      
+
       return () => {
         document.removeEventListener('mousemove', handleDevtoolsResize);
         document.removeEventListener('mouseup', handleDevtoolsResizeEnd);
@@ -65,7 +65,7 @@ const Devtools = ({ mainSectionRef }) => {
 
   return (
     <>
-      <div 
+      <div
         onMouseDown={handleDevtoolsResizeStart}
         style={{
           height: '4px',
@@ -85,4 +85,4 @@ const Devtools = ({ mainSectionRef }) => {
   );
 };
 
-export default Devtools; 
\ No newline at end of file
+export default Devtools;
diff --git a/packages/bruno-app/src/components/Dropdown/StyledWrapper.js b/packages/bruno-app/src/components/Dropdown/StyledWrapper.js
index 3da7f2d34..c9a44bd9f 100644
--- a/packages/bruno-app/src/components/Dropdown/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Dropdown/StyledWrapper.js
@@ -8,44 +8,66 @@ const Wrapper = styled.div`
   }
 
   .tippy-box {
-    min-width: 135px;
-    font-size: 0.8125rem;
+    min-width: 160px;
+    font-size: ${(props) => props.theme.font.size.base};
     color: ${(props) => props.theme.dropdown.color};
     background-color: ${(props) => props.theme.dropdown.bg};
-    box-shadow: ${(props) => props.theme.dropdown.shadow};
-    border-radius: 3px;
+    box-shadow: ${(props) => props.theme.shadow.sm};
+    border-radius: ${(props) => props.theme.border.radius.base};
     max-height: 90vh;
     overflow-y: auto;
     max-width: unset !important;
+    padding: 0.25rem;
 
     .tippy-content {
       padding-left: 0;
       padding-right: 0;
-      padding-top: 0.25rem;
-      padding-bottom: 0.25rem;
+      padding-top: 0;
+      padding-bottom: 0;
 
       .label-item {
         display: flex;
         align-items: center;
-        padding: 0.35rem 0.6rem;
-        background-color: ${(props) => props.theme.dropdown.labelBg};
+        padding: 0.375rem 0.625rem 0.25rem 0.625rem;
+        font-size: 0.6875rem;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.025em;
+        color: ${(props) => props.theme.dropdown.color};
+        opacity: 0.6;
+        margin-top: 0.25rem;
+        
+        &:first-child {
+          margin-top: 0;
+        }
       }
 
       .dropdown-item {
         display: flex;
         align-items: center;
-        padding: 0.35rem 0.6rem;
+        gap: 0.5rem;
+        padding: 0.275rem 0.625rem;
         cursor: pointer;
+        border-radius: 6px;
+        margin: 0.0625rem 0;
+        font-size: 0.8125rem;
 
         &.active {
           color: ${(props) => props.theme.colors.text.yellow} !important;
-          .icon {
+          .dropdown-icon {
             color: ${(props) => props.theme.colors.text.yellow} !important;
           }
         }
 
-        .icon {
+        .dropdown-icon {
+          flex-shrink: 0;
+          width: 16px;
+          height: 16px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
           color: ${(props) => props.theme.dropdown.iconColor};
+          opacity: 0.8;
         }
 
         &:hover:not(:disabled) {
@@ -54,13 +76,39 @@ const Wrapper = styled.div`
 
         &:disabled {
           cursor: not-allowed;
-          color: gray;
+          opacity: 0.5;
+        }
+
+        &.delete-item {
+          color: ${(props) => props.theme.colors.text.danger};
+          .dropdown-icon {
+            color: ${(props) => props.theme.colors.text.danger};
+          }
+          &:hover {
+            background-color: ${({ theme }) => {
+              const hex = theme.colors.text.danger.replace('#', '');
+              const r = parseInt(hex.substring(0, 2), 16);
+              const g = parseInt(hex.substring(2, 4), 16);
+              const b = parseInt(hex.substring(4, 6), 16);
+              return `rgba(${r}, ${g}, ${b}, 0.04)`; // 4% opacity
+            }} !important;
+
+            color: ${(props) => props.theme.colors.text.danger} !important;
+          }
         }
 
         &.border-top {
           border-top: solid 1px ${(props) => props.theme.dropdown.separator};
+          margin-top: 0.25rem;
+          padding-top: 0.375rem;
         }
       }
+
+      .dropdown-separator {
+        height: 1px;
+        background-color: ${(props) => props.theme.dropdown.separator};
+        margin: 0.25rem 0;
+      }
     }
   }
 `;
diff --git a/packages/bruno-app/src/components/Environments/Common/ExportEnvironmentModal/index.js b/packages/bruno-app/src/components/Environments/Common/ExportEnvironmentModal/index.js
index fab282b64..58f197b1c 100644
--- a/packages/bruno-app/src/components/Environments/Common/ExportEnvironmentModal/index.js
+++ b/packages/bruno-app/src/components/Environments/Common/ExportEnvironmentModal/index.js
@@ -146,7 +146,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
               {environments && environments.length > 0 ? (
                 <div className="flex flex-col h-full">
                   <div className="flex justify-between items-center mb-2 pb-1">
-                    <h3 className="font-semibold text-sm text-theme">
+                    <h3 className="font-medium text-theme">
                       {environmentType === 'global' ? 'Global Environments' : 'Collection Environments'}
                     </h3>
                     <button
@@ -175,7 +175,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
               ) : (
                 <div className="flex flex-col h-full">
                   <div className="flex justify-between items-center mb-2 pb-1">
-                    <h3 className="font-semibold text-sm text-theme">
+                    <h3 className="font-medium text-theme">
                       {environmentType === 'global' ? 'Global Environments' : 'Collection Environments'}
                     </h3>
                   </div>
@@ -191,7 +191,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
             {/* Export Format Section */}
             {selectedCount > 0 && (
               <div className="mb-4">
-                <label className="block text-sm font-medium mb-2 text-theme">
+                <label className="block font-medium mb-2 text-theme">
                   Export Format
                 </label>
                 <div className="space-y-2">
@@ -207,7 +207,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
                         className={`mt-0.5 mr-3 w-4 h-4 ${option.disabled ? 'cursor-not-allowed' : 'cursor-pointer'}`}
                       />
                       <div>
-                        <div className={`text-sm font-medium ${option.disabled ? 'text-muted' : 'text-theme'}`}>{option.label}</div>
+                        <div className={`font-medium ${option.disabled ? 'text-muted' : 'text-theme'}`}>{option.label}</div>
                         <div className="text-xs text-muted">{option.description}</div>
                       </div>
                     </label>
@@ -218,7 +218,7 @@ const ExportEnvironmentModal = ({ onClose, environments = [], environmentType })
 
             {/* Location Input Section */}
             <div className="mb-4">
-              <label htmlFor="export-location" className="block text-sm font-medium mb-2 text-theme">
+              <label htmlFor="export-location" className="block font-medium mb-2 text-theme">
                 Location
               </label>
               <div className="flex flex-col relative items-center">
diff --git a/packages/bruno-app/src/components/Environments/Common/ImportEnvironmentModal/index.js b/packages/bruno-app/src/components/Environments/Common/ImportEnvironmentModal/index.js
index 5617dd435..b14f536a7 100644
--- a/packages/bruno-app/src/components/Environments/Common/ImportEnvironmentModal/index.js
+++ b/packages/bruno-app/src/components/Environments/Common/ImportEnvironmentModal/index.js
@@ -150,7 +150,7 @@ const ImportEnvironmentModal = ({ type = 'collection', collection, onClose, onEn
             data-testid={importTestId}
           >
             <IconFileImport size={64} />
-            <span className="mt-2 block text-sm font-semibold">
+            <span className="mt-2 block font-medium">
               {isDragOver ? 'Drop your environment files here' : 'Import your environments'}
             </span>
             <span className="mt-1 block text-xs text-muted">
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSelector/StyledWrapper.js b/packages/bruno-app/src/components/Environments/EnvironmentSelector/StyledWrapper.js
index 3f8fa7490..34dc6e914 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSelector/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSelector/StyledWrapper.js
@@ -22,7 +22,7 @@ const Wrapper = styled.div`
 
     .env-text {
       color: ${(props) => props.theme.dropdown.selectedColor};
-      font-size: 0.875rem;
+      font-size: ${(props) => props.theme.font.size.base};
       display: block;
     }
 
@@ -34,7 +34,7 @@ const Wrapper = styled.div`
 
     .env-text-inactive {
       color: ${(props) => props.theme.dropdown.color};
-      font-size: 0.875rem;
+      font-size: ${(props) => props.theme.font.size.base};
       opacity: 0.7;
     }
 
@@ -51,7 +51,7 @@ const Wrapper = styled.div`
     max-width: 650px !important;
     min-height: 15.5rem;
     max-height: 75vh;
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
     position: relative;
     overflow: hidden;
   }
@@ -67,7 +67,7 @@ const Wrapper = styled.div`
       align-items: center;
       padding: 0.35rem 0.6rem;
       cursor: pointer;
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       color: ${(props) => props.theme.dropdown.primaryText};
 
       &:hover:not(:disabled) {
@@ -111,7 +111,7 @@ const Wrapper = styled.div`
 
   .tab-button {
     color: var(--color-tab-inactive);
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
 
     .tab-content-wrapper {
       position: relative;
@@ -163,7 +163,7 @@ const Wrapper = styled.div`
     h3 {
       color: ${(props) => props.theme.dropdown.primaryText};
       font-size: 1rem;
-      font-weight: 600;
+      font-weight: 500;
       margin-bottom: 0.5rem;
       line-height: 1.4;
     }
@@ -171,7 +171,7 @@ const Wrapper = styled.div`
     p {
       color: ${(props) => props.theme.dropdown.primaryText};
       opacity: 0.75;
-      font-size: 0.6875rem;
+      font-size: ${(props) => props.theme.font.size.xs};
       line-height: 1.5;
       margin-bottom: 1rem;
       max-width: 11.875rem;
@@ -192,7 +192,7 @@ const Wrapper = styled.div`
       border-radius: 0.375rem;
       width: 100%;
       margin-bottom: 0.5rem;
-      font-size: 0.75rem;
+      font-size: ${(props) => props.theme.font.size.sm};
       font-weight: 500;
       display: flex;
       align-items: center;
@@ -216,7 +216,7 @@ const Wrapper = styled.div`
     justify-content: center;
     padding: 2rem 1rem;
     color: ${(props) => props.theme.dropdown.primaryText};
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
     line-height: 1.5;
     text-align: center;
     opacity: 0.75;
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
index 31763036b..8b1c4ee83 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
@@ -49,15 +49,15 @@ const EnvironmentSelector = ({ collection }) => {
   };
 
   // Get description based on active tab
-  const description =
-    activeTab === 'collection'
+  const description
+    = activeTab === 'collection'
       ? 'Create your first environment to begin working with your collection.'
       : 'Create your first global environment to begin working across collections.';
 
   // Environment selection handler
   const handleEnvironmentSelect = (environment) => {
-    const action =
-      activeTab === 'collection'
+    const action
+      = activeTab === 'collection'
         ? selectEnvironment(environment ? environment.uid : null, collection.uid)
         : selectGlobalEnvironment({ environmentUid: environment ? environment.uid : null });
 
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/CopyEnvironment/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/CopyEnvironment/index.js
index 586f874bb..e97784ffd 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/CopyEnvironment/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/CopyEnvironment/index.js
@@ -43,10 +43,10 @@ const CopyEnvironment = ({ collection, environment, onClose }) => {
 
   return (
     <Portal>
-      <Modal size="sm" title={'Copy Environment'} confirmText="Copy" handleConfirm={onSubmit} handleCancel={onClose}>
-        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
+      <Modal size="sm" title="Copy Environment" confirmText="Copy" handleConfirm={onSubmit} handleCancel={onClose}>
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-semibold">
+            <label htmlFor="name" className="block font-medium">
               New Environment Name
             </label>
             <input
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js
index 3b86f599d..2c558152a 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js
@@ -12,9 +12,9 @@ const CreateEnvironment = ({ collection, onClose, onEnvironmentCreated }) => {
   const dispatch = useDispatch();
   const inputRef = useRef();
 
- const validateEnvironmentName = (name) => {
-   return !collection?.environments?.some((env) => env?.name?.toLowerCase().trim() === name?.toLowerCase().trim());
- };
+  const validateEnvironmentName = (name) => {
+    return !collection?.environments?.some((env) => env?.name?.toLowerCase().trim() === name?.toLowerCase().trim());
+  };
 
   const formik = useFormik({
     enableReinitialize: true,
@@ -25,7 +25,7 @@ const CreateEnvironment = ({ collection, onClose, onEnvironmentCreated }) => {
       name: Yup.string()
         .min(1, 'Must be at least 1 character')
         .max(255, 'Must be 255 characters or less')
-        .test('is-valid-filename', function(value) {
+        .test('is-valid-filename', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
@@ -60,14 +60,14 @@ const CreateEnvironment = ({ collection, onClose, onEnvironmentCreated }) => {
     <Portal>
       <Modal
         size="sm"
-        title={'Create Environment'}
+        title="Create Environment"
         confirmText="Create"
         handleConfirm={onSubmit}
         handleCancel={onClose}
       >
-        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-semibold">
+            <label htmlFor="name" className="block font-medium">
               Environment Name
             </label>
             <div className="flex items-center mt-2">
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js
index 8ca6fc41d..4e3337fcd 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/DeleteEnvironment/index.js
@@ -22,12 +22,12 @@ const DeleteEnvironment = ({ onClose, environment, collection }) => {
       <StyledWrapper>
         <Modal
           size="sm"
-          title={'Delete Environment'}
+          title="Delete Environment"
           confirmText="Delete"
           handleConfirm={onConfirm}
           handleCancel={onClose}
         >
-          Are you sure you want to delete <span className="font-semibold">{environment.name}</span> ?
+          Are you sure you want to delete <span className="font-medium">{environment.name}</span> ?
         </Modal>
       </StyledWrapper>
     </Portal>
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js
index 715bf9e75..6a587b4fc 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js
@@ -22,7 +22,7 @@ const ConfirmSwitchEnv = ({ onCancel }) => {
     >
       <div className="flex items-center font-normal">
         <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-        <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+        <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
       </div>
       <div className="font-normal mt-4">You have unsaved changes in this environment.</div>
 
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
index 5f4e34d8f..751e56dd7 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -27,7 +27,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     thead td {
@@ -36,11 +36,11 @@ const Wrapper = styled.div`
   }
 
   .btn-add-param {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .tooltip-mod {
-    font-size: 11px !important;
+    font-size: ${(props) => props.theme.font.size.xs} !important;
     width: 150px !important;
   }
 
diff --git 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
index 17faa570c..d9c286317 100644
--- 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
@@ -25,7 +25,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
   const { globalEnvironments, activeGlobalEnvironmentUid } = useSelector((state) => state.globalEnvironments);
 
   let _collection = cloneDeep(collection);
-  
+
   const globalEnvironmentVariables = getGlobalEnvironmentVariables({ globalEnvironments, activeGlobalEnvironmentUid });
   _collection.globalEnvironmentVariables = globalEnvironmentVariables;
 
@@ -39,7 +39,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
       return result;
     }
     const varNames = new Set(nonSecretVars.map((v) => v.name));
-    
+
     const checkSensitiveField = (obj, fieldPath) => {
       const value = get(obj, fieldPath);
       if (typeof value === 'string') {
@@ -62,7 +62,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
     sensitiveFields.forEach((fieldPath) => {
       checkSensitiveField(collectionObj, fieldPath);
     });
-    
+
     const items = flattenItems(collection.items || []);
     items.forEach((item) => {
       const objToProcess = getObjectToProcess(item);
@@ -123,7 +123,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
     }
     return (
       <span>
-        <IconAlertCircle id={id} className="text-red-600 cursor-pointer	" size={20} />
+        <IconAlertCircle id={id} className="text-red-600 cursor-pointer" size={20} />
         <Tooltip className="tooltip-mod" anchorId={id} html={meta.error || ''} />
       </span>
     );
@@ -160,7 +160,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
 
   useEffect(() => {
     if (formik.dirty) {
-      // Smooth scrolling to the changed parameter is temporarily disabled 
+      // Smooth scrolling to the changed parameter is temporarily disabled
       // due to UX issues when editing the first row in a long list of environment variables.
       // addButtonRef.current?.scrollIntoView({ behavior: 'smooth' });
     }
@@ -221,6 +221,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
                       value={variable.value}
                       isSecret={variable.secret}
                       onChange={(newValue) => formik.setFieldValue(`${index}.value`, newValue, true)}
+                      enableBrunoVarInfo={false}
                     />
                   </div>
                   {!variable.secret && hasSensitiveUsage(variable.name) && (
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js
index 72418f693..d1033f511 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js
@@ -29,7 +29,7 @@ const EnvironmentDetails = ({ environment, collection, setIsModified, onClose })
       <div className="flex">
         <div className="flex flex-grow items-center">
           <IconDatabase className="cursor-pointer" size={20} strokeWidth={1.5} />
-          <span className="ml-1 font-semibold break-all">{environment.name}</span>
+          <span className="ml-1 font-medium break-all">{environment.name}</span>
         </div>
         <div className="flex gap-x-2 pl-2">
           <ToolHint text="Edit Environment" toolhintId={`edit-${environment.uid}`}>
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js
index 908854261..196d68bde 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/EnvironmentList/index.js
@@ -25,7 +25,7 @@ const EnvironmentList = ({ selectedEnvironment, setSelectedEnvironment, collecti
 
   useEffect(() => {
     if (selectedEnvironment) {
-      const _selectedEnvironment = environments?.find(env => env?.uid === selectedEnvironment?.uid);
+      const _selectedEnvironment = environments?.find((env) => env?.uid === selectedEnvironment?.uid);
       const hasSelectedEnvironmentChanged = !isEqual(selectedEnvironment, _selectedEnvironment);
       if (hasSelectedEnvironmentChanged) {
         setSelectedEnvironment(_selectedEnvironment);
@@ -107,16 +107,16 @@ const EnvironmentList = ({ selectedEnvironment, setSelectedEnvironment, collecti
             </div>
           )}
           <div className="environments-sidebar flex flex-col">
-            {environments &&
-              environments.length &&
-              environments.map((env) => (
+            {environments
+              && environments.length
+              && environments.map((env) => (
                 <ToolHint key={env.uid} text={env.name} toolhintId={env.uid} place="right">
                   <div
                     id={env.uid}
                     className={selectedEnvironment.uid === env.uid ? 'environment-item active' : 'environment-item'}
                     onClick={() => handleEnvironmentClick(env)} // Use handleEnvironmentClick to handle clicks
                   >
-                      <span className="break-all">{env.name}</span>
+                    <span className="break-all">{env.name}</span>
                   </div>
                 </ToolHint>
               ))}
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js
index fee403d8a..dc10c8293 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js
@@ -20,7 +20,7 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
       name: Yup.string()
         .min(1, 'must be at least 1 character')
         .max(255, 'Must be 255 characters or less')
-        .test('is-valid-filename', function(value) {
+        .test('is-valid-filename', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
@@ -53,14 +53,14 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
     <Portal>
       <Modal
         size="sm"
-        title={'Rename Environment'}
+        title="Rename Environment"
         confirmText="Rename"
         handleConfirm={onSubmit}
         handleCancel={onClose}
       >
-        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-semibold">
+            <label htmlFor="name" className="block font-medium">
               Environment Name
             </label>
             <input
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
index 419db7c41..8690f7053 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSettings/index.js
@@ -12,7 +12,7 @@ export const SharedButton = ({ children, className, onClick }) => {
     <button
       type="button"
       onClick={onClick}
-      className={`rounded bg-transparent px-2.5 py-2 w-fit text-xs font-semibold text-zinc-900 dark:text-zinc-50 shadow-sm ring-1 ring-inset ring-zinc-300 dark:ring-zinc-500 hover:bg-gray-50 dark:hover:bg-zinc-700
+      className={`rounded bg-transparent px-2.5 py-2 w-fit text-xs font-medium text-zinc-900 dark:text-zinc-50 shadow-sm ring-1 ring-inset ring-zinc-300 dark:ring-zinc-500 hover:bg-gray-50 dark:hover:bg-zinc-700
         ${className}`}
     >
       {children}
@@ -24,7 +24,7 @@ const DefaultTab = ({ setTab }) => {
   return (
     <div className="text-center items-center flex flex-col">
       <IconFileAlert size={64} strokeWidth={1} />
-      <span className="font-semibold mt-2">No environments found</span>
+      <span className="font-medium mt-2">No environments found</span>
       <span className="font-extralight mt-2 text-zinc-500 dark:text-zinc-400">
         Get started by using the following buttons :
       </span>
diff --git a/packages/bruno-app/src/components/ErrorCapture/index.js b/packages/bruno-app/src/components/ErrorCapture/index.js
index 8a811276d..47e8452c9 100644
--- a/packages/bruno-app/src/components/ErrorCapture/index.js
+++ b/packages/bruno-app/src/components/ErrorCapture/index.js
@@ -33,7 +33,7 @@ class ErrorBoundary extends Component {
 }
 
 const serializeArgs = (args) => {
-  return args.map(arg => {
+  return args.map((arg) => {
     try {
       if (arg === null) return 'null';
       if (arg === undefined) return 'undefined';
@@ -65,12 +65,12 @@ const serializeArgs = (args) => {
 // 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 {
@@ -83,7 +83,7 @@ const extractFileInfo = (stack) => {
   } catch (e) {
     // Ignore parsing errors
   }
-  
+
   return { filename: null, lineno: null, colno: null };
 };
 
@@ -95,7 +95,7 @@ const useGlobalErrorCapture = () => {
 
     console.error = (...args) => {
       const currentStack = new Error().stack;
-      
+
       originalConsoleError.apply(console, args);
 
       if (currentStack && currentStack.includes('useIpcEvents.js')) {
@@ -130,7 +130,7 @@ const useGlobalErrorCapture = () => {
 
 const ErrorCapture = ({ children }) => {
   const dispatch = useDispatch();
-  
+
   useGlobalErrorCapture();
 
   const handleReactError = (errorData) => {
@@ -144,4 +144,4 @@ const ErrorCapture = ({ children }) => {
   );
 };
 
-export default ErrorCapture; 
\ No newline at end of file
+export default ErrorCapture;
diff --git a/packages/bruno-app/src/components/FilePickerEditor/index.js b/packages/bruno-app/src/components/FilePickerEditor/index.js
index 4aa254399..126cc5938 100644
--- a/packages/bruno-app/src/components/FilePickerEditor/index.js
+++ b/packages/bruno-app/src/components/FilePickerEditor/index.js
@@ -18,7 +18,7 @@ const FilePickerEditor = ({ value, onChange, collection, isSingleFilePicker = fa
   const title = filenames.map((v) => `- ${v}`).join('\n');
 
   const browse = () => {
-    dispatch(browseFiles([], [!isSingleFilePicker ? "multiSelections": ""]))
+    dispatch(browseFiles([], [!isSingleFilePicker ? 'multiSelections' : '']))
       .then((filePaths) => {
         // If file is in the collection's directory, then we use relative path
         // Otherwise, we use the absolute path
@@ -73,4 +73,4 @@ const FilePickerEditor = ({ value, onChange, collection, isSingleFilePicker = fa
   );
 };
 
-export default FilePickerEditor;
\ No newline at end of file
+export default FilePickerEditor;
diff --git a/packages/bruno-app/src/components/FolderSettings/Auth/StyledWrapper.js b/packages/bruno-app/src/components/FolderSettings/Auth/StyledWrapper.js
index ba243d42b..f1fda52e9 100644
--- a/packages/bruno-app/src/components/FolderSettings/Auth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/FolderSettings/Auth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
   .single-line-editor-wrapper {
     max-width: 400px;
@@ -19,4 +19,4 @@ const Wrapper = styled.div`
   }
 `;
 
-export default Wrapper; 
\ No newline at end of file
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/FolderSettings/Auth/index.js b/packages/bruno-app/src/components/FolderSettings/Auth/index.js
index 0e14c8c03..91151ac4b 100644
--- a/packages/bruno-app/src/components/FolderSettings/Auth/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Auth/index.js
@@ -63,7 +63,7 @@ const Auth = ({ collection, folder }) => {
 
     // Get path from collection to current folder
     const folderTreePath = getTreePathFromCollectionToItem(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++) {
@@ -172,8 +172,8 @@ const Auth = ({ collection, folder }) => {
         return (
           <>
             <GrantTypeSelector
-              request={request} 
-              updateAuth={updateFolderAuth} 
+              request={request}
+              updateAuth={updateFolderAuth}
               collection={collection}
               item={folder}
             />
@@ -200,7 +200,6 @@ const Auth = ({ collection, folder }) => {
     }
   };
 
-
   return (
     <StyledWrapper className="w-full">
       <div className="text-xs mb-4 text-muted">
@@ -220,4 +219,4 @@ const Auth = ({ collection, folder }) => {
   );
 };
 
-export default Auth; 
\ No newline at end of file
+export default Auth;
diff --git a/packages/bruno-app/src/components/FolderSettings/AuthMode/StyledWrapper.js b/packages/bruno-app/src/components/FolderSettings/AuthMode/StyledWrapper.js
index 2a42257eb..ccd21ccd5 100644
--- a/packages/bruno-app/src/components/FolderSettings/AuthMode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/FolderSettings/AuthMode/StyledWrapper.js
@@ -5,7 +5,7 @@ const StyledWrapper = styled.div`
     border: 1px solid ${({ theme }) => theme.colors.border};
     padding: 4px 8px;
     border-radius: 4px;
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .auth-mode-label {
@@ -13,4 +13,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/FolderSettings/AuthMode/index.js b/packages/bruno-app/src/components/FolderSettings/AuthMode/index.js
index 160693c96..f4a3c3966 100644
--- a/packages/bruno-app/src/components/FolderSettings/AuthMode/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/AuthMode/index.js
@@ -34,7 +34,7 @@ const AuthMode = ({ collection, folder }) => {
   return (
     <StyledWrapper>
       <div className="inline-flex items-center cursor-pointer">
-        <Dropdown onCreate={onDropdownCreate} icon={<Icon />} placement="bottom-end">      
+        <Dropdown onCreate={onDropdownCreate} icon={<Icon />} placement="bottom-end">
           <div
             className="dropdown-item"
             onClick={() => {
diff --git a/packages/bruno-app/src/components/FolderSettings/Headers/StyledWrapper.js b/packages/bruno-app/src/components/FolderSettings/Headers/StyledWrapper.js
index 9f723cb81..ccb53cb5f 100644
--- a/packages/bruno-app/src/components/FolderSettings/Headers/StyledWrapper.js
+++ b/packages/bruno-app/src/components/FolderSettings/Headers/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -31,7 +31,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-header {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/FolderSettings/Headers/index.js b/packages/bruno-app/src/components/FolderSettings/Headers/index.js
index 82730c7fc..88ede7cc8 100644
--- a/packages/bruno-app/src/components/FolderSettings/Headers/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Headers/index.js
@@ -41,7 +41,8 @@ const Headers = ({ collection, folder }) => {
     const header = cloneDeep(_header);
     switch (type) {
       case 'name': {
-        header.name = e.target.value;
+        // Strip newlines from header keys
+        header.name = e.target.value.replace(/[\r\n]/g, '');
         break;
       }
       case 'value': {
@@ -120,8 +121,7 @@ const Headers = ({ collection, folder }) => {
                             },
                             header,
                             'name'
-                          )
-                        }
+                          )}
                         autocomplete={headerAutoCompleteList}
                         collection={collection}
                       />
@@ -140,8 +140,7 @@ const Headers = ({ collection, folder }) => {
                             },
                             header,
                             'value'
-                          )
-                        }
+                          )}
                         collection={collection}
                         item={folder}
                         autocomplete={MimeTypes}
diff --git a/packages/bruno-app/src/components/FolderSettings/Vars/VarsTable/StyledWrapper.js b/packages/bruno-app/src/components/FolderSettings/Vars/VarsTable/StyledWrapper.js
index efacc8288..a44141c79 100644
--- a/packages/bruno-app/src/components/FolderSettings/Vars/VarsTable/StyledWrapper.js
+++ b/packages/bruno-app/src/components/FolderSettings/Vars/VarsTable/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -31,7 +31,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-var {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/FolderSettings/Vars/VarsTable/index.js b/packages/bruno-app/src/components/FolderSettings/Vars/VarsTable/index.js
index b0815c018..e7bcf7d0d 100644
--- a/packages/bruno-app/src/components/FolderSettings/Vars/VarsTable/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Vars/VarsTable/index.js
@@ -4,7 +4,7 @@ import { IconTrash } from '@tabler/icons';
 import { useDispatch } from 'react-redux';
 import { useTheme } from 'providers/Theme';
 import { saveFolderRoot } from 'providers/ReduxStore/slices/collections/actions';
-import SingleLineEditor from 'components/SingleLineEditor';
+import MultiLineEditor from 'components/MultiLineEditor';
 import InfoTip from 'components/InfoTip';
 import StyledWrapper from './StyledWrapper';
 import toast from 'react-hot-toast';
@@ -113,7 +113,7 @@ const VarsTable = ({ folder, collection, vars, varType }) => {
                       />
                     </td>
                     <td>
-                      <SingleLineEditor
+                      <MultiLineEditor
                         value={_var.value}
                         theme={storedTheme}
                         onSave={onSave}
@@ -126,8 +126,7 @@ const VarsTable = ({ folder, collection, vars, varType }) => {
                             },
                             _var,
                             'value'
-                          )
-                        }
+                          )}
                         collection={collection}
                         item={folder}
                       />
diff --git a/packages/bruno-app/src/components/FolderSettings/Vars/index.js b/packages/bruno-app/src/components/FolderSettings/Vars/index.js
index 69f901fab..a018b2d7f 100644
--- a/packages/bruno-app/src/components/FolderSettings/Vars/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Vars/index.js
@@ -8,18 +8,13 @@ import { useDispatch } from 'react-redux';
 const Vars = ({ collection, folder }) => {
   const dispatch = useDispatch();
   const requestVars = folder.draft ? get(folder, 'draft.request.vars.req', []) : get(folder, 'root.request.vars.req', []);
-  const responseVars = folder.draft ? get(folder, 'draft.request.vars.res', []) : get(folder, 'root.request.vars.res', []);
   const handleSave = () => dispatch(saveFolderRoot(collection.uid, folder.uid));
+
   return (
     <StyledWrapper className="w-full flex flex-col">
       <div className="flex-1 mt-2">
-        <div className="mb-1 title text-xs">Pre Request</div>
         <VarsTable folder={folder} collection={collection} vars={requestVars} varType="request" />
       </div>
-      <div className="flex-1">
-        <div className="mt-1 mb-1 title text-xs">Post Response</div>
-        <VarsTable folder={folder} collection={collection} vars={responseVars} varType="response" />
-      </div>
       <div className="mt-6">
         <button type="submit" className="submit btn btn-sm btn-secondary" onClick={handleSave}>
           Save
diff --git a/packages/bruno-app/src/components/FolderSettings/index.js b/packages/bruno-app/src/components/FolderSettings/index.js
index c422815e0..81906d2f2 100644
--- a/packages/bruno-app/src/components/FolderSettings/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/index.js
@@ -28,8 +28,7 @@ const FolderSettings = ({ collection, folder }) => {
   const activeHeadersCount = headers.filter((header) => header.enabled).length;
 
   const requestVars = folderRoot?.request?.vars?.req || [];
-  const responseVars = folderRoot?.request?.vars?.res || [];
-  const activeVarsCount = requestVars.filter((v) => v.enabled).length + responseVars.filter((v) => v.enabled).length;
+  const activeVarsCount = requestVars.filter((v) => v.enabled).length;
 
   const auth = get(folderRoot, 'request.auth.mode');
   const hasAuth = auth && auth !== 'none';
@@ -101,7 +100,7 @@ const FolderSettings = ({ collection, folder }) => {
             Docs
           </div>
         </div>
-        <section className={`flex mt-4 h-full overflow-auto`}>{getTabPanel(tab)}</section>
+        <section className="flex mt-4 h-full overflow-auto">{getTabPanel(tab)}</section>
       </div>
     </StyledWrapper>
   );
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/CopyEnvironment/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/CopyEnvironment/index.js
index ed9ea40b0..cb7510c7d 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/CopyEnvironment/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/CopyEnvironment/index.js
@@ -46,10 +46,10 @@ const CopyEnvironment = ({ environment, onClose }) => {
 
   return (
     <Portal>
-      <Modal size="sm" title={'Copy Global Environment'} confirmText="Copy" handleConfirm={onSubmit} handleCancel={onClose}>
-        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
+      <Modal size="sm" title="Copy Global Environment" confirmText="Copy" handleConfirm={onSubmit} handleCancel={onClose}>
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-semibold">
+            <label htmlFor="name" className="block font-medium">
               New Environment Name
             </label>
             <input
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/CreateEnvironment/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/CreateEnvironment/index.js
index 68d7a8b44..e6156baf1 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/CreateEnvironment/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/CreateEnvironment/index.js
@@ -27,7 +27,7 @@ const CreateEnvironment = ({ onClose, onEnvironmentCreated }) => {
       name: Yup.string()
         .min(1, 'Must be at least 1 character')
         .max(255, 'Must be 255 characters or less')
-        .test('is-valid-filename', function(value) {
+        .test('is-valid-filename', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
@@ -62,14 +62,14 @@ const CreateEnvironment = ({ onClose, onEnvironmentCreated }) => {
     <Portal>
       <Modal
         size="sm"
-        title={'Create Global Environment'}
+        title="Create Global Environment"
         confirmText="Create"
         handleConfirm={onSubmit}
         handleCancel={onClose}
       >
-        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-semibold">
+            <label htmlFor="name" className="block font-medium">
               Environment Name
             </label>
             <div className="flex items-center mt-2">
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/DeleteEnvironment/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/DeleteEnvironment/index.js
index 2edab3be8..ff81e8be2 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/DeleteEnvironment/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/DeleteEnvironment/index.js
@@ -22,12 +22,12 @@ const DeleteEnvironment = ({ onClose, environment }) => {
       <StyledWrapper>
         <Modal
           size="sm"
-          title={'Delete Global Environment'}
+          title="Delete Global Environment"
           confirmText="Delete"
           handleConfirm={onConfirm}
           handleCancel={onClose}
         >
-          Are you sure you want to delete <span className="font-semibold">{environment.name}</span> ?
+          Are you sure you want to delete <span className="font-medium">{environment.name}</span> ?
         </Modal>
       </StyledWrapper>
     </Portal>
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js
index 715bf9e75..6a587b4fc 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/ConfirmSwitchEnv.js
@@ -22,7 +22,7 @@ const ConfirmSwitchEnv = ({ onCancel }) => {
     >
       <div className="flex items-center font-normal">
         <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-        <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+        <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
       </div>
       <div className="font-normal mt-4">You have unsaved changes in this environment.</div>
 
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
index 5f4e34d8f..751e56dd7 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -27,7 +27,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     thead td {
@@ -36,11 +36,11 @@ const Wrapper = styled.div`
   }
 
   .btn-add-param {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .tooltip-mod {
-    font-size: 11px !important;
+    font-size: ${(props) => props.theme.font.size.xs} !important;
     width: 150px !important;
   }
 
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js
index 8365e383d..6107bc59c 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js
@@ -58,7 +58,7 @@ const EnvironmentVariables = ({ environment, setIsModified, originalEnvironmentV
         })
         .catch((error) => {
           console.error(error);
-          toast.error('An error occurred while saving the changes')
+          toast.error('An error occurred while saving the changes');
         });
     }
   });
@@ -76,7 +76,7 @@ const EnvironmentVariables = ({ environment, setIsModified, originalEnvironmentV
     }
     return (
       <span>
-        <IconAlertCircle id={id} className="text-red-600 cursor-pointer	" size={20} />
+        <IconAlertCircle id={id} className="text-red-600 cursor-pointer" size={20} />
         <Tooltip className="tooltip-mod" anchorId={id} html={meta.error || ''} />
       </span>
     );
@@ -162,6 +162,7 @@ const EnvironmentVariables = ({ environment, setIsModified, originalEnvironmentV
                       isSecret={variable.secret}
                       readOnly={typeof variable.value !== 'string'}
                       onChange={(newValue) => formik.setFieldValue(`${index}.value`, newValue, true)}
+                      enableBrunoVarInfo={false}
                     />
                   </div>
                   {typeof variable.value !== 'string' && (
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js
index 3cabf04c2..d88cb9c65 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/EnvironmentDetails/index.js
@@ -28,7 +28,7 @@ const EnvironmentDetails = ({ environment, setIsModified, collection, allEnviron
       <div className="flex">
         <div className="flex flex-grow items-center">
           <IconDatabase className="cursor-pointer" size={20} strokeWidth={1.5} />
-          <span className="ml-1 font-semibold break-all">{environment.name}</span>
+          <span className="ml-1 font-medium break-all">{environment.name}</span>
         </div>
         <div className="flex gap-x-2 pl-2">
           <ToolHint text="Edit Environment" toolhintId={`edit-${environment.uid}`}>
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/index.js
index 3a7e024e7..c62be278e 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/EnvironmentList/index.js
@@ -29,7 +29,7 @@ const EnvironmentList = ({ environments, activeEnvironmentUid, selectedEnvironme
     }
 
     if (selectedEnvironment) {
-      const _selectedEnvironment = environments?.find(env => env?.uid === selectedEnvironment?.uid);
+      const _selectedEnvironment = environments?.find((env) => env?.uid === selectedEnvironment?.uid);
       const hasSelectedEnvironmentChanged = !isEqual(selectedEnvironment, _selectedEnvironment);
       if (hasSelectedEnvironmentChanged) {
         setSelectedEnvironment(_selectedEnvironment);
@@ -43,7 +43,6 @@ const EnvironmentList = ({ environments, activeEnvironmentUid, selectedEnvironme
     setSelectedEnvironment(environment);
     setOriginalEnvironmentVariables(environment?.variables || []);
   }, [environments, activeEnvironmentUid]);
-  
 
   useEffect(() => {
     if (prevEnvUids && prevEnvUids.length && envUids.length > prevEnvUids.length) {
@@ -116,16 +115,16 @@ const EnvironmentList = ({ environments, activeEnvironmentUid, selectedEnvironme
             </div>
           )}
           <div className="environments-sidebar flex flex-col">
-            {environments &&
-              environments.length &&
-              environments.map((env) => (
+            {environments
+              && environments.length
+              && environments.map((env) => (
                 <ToolHint key={env.uid} text={env.name} toolhintId={env.uid} place="right">
                   <div
                     id={env.uid}
                     className={selectedEnvironment.uid === env.uid ? 'environment-item active' : 'environment-item'}
                     onClick={() => handleEnvironmentClick(env)} // Use handleEnvironmentClick to handle click
                   >
-                      <span className="break-all">{env.name}</span>
+                    <span className="break-all">{env.name}</span>
                   </div>
                 </ToolHint>
               ))}
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/RenameEnvironment/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/RenameEnvironment/index.js
index 581abd27c..a6193de97 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/RenameEnvironment/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/RenameEnvironment/index.js
@@ -20,7 +20,7 @@ const RenameEnvironment = ({ onClose, environment }) => {
       name: Yup.string()
         .min(1, 'must be at least 1 character')
         .max(255, 'Must be 255 characters or less')
-        .test('is-valid-filename', function(value) {
+        .test('is-valid-filename', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
@@ -56,14 +56,14 @@ const RenameEnvironment = ({ onClose, environment }) => {
     <Portal>
       <Modal
         size="sm"
-        title={'Rename Environment'}
+        title="Rename Environment"
         confirmText="Rename"
         handleConfirm={onSubmit}
         handleCancel={onClose}
       >
-        <form className="bruno-form" onSubmit={e => e.preventDefault()}>
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
           <div>
-            <label htmlFor="name" className="block font-semibold">
+            <label htmlFor="name" className="block font-medium">
               Environment Name
             </label>
             <input
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/index.js
index c49cacbf5..37eace0a9 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSettings/index.js
@@ -12,7 +12,7 @@ export const SharedButton = ({ children, className, onClick }) => {
     <button
       type="button"
       onClick={onClick}
-      className={`rounded bg-transparent px-2.5 py-2 w-fit text-xs font-semibold text-zinc-900 dark:text-zinc-50 shadow-sm ring-1 ring-inset ring-zinc-300 dark:ring-zinc-500 hover:bg-gray-50 dark:hover:bg-zinc-700
+      className={`rounded bg-transparent px-2.5 py-2 w-fit text-xs font-medium text-zinc-900 dark:text-zinc-50 shadow-sm ring-1 ring-inset ring-zinc-300 dark:ring-zinc-500 hover:bg-gray-50 dark:hover:bg-zinc-700
         ${className}`}
     >
       {children}
@@ -24,7 +24,7 @@ const DefaultTab = ({ setTab }) => {
   return (
     <div className="text-center items-center flex flex-col">
       <IconFileAlert size={64} strokeWidth={1} />
-      <span className="font-semibold mt-2">No Global Environments found</span>
+      <span className="font-medium mt-2">No Global Environments found</span>
       <div className="flex items-center justify-center mt-6">
         <SharedButton onClick={() => setTab('create')}>
           <span>Create Global Environment</span>
diff --git a/packages/bruno-app/src/components/GlobalSearchModal/StyledWrapper.js b/packages/bruno-app/src/components/GlobalSearchModal/StyledWrapper.js
index 0900e1502..70dfa41cf 100644
--- a/packages/bruno-app/src/components/GlobalSearchModal/StyledWrapper.js
+++ b/packages/bruno-app/src/components/GlobalSearchModal/StyledWrapper.js
@@ -102,7 +102,7 @@ const StyledWrapper = styled.div`
     border: none;
     outline: none;
     color: ${(props) => props.theme.text};
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     width: 100%;
     padding: 0;
     &::placeholder {
@@ -179,7 +179,7 @@ const StyledWrapper = styled.div`
     flex-shrink: 0;
   }
   .result-name {
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
     margin-bottom: 3px;
     white-space: nowrap;
     overflow: hidden;
@@ -188,7 +188,7 @@ const StyledWrapper = styled.div`
     letter-spacing: 0.2px;
   }
   .result-path {
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     color: ${(props) => props.theme.colors.text.muted};
     white-space: nowrap;
     overflow: hidden;
@@ -196,7 +196,7 @@ const StyledWrapper = styled.div`
     letter-spacing: 0.1px;
   }
   .method-badge {
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     font-weight: 500;
     padding: 3px 8px;
     border-radius: 4px;
@@ -236,27 +236,27 @@ const StyledWrapper = styled.div`
     &.unary {
       color: #27ae60;
       background: rgba(39, 174, 96, 0.12);
-      font-weight: 600;
+      font-weight: 500;
     }
     &.client-streaming {
       color: #2980b9;
       background: rgba(41, 128, 185, 0.12);
-      font-weight: 600;
+      font-weight: 500;
     }
     &.server-streaming {
       color: #f39c12;
       background: rgba(243, 156, 18, 0.12);
-      font-weight: 600;
+      font-weight: 500;
     }
     &.bidirectional-streaming,
     &.bidi-streaming {
       color: #8e44ad;
       background: rgba(142, 68, 173, 0.12);
-      font-weight: 600;
+      font-weight: 500;
     }
   }
   .result-type {
-    font-size: 11px;
+    font-size: ${(props) => props.theme.font.size.xs};
     color: ${(props) => props.theme.colors.text.muted};
     padding: 2px 6px;
     border-radius: 3px;
@@ -272,7 +272,7 @@ const StyledWrapper = styled.div`
       opacity: 0.8;
     }
     .result-path {
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       color: ${(props) => props.theme.colors.text.muted};
       white-space: nowrap;
       overflow: hidden;
@@ -289,7 +289,7 @@ const StyledWrapper = styled.div`
     padding: 24px 16px;
     text-align: center;
     color: ${(props) => props.theme.colors.text.muted};
-    font-size: 13px;
+    font-size: ${(props) => props.theme.font.size.base};
   }
   .command-k-footer {
     padding: 8px 12px;
@@ -301,7 +301,7 @@ const StyledWrapper = styled.div`
     justify-content: center;
     gap: 24px;
     color: ${(props) => props.theme.colors.text.muted};
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     letter-spacing: 0.2px;
     span {
       display: flex;
@@ -323,7 +323,7 @@ const StyledWrapper = styled.div`
         border-radius: 4px;
         background: ${(props) =>
           props.theme.mode === 'dark' ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'};
-        font-size: 11px;
+        font-size: ${(props) => props.theme.font.size.xs};
         font-weight: 500;
         font-family: inherit;
         line-height: 1;
@@ -358,4 +358,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/GlobalSearchModal/index.js b/packages/bruno-app/src/components/GlobalSearchModal/index.js
index b813b0158..fd1b476b7 100644
--- a/packages/bruno-app/src/components/GlobalSearchModal/index.js
+++ b/packages/bruno-app/src/components/GlobalSearchModal/index.js
@@ -31,7 +31,7 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
   const tabs = useSelector((state) => state.tabs.tabs);
 
   const createCollectionResults = () => {
-    const collectionResults = collections.map(collection => ({
+    const collectionResults = collections.map((collection) => ({
       type: SEARCH_TYPES.COLLECTION,
       item: collection,
       name: collection.name,
@@ -49,13 +49,13 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
 
     // Check for documentation match
     const queryLower = searchTerms.join(' ');
-    if (['documentation', 'docs', 'bruno docs'].some(term => term.includes(queryLower))) {
+    if (['documentation', 'docs', 'bruno docs'].some((term) => term.includes(queryLower))) {
       results.push(DOCUMENTATION_RESULT);
     }
 
-    collections.forEach(collection => {
+    collections.forEach((collection) => {
       // Search collection name
-      if (searchTerms.every(term => collection.name.toLowerCase().includes(term))) {
+      if (searchTerms.every((term) => collection.name.toLowerCase().includes(term))) {
         results.push({
           type: SEARCH_TYPES.COLLECTION,
           item: collection,
@@ -68,28 +68,28 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
 
       // Search collection items
       const flattenedItems = flattenItems(collection.items);
-      flattenedItems.forEach(item => {
+      flattenedItems.forEach((item) => {
         const itemPath = getItemPath(item, collection, findParentItemInCollection);
         const itemPathLower = itemPath.toLowerCase();
 
         if (isItemARequest(item)) {
           // add an optional check for the item name to prevent a crash if it doesn’t exist.
           const nameMatch = searchTerms.every((term) => (item.name || '').toLowerCase().includes(term));
-          const urlMatch = searchTerms.every(term => (item.request?.url || '').toLowerCase().includes(term));
-          const pathMatch = enablePathMatch && searchTerms.every(term => itemPathLower.includes(term));
+          const urlMatch = searchTerms.every((term) => (item.request?.url || '').toLowerCase().includes(term));
+          const pathMatch = enablePathMatch && searchTerms.every((term) => itemPathLower.includes(term));
 
           if (nameMatch || urlMatch || pathMatch) {
             // Check if this is a gRPC request and get the method type
             const isGrpcRequest = item.request?.type === 'grpc';
-            
+
             let method = item.request?.method || '';
-            
+
             if (isGrpcRequest) {
               // For gRPC requests, use the methodType
               const methodType = item.request?.methodType || 'UNARY';
               method = methodType.toLowerCase().replace(/[_]/g, '-');
             }
-            
+
             results.push({
               type: SEARCH_TYPES.REQUEST,
               item,
@@ -101,8 +101,8 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
             });
           }
         } else if (isItemAFolder(item)) {
-          const nameMatch = searchTerms.every(term => item.name.toLowerCase().includes(term));
-          const pathMatch = enablePathMatch && searchTerms.every(term => itemPathLower.includes(term));
+          const nameMatch = searchTerms.every((term) => item.name.toLowerCase().includes(term));
+          const pathMatch = enablePathMatch && searchTerms.every((term) => itemPathLower.includes(term));
 
           if (nameMatch || pathMatch) {
             results.push({
@@ -161,7 +161,7 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
   }, [collections]); // Depend on collections to recreate when they change
 
   const expandItemPath = (result) => {
-    const collection = collections.find(c => c.uid === result.collectionUid);
+    const collection = collections.find((c) => c.uid === result.collectionUid);
     if (!collection) return;
 
     ensureCollectionIsMounted(collection);
@@ -170,8 +170,8 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
       dispatch(toggleCollection(collection.uid));
     }
 
-    let currentItem = result.type === SEARCH_TYPES.FOLDER 
-      ? result.item 
+    let currentItem = result.type === SEARCH_TYPES.FOLDER
+      ? result.item
       : findParentItemInCollection(collection, result.item.uid);
 
     while (currentItem?.type === 'folder') {
@@ -195,11 +195,11 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
     const handlers = {
       ArrowDown: () => {
         e.preventDefault();
-        setSelectedIndex(prev => prev < results.length - 1 ? prev + 1 : 0);
+        setSelectedIndex((prev) => prev < results.length - 1 ? prev + 1 : 0);
       },
       ArrowUp: () => {
         e.preventDefault();
-        setSelectedIndex(prev => prev > 0 ? prev - 1 : results.length - 1);
+        setSelectedIndex((prev) => prev > 0 ? prev - 1 : results.length - 1);
       },
       Enter: () => {
         e.preventDefault();
@@ -213,11 +213,11 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
       },
       PageDown: () => {
         e.preventDefault();
-        setSelectedIndex(prev => Math.min(prev + 5, results.length - 1));
+        setSelectedIndex((prev) => Math.min(prev + 5, results.length - 1));
       },
       PageUp: () => {
         e.preventDefault();
-        setSelectedIndex(prev => Math.max(prev - 5, 0));
+        setSelectedIndex((prev) => Math.max(prev - 5, 0));
       },
       Home: () => {
         e.preventDefault();
@@ -234,7 +234,7 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
   };
 
   const handleResultSelection = (result) => {
-    const targetCollection = collections.find(c => c.uid === result.collectionUid);
+    const targetCollection = collections.find((c) => c.uid === result.collectionUid);
     ensureCollectionIsMounted(targetCollection);
 
     if (result.type === SEARCH_TYPES.DOCUMENTATION) {
@@ -248,7 +248,7 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
     if (result.type === SEARCH_TYPES.REQUEST) {
       dispatch(hideHomePage());
 
-      const existingTab = tabs.find(tab => tab.uid === result.item.uid);
+      const existingTab = tabs.find((tab) => tab.uid === result.item.uid);
 
       if (existingTab) {
         dispatch(focusTab({ uid: result.item.uid }));
@@ -257,20 +257,20 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
           uid: result.item.uid,
           collectionUid: result.collectionUid,
           requestPaneTab: getDefaultRequestPaneTab(result.item),
-          type: 'request',
+          type: 'request'
         }));
       }
     } else if (result.type === SEARCH_TYPES.FOLDER) {
       dispatch(addTab({
         uid: result.item.uid,
         collectionUid: result.collectionUid,
-        type: 'folder-settings',
+        type: 'folder-settings'
       }));
     } else if (result.type === SEARCH_TYPES.COLLECTION) {
       dispatch(addTab({
         uid: result.item.uid,
         collectionUid: result.collectionUid,
-        type: 'collection-settings',
+        type: 'collection-settings'
       }));
     }
 
@@ -280,7 +280,7 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
   const handleQueryChange = (e) => {
     const newQuery = e.target.value;
     setQuery(newQuery);
-    
+
     if (newQuery.trim()) {
       debouncedSearch(newQuery);
     } else {
@@ -294,7 +294,7 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
     if (debounceTimeoutRef.current) {
       clearTimeout(debounceTimeoutRef.current);
     }
-    
+
     setQuery('');
     setResults([]);
   };
@@ -306,7 +306,7 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
       setQuery('');
       performSearch('');
       setSelectedIndex(0);
-      
+
       return () => clearTimeout(timeoutId);
     } else {
       // Clear any pending debounced search when modal closes
@@ -351,8 +351,8 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
 
   return (
     <StyledWrapper>
-      <div 
-        className="command-k-overlay" 
+      <div
+        className="command-k-overlay"
         onClick={onClose}
         role="dialog"
         aria-modal="true"
@@ -365,12 +365,11 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
             Search through collections, requests, folders, and documentation. Use arrow keys to navigate results and Enter to select.
           </p>
           <div aria-live="polite" aria-atomic="true" className="sr-only">
-            {results.length > 0 && query 
+            {results.length > 0 && query
               ? `${results.length} result${results.length === 1 ? '' : 's'} found`
-              : query && results.length === 0 
+              : query && results.length === 0
                 ? 'No results found'
-                : ''
-            }
+                : ''}
           </div>
           <div className="command-k-header">
             <div className="search-input-container">
@@ -395,8 +394,8 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
                 aria-autocomplete="list"
               />
               {query && (
-                <button 
-                  onClick={clearSearch} 
+                <button
+                  onClick={clearSearch}
                   className="clear-button"
                   aria-label="Clear search query"
                   type="button"
@@ -407,8 +406,8 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
             </div>
           </div>
 
-          <div 
-            className="command-k-results" 
+          <div
+            className="command-k-results"
             ref={resultsRef}
             id="search-results"
             role="listbox"
@@ -470,7 +469,7 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
                       </div>
                       <div className="result-badges">
                         {result.type === SEARCH_TYPES.REQUEST && result.method && (
-                          <span 
+                          <span
                             className={`method-badge ${result.method.toLowerCase()}`}
                             aria-label={`HTTP method ${result.method.toUpperCase().replace(/-/g, ' ')}`}
                           >
@@ -513,4 +512,4 @@ const GlobalSearchModal = ({ isOpen, onClose }) => {
   );
 };
 
-export default GlobalSearchModal;
\ No newline at end of file
+export default GlobalSearchModal;
diff --git a/packages/bruno-app/src/components/GlobalSearchModal/utils/searchUtils.js b/packages/bruno-app/src/components/GlobalSearchModal/utils/searchUtils.js
index b55cdb1ab..9d30e9979 100644
--- a/packages/bruno-app/src/components/GlobalSearchModal/utils/searchUtils.js
+++ b/packages/bruno-app/src/components/GlobalSearchModal/utils/searchUtils.js
@@ -6,9 +6,9 @@ export const normalizeQuery = (searchQuery) => {
 };
 
 export const isValidQuery = (normalizedQuery) => {
-  return normalizedQuery && 
-         normalizedQuery !== '/' && 
-         !(normalizedQuery.length === 1 && !normalizedQuery.match(/[a-zA-Z0-9]/));
+  return normalizedQuery
+    && normalizedQuery !== '/'
+    && !(normalizedQuery.length === 1 && !normalizedQuery.match(/[a-zA-Z0-9]/));
 };
 
 export const highlightText = (text, searchQuery) => {
@@ -34,12 +34,12 @@ export const sortResults = (results) => {
     if (b.type === SEARCH_TYPES.DOCUMENTATION) return 1;
 
     // Sort by match type priority
-    const matchTypeOrder = { 
-      [MATCH_TYPES.COLLECTION]: 0, 
-      [MATCH_TYPES.FOLDER]: 1, 
-      [MATCH_TYPES.REQUEST]: 2, 
-      [MATCH_TYPES.URL]: 3, 
-      [MATCH_TYPES.PATH]: 4 
+    const matchTypeOrder = {
+      [MATCH_TYPES.COLLECTION]: 0,
+      [MATCH_TYPES.FOLDER]: 1,
+      [MATCH_TYPES.REQUEST]: 2,
+      [MATCH_TYPES.URL]: 3,
+      [MATCH_TYPES.PATH]: 4
     };
     const aMatchType = matchTypeOrder[a.matchType] ?? 5;
     const bMatchType = matchTypeOrder[b.matchType] ?? 5;
@@ -47,10 +47,10 @@ export const sortResults = (results) => {
     if (aMatchType !== bMatchType) return aMatchType - bMatchType;
 
     // Sort by type priority
-    const typeOrder = { 
-      [SEARCH_TYPES.COLLECTION]: 0, 
-      [SEARCH_TYPES.FOLDER]: 1, 
-      [SEARCH_TYPES.REQUEST]: 2 
+    const typeOrder = {
+      [SEARCH_TYPES.COLLECTION]: 0,
+      [SEARCH_TYPES.FOLDER]: 1,
+      [SEARCH_TYPES.REQUEST]: 2
     };
     const aType = typeOrder[a.type] ?? 3;
     const bType = typeOrder[b.type] ?? 3;
@@ -91,4 +91,4 @@ export const getItemPath = (item, collection, findParentItemInCollection) => {
 
   pathParts.unshift(collection.name);
   return pathParts.join('/');
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/components/Help/StyledWrapper.js b/packages/bruno-app/src/components/Help/StyledWrapper.js
index f4a69fe40..710f2c80b 100644
--- a/packages/bruno-app/src/components/Help/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Help/StyledWrapper.js
@@ -2,10 +2,10 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   font-weight: 400;
-  font-size: 0.75rem;
-  background-color: ${props => props.theme.infoTip.bg};
-  border: 1px solid ${props => props.theme.infoTip.border};
-  box-shadow: ${props => props.theme.infoTip.boxShadow};
+  font-size: ${(props) => props.theme.font.size.sm};
+  background-color: ${(props) => props.theme.infoTip.bg};
+  border: 1px solid ${(props) => props.theme.infoTip.border};
+  box-shadow: ${(props) => props.theme.infoTip.boxShadow};
 `;
 
 export default Wrapper;
diff --git a/packages/bruno-app/src/components/Help/index.js b/packages/bruno-app/src/components/Help/index.js
index 6d3f40f87..ce259712a 100644
--- a/packages/bruno-app/src/components/Help/index.js
+++ b/packages/bruno-app/src/components/Help/index.js
@@ -18,12 +18,12 @@ const Help = ({ children, width = 200 }) => {
         onMouseEnter={() => setShowTooltip(true)}
         onMouseLeave={() => setShowTooltip(false)}
       >
-        <HelpIcon size={14}/>
+        <HelpIcon size={14} />
       </span>
       {showTooltip && (
         <StyledWrapper
           className="absolute z-50 rounded-md p-3"
-          style={{ 
+          style={{
             top: '50%',
             left: 'calc(100% + 8px)',
             transform: 'translateY(-50%)',
@@ -37,4 +37,4 @@ const Help = ({ children, width = 200 }) => {
   );
 };
 
-export default Help; 
\ No newline at end of file
+export default Help;
diff --git a/packages/bruno-app/src/components/Icons/CloseAll/index.js b/packages/bruno-app/src/components/Icons/CloseAll/index.js
new file mode 100644
index 000000000..83669ee31
--- /dev/null
+++ b/packages/bruno-app/src/components/Icons/CloseAll/index.js
@@ -0,0 +1,24 @@
+import React from 'react';
+
+const CloseAllIcon = ({ size = 18, strokeWidth = 1.5, className = '', ...props }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
+      <path
+        d="M7 7L7 5C7 4.46957 7.21072 3.96086 7.58579 3.58579C7.96086 3.21071 8.46957 3 9 3L19 3C19.5304 3 20.0391 3.21071 20.4142 3.58579C20.7893 3.96086 21 4.46957 21 5L21 15C21 15.5304 20.7893 16.0391 20.4142 16.4142C20.0391 16.7893 19.5304 17 19 17L17 17M17 19C17 19.5304 16.7893 20.0391 16.4142 20.4142C16.0391 20.7893 15.5304 21 15 21L5 21C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19L3 9C3 8.46957 3.21072 7.96086 3.58579 7.58579C3.96086 7.21071 4.46957 7 5 7L15 7C15.5304 7 16.0391 7.21071 16.4142 7.58579C16.7893 7.96086 17 8.46957 17 9L17 19Z"
+        stroke="currentColor"
+        strokeWidth={strokeWidth}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M13 11L7 17M7 11L13 17"
+        stroke="currentColor"
+        strokeWidth={strokeWidth}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+export default CloseAllIcon;
diff --git a/packages/bruno-app/src/components/Icons/Dot/index.js b/packages/bruno-app/src/components/Icons/Dot/index.js
index a69a375b1..075ea8877 100644
--- a/packages/bruno-app/src/components/Icons/Dot/index.js
+++ b/packages/bruno-app/src/components/Icons/Dot/index.js
@@ -2,15 +2,22 @@ import React from 'react';
 
 const DotIcon = ({ width }) => {
   return (
-    <svg xmlns="http://www.w3.org/2000/svg" width={width} height={width}
-      viewBox="0 0 24 24" strokeWidth="1.5"
-      stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round"
-      className='inline-block'
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={width}
+      height={width}
+      viewBox="0 0 24 24"
+      strokeWidth="1.5"
+      stroke="currentColor"
+      fill="none"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      className="inline-block"
     >
-      <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+      <path stroke="none" d="M0 0h24v24H0z" fill="none" />
       <path d="M12 7a5 5 0 1 1 -4.995 5.217l-.005 -.217l.005 -.217a5 5 0 0 1 4.995 -4.783z" strokeWidth="0" fill="currentColor" />
     </svg>
   );
 };
 
-export default DotIcon;
\ No newline at end of file
+export default DotIcon;
diff --git a/packages/bruno-app/src/components/Icons/Grpc/index.js b/packages/bruno-app/src/components/Icons/Grpc/index.js
index dc7b8ce3e..cb10f810c 100644
--- a/packages/bruno-app/src/components/Icons/Grpc/index.js
+++ b/packages/bruno-app/src/components/Icons/Grpc/index.js
@@ -2,17 +2,17 @@ import React from 'react';
 
 // UNARY - Single request, single response (Blue)
 export const IconGrpcUnary = ({ size = 18, strokeWidth = 1.5, className = '' }) => (
-  <svg 
-    xmlns="http://www.w3.org/2000/svg" 
-    width={size} 
-    height={size} 
-    viewBox="0 0 24 24" 
-    fill="none" 
-    strokeLinecap="round" 
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={size}
+    height={size}
+    viewBox="0 0 24 24"
+    fill="none"
+    strokeLinecap="round"
     strokeLinejoin="round"
     className={className}
   >
-    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
     {/* Request arrow (top) - right */}
     <path d="M3 8h18" stroke="#3B82F6" strokeWidth={strokeWidth} />
     <path d="M18 5l3 3l-3 3" stroke="#3B82F6" strokeWidth={strokeWidth} />
@@ -24,17 +24,17 @@ export const IconGrpcUnary = ({ size = 18, strokeWidth = 1.5, className = '' })
 
 // CLIENT_STREAMING - Streaming request, single response (Purple)
 export const IconGrpcClientStreaming = ({ size = 18, strokeWidth = 1.5, className = '' }) => (
-  <svg 
-    xmlns="http://www.w3.org/2000/svg" 
-    width={size} 
-    height={size} 
-    viewBox="0 0 24 24" 
-    fill="none" 
-    strokeLinecap="round" 
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={size}
+    height={size}
+    viewBox="0 0 24 24"
+    fill="none"
+    strokeLinecap="round"
     strokeLinejoin="round"
     className={className}
   >
-    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
     {/* Request arrow (top) - right with double heads */}
     <path d="M3 8h18" stroke="#8B5CF6" strokeWidth={strokeWidth} />
     <path d="M18 5l3 3l-3 3" stroke="#8B5CF6" strokeWidth={strokeWidth} />
@@ -47,17 +47,17 @@ export const IconGrpcClientStreaming = ({ size = 18, strokeWidth = 1.5, classNam
 
 // SERVER_STREAMING - Single request, streaming response (Green)
 export const IconGrpcServerStreaming = ({ size = 18, strokeWidth = 1.5, className = '' }) => (
-  <svg 
-    xmlns="http://www.w3.org/2000/svg" 
-    width={size} 
-    height={size} 
-    viewBox="0 0 24 24" 
-    fill="none" 
-    strokeLinecap="round" 
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={size}
+    height={size}
+    viewBox="0 0 24 24"
+    fill="none"
+    strokeLinecap="round"
     strokeLinejoin="round"
     className={className}
   >
-    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
     {/* Request arrow (top) - right */}
     <path d="M3 8h18" stroke="#10B981" strokeWidth={strokeWidth} />
     <path d="M18 5l3 3l-3 3" stroke="#10B981" strokeWidth={strokeWidth} />
@@ -70,17 +70,17 @@ export const IconGrpcServerStreaming = ({ size = 18, strokeWidth = 1.5, classNam
 
 // BIDI_STREAMING - Streaming request, streaming response (Orange)
 export const IconGrpcBidiStreaming = ({ size = 18, strokeWidth = 1.5, className = '' }) => (
-  <svg 
-    xmlns="http://www.w3.org/2000/svg" 
-    width={size} 
-    height={size} 
-    viewBox="0 0 24 24" 
-    fill="none" 
-    strokeLinecap="round" 
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={size}
+    height={size}
+    viewBox="0 0 24 24"
+    fill="none"
+    strokeLinecap="round"
     strokeLinejoin="round"
     className={className}
   >
-    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
     {/* Request arrow (top) - right with double heads */}
     <path d="M3 8h18" stroke="#F97316" strokeWidth={strokeWidth} />
     <path d="M18 5l3 3l-3 3" stroke="#F97316" strokeWidth={strokeWidth} />
diff --git a/packages/bruno-app/src/components/Icons/Help/index.js b/packages/bruno-app/src/components/Icons/Help/index.js
index 95c8710af..b96e02ba8 100644
--- a/packages/bruno-app/src/components/Icons/Help/index.js
+++ b/packages/bruno-app/src/components/Icons/Help/index.js
@@ -14,7 +14,7 @@ const HelpIcon = ({ size = 14 }) => {
       <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
       <path d="M5.255 5.786a.237.237 0 0 0 .241.247h.825c.138 0 .248-.113.266-.25.09-.656.54-1.134 1.342-1.134.686 0 1.314.343 1.314 1.168 0 .635-.374.927-.965 1.371-.673.489-1.206 1.06-1.168 1.987l.003.217a.25.25 0 0 0 .25.246h.811a.25.25 0 0 0 .25-.25v-.105c0-.718.273-.927 1.01-1.486.609-.463 1.244-.977 1.244-2.056 0-1.511-1.276-2.241-2.673-2.241-1.267 0-2.655.59-2.75 2.286zm1.557 5.763c0 .533.425.927 1.01.927.609 0 1.028-.394 1.028-.927 0-.552-.42-.94-1.029-.94-.584 0-1.009.388-1.009.94z" />
     </svg>
-  )
-}
+  );
+};
 
-export default HelpIcon;
\ No newline at end of file
+export default HelpIcon;
diff --git a/packages/bruno-app/src/components/Icons/IconAlertTriangleFilled/index.js b/packages/bruno-app/src/components/Icons/IconAlertTriangleFilled/index.js
new file mode 100644
index 000000000..508a608b1
--- /dev/null
+++ b/packages/bruno-app/src/components/Icons/IconAlertTriangleFilled/index.js
@@ -0,0 +1,14 @@
+import React from 'react';
+
+const IconAlertTriangleFilled = ({ size = 16, ...props }) => {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width={size} height={size} viewBox="0 0 24 24" fill="none" {...props}>
+      <path
+        d="M12 1.67c.955 0 1.845 .467 2.39 1.247l.105 .16l8.114 13.548a2.914 2.914 0 0 1 -2.307 4.363l-.195 .008h-16.225a2.914 2.914 0 0 1 -2.582 -4.2l.099 -.185l8.11 -13.538a2.914 2.914 0 0 1 2.491 -1.403zm.01 13.33l-.127 .007a1 1 0 0 0 0 1.986l.117 .007l.127 -.007a1 1 0 0 0 0 -1.986l-.117 -.007zm-.01 -7a1 1 0 0 0 -.993 .883l-.007 .117v4l.007 .117a1 1 0 0 0 1.986 0l.007 -.117v-4l-.007 -.117a1 1 0 0 0 -.993 -.883z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+};
+
+export default IconAlertTriangleFilled;
diff --git a/packages/bruno-app/src/components/Icons/IconSidebarToggle/index.js b/packages/bruno-app/src/components/Icons/IconSidebarToggle/index.js
index bad3221fb..4d5f72f41 100644
--- a/packages/bruno-app/src/components/Icons/IconSidebarToggle/index.js
+++ b/packages/bruno-app/src/components/Icons/IconSidebarToggle/index.js
@@ -25,4 +25,4 @@ const IconSidebarToggle = ({ collapsed = false, size = 16, strokeWidth = 1.5, cl
   );
 };
 
-export default IconSidebarToggle;
\ No newline at end of file
+export default IconSidebarToggle;
diff --git a/packages/bruno-app/src/components/Icons/OpenAPILogo/index.js b/packages/bruno-app/src/components/Icons/OpenAPILogo/index.js
index b472b3d8c..1ff1c7c44 100644
--- a/packages/bruno-app/src/components/Icons/OpenAPILogo/index.js
+++ b/packages/bruno-app/src/components/Icons/OpenAPILogo/index.js
@@ -3,102 +3,126 @@ const OpenApiLogo = () => {
     <svg width="28" height="28" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
       <path
         style={{
-          fill: "#91d400",
+          fill: '#91d400',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="M43.125 51.148H20.781l.012.325c.012.21.027.418.039.625.004.09.008.18.016.27a41.442 41.442 0 0 0 .164 1.687c0 .027.004.05.008.078.035.285.07.574.113.86 0 .003 0 .007.004.01a36.98 36.98 0 0 0 1.152 5.255c.004.008.008.012.008.02a27.978 27.978 0 0 0 .265.859c.004.015.012.031.016.047.078.242.164.484.246.73.024.059.043.121.067.184.074.207.148.418.226.629.04.093.074.187.11.285.07.172.136.343.203.52.054.128.11.257.164.39.054.133.113.27.168.406.074.164.148.328.218.492.047.102.09.2.133.297.09.195.184.395.278.59l.093.191c.11.227.223.45.336.672.02.035.035.07.051.102a36.344 36.344 0 0 0 .41.773c.028.051.059.102.086.149L44.45 56.156l.07-.043a15.031 15.031 0 0 1-1.394-4.965Zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
-      />
-      <path 
-        style={{
-          fill: "#91d400",
-          fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="m22.563 61.137-.727.207.008.02zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
-        />
-      <path
-        style={{
-          fill: "#4c5930",
-          fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="m48.613 61.355-.05.055-15.739 15.664c.082.074.16.149.242.223.149.133.297.266.446.394.078.067.152.137.23.204.18.152.36.3.54.449.046.043.097.082.144.12a21.669 21.669 0 0 0 .691.556c.227.175.45.343.676.515.012.008.02.012.027.02.95.707 1.93 1.367 2.946 1.98.035.024.07.043.105.067l.578.34c.117.066.239.132.356.203.113.062.222.125.336.187.207.11.41.223.617.328a35.567 35.567 0 0 0 1.824.887l.559-1.348 7.918-19.133.027-.07a15.337 15.337 0 0 1-2.473-1.64Zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="M43.125 51.148H20.781l.012.325c.012.21.027.418.039.625.004.09.008.18.016.27a41.442 41.442 0 0 0 .164 1.687c0 .027.004.05.008.078.035.285.07.574.113.86 0 .003 0 .007.004.01a36.98 36.98 0 0 0 1.152 5.255c.004.008.008.012.008.02a27.978 27.978 0 0 0 .265.859c.004.015.012.031.016.047.078.242.164.484.246.73.024.059.043.121.067.184.074.207.148.418.226.629.04.093.074.187.11.285.07.172.136.343.203.52.054.128.11.257.164.39.054.133.113.27.168.406.074.164.148.328.218.492.047.102.09.2.133.297.09.195.184.395.278.59l.093.191c.11.227.223.45.336.672.02.035.035.07.051.102a36.344 36.344 0 0 0 .41.773c.028.051.059.102.086.149L44.45 56.156l.07-.043a15.031 15.031 0 0 1-1.394-4.965Zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#68a338",
+          fill: '#91d400',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="M46.977 59.797a16.778 16.778 0 0 1-.899-1.102c-.152-.203-.3-.406-.437-.617a15.93 15.93 0 0 1-.41-.633L26.124 68.902c.297.485.602.957.914 1.422.012.016.02.035.031.051l.012.016c.008.015.02.03.027.046.004.004.004.004.004.008.028.035.051.07.078.11 0 .004 0 .004.004.007v.004a35.121 35.121 0 0 0 1.051 1.465c.008.012.016.02.02.031.156.2.308.403.464.602.024.027.043.05.063.078.164.203.328.406.496.61.04.046.078.093.117.144.153.18.305.36.457.535.067.078.137.153.203.227.13.148.262.297.395.445.074.082.152.16.226.242.032.035.067.075.102.11l.293.316.121.121c.176.184.352.363.531.54l15.758-15.684a22.18 22.18 0 0 1-.515-.551Zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="m22.563 61.137-.727.207.008.02zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#4c5930",
+          fill: '#4c5930',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="M67.867 61.348c-.176.136-.347.273-.527.406l.039.066L78.87 80.805a38.54 38.54 0 0 0 1.57-1.078 38.099 38.099 0 0 0 3.227-2.653L67.93 61.41Zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="m48.613 61.355-.05.055-15.739 15.664c.082.074.16.149.242.223.149.133.297.266.446.394.078.067.152.137.23.204.18.152.36.3.54.449.046.043.097.082.144.12a21.669 21.669 0 0 0 .691.556c.227.175.45.343.676.515.012.008.02.012.027.02.95.707 1.93 1.367 2.946 1.98.035.024.07.043.105.067l.578.34c.117.066.239.132.356.203.113.062.222.125.336.187.207.11.41.223.617.328a35.567 35.567 0 0 0 1.824.887l.559-1.348 7.918-19.133.027-.07a15.337 15.337 0 0 1-2.473-1.64Zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#91d400",
+          fill: '#68a338',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="m77.418 81.707.023-.012-.023.012zm.023-.012c.051-.027.102-.054.153-.086l-.004-.004c-.05.032-.098.06-.149.09zm-.023.012-.008.004zm-.039-.039.027.047zm.039.039.023-.012-.023.012zm-.016.012.004-.004zm.008-.009-.004.005c.004-.004.008-.004.012-.008-.004.004-.004.004-.008.004zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="M46.977 59.797a16.778 16.778 0 0 1-.899-1.102c-.152-.203-.3-.406-.437-.617a15.93 15.93 0 0 1-.41-.633L26.124 68.902c.297.485.602.957.914 1.422.012.016.02.035.031.051l.012.016c.008.015.02.03.027.046.004.004.004.004.004.008.028.035.051.07.078.11 0 .004 0 .004.004.007v.004a35.121 35.121 0 0 0 1.051 1.465c.008.012.016.02.02.031.156.2.308.403.464.602.024.027.043.05.063.078.164.203.328.406.496.61.04.046.078.093.117.144.153.18.305.36.457.535.067.078.137.153.203.227.13.148.262.297.395.445.074.082.152.16.226.242.032.035.067.075.102.11l.293.316.121.121c.176.184.352.363.531.54l15.758-15.684a22.18 22.18 0 0 1-.515-.551Zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#91d400",
+          fill: '#4c5930',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="M77.441 81.695c.051-.03.102-.054.153-.086-.051.032-.102.059-.153.086zm.149-.09.004.004zm-.2.118.005-.004zm-.19-.763-.391-.644-10.727-17.722c-.215.133-.437.25-.66.367-.223.121-.45.23-.676.34a15.303 15.303 0 0 1-6.523 1.469c-1.465 0-2.93-.211-4.344-.63-.238-.074-.473-.167-.711-.25-.238-.085-.48-.156-.715-.253l-7.91 19.117-.309.75-.265.644h-.004l.062.024c.024.012.043.016.067.027h.004c.004 0 .007.004.011.004.188.078.375.145.563.215.238.094.473.184.707.27.121.042.238.097.36.136a38.13 38.13 0 0 0 7.648 1.824c.105.012.207.028.308.04l.32.035c.2.023.4.047.602.066l.149.012c.25.023.496.043.742.062.082.004.168.008.25.016.219.016.433.027.648.039.133.004.266.008.399.016.172.004.343.011.515.015.246.008.496.008.746.012h.176c2.082 0 4.164-.172 6.223-.516l.105-.015c.215-.04.434-.078.653-.117.125-.024.246-.047.37-.075.126-.023.255-.05.384-.078.21-.043.421-.09.632-.14l.118-.024a37.8 37.8 0 0 0 8.992-3.34c.187-.097.367-.207.554-.308.22-.121.438-.246.657-.371.152-.086.308-.164.457-.254l.004-.004h.004l.003-.004c.004 0 .004 0 .004-.004l-.027-.047.027.047h.004c.004-.004.008-.004.008-.004.008-.008.016-.012.023-.016.051-.03.102-.058.149-.09zM48.625 37.938c.172-.141.348-.274.523-.407l-.039-.066L37.621 18.48c-.535.348-1.062.704-1.578 1.082a37.213 37.213 0 0 0-3.219 2.649l15.739 15.664Zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="M67.867 61.348c-.176.136-.347.273-.527.406l.039.066L78.87 80.805a38.54 38.54 0 0 0 1.57-1.078 38.099 38.099 0 0 0 3.227-2.653L67.93 61.41Zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#4c5930",
+          fill: '#91d400',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="M31.73 23.254c-.18.18-.347.363-.523.543-.172.18-.352.36-.523.543a38.163 38.163 0 0 0-3.32 4.125c-.106.156-.216.312-.321.469-.11.164-.219.328-.324.496-.04.058-.078.12-.117.18a37.099 37.099 0 0 0-5.82 18.527c-.009.25-.016.504-.02.754s-.012.5-.012.75h22.29c0-.25.023-.5.034-.75.012-.254.016-.504.043-.754a15.002 15.002 0 0 1 3.36-8.078c.16-.192.34-.375.507-.559.172-.188.329-.379.508-.559zm45.993-5.508a46.43 46.43 0 0 0-.684-.402c-.117-.067-.23-.133-.348-.196-.117-.066-.23-.128-.347-.195-.2-.11-.403-.219-.606-.324-.031-.016-.062-.031-.093-.05a38.014 38.014 0 0 0-4.02-1.798c-.035-.015-.074-.027-.11-.039a37.527 37.527 0 0 0-8.41-2.102c-.101-.015-.207-.027-.312-.042l-.313-.036a31.754 31.754 0 0 0-.777-.078c-.238-.023-.48-.043-.719-.062-.093-.004-.187-.012-.28-.016-.204-.015-.415-.027-.618-.039l-.328-.012v22.239c1.144.117 2.281.363 3.383.734l16.445-16.367a41.117 41.117 0 0 0-1.863-1.215zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="m77.418 81.707.023-.012-.023.012zm.023-.012c.051-.027.102-.054.153-.086l-.004-.004c-.05.032-.098.06-.149.09zm-.023.012-.008.004zm-.039-.039.027.047zm.039.039.023-.012-.023.012zm-.016.012.004-.004zm.008-.009-.004.005c.004-.004.008-.004.012-.008-.004.004-.004.004-.008.004zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#68a338",
+          fill: '#91d400',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="m38.898 17.68.391.644zm18.59-5.34c-.25.004-.504.004-.754.015a38.117 38.117 0 0 0-4.71.48c-.036.009-.07.013-.106.02-.219.036-.434.079-.652.118l-.371.07c-.13.027-.258.05-.383.082a36.99 36.99 0 0 0-.75.164 37.925 37.925 0 0 0-8.996 3.336c-.184.098-.368.21-.551.312-.219.118-.438.243-.66.368-.16.093-.325.18-.489.277h-.003a.162.162 0 0 1-.036.02c-.043.027-.086.046-.129.074l.004.004.387.644 11.117 18.367c.215-.132.438-.25.66-.367a15.15 15.15 0 0 1 5.668-1.73c.25-.028.5-.047.754-.063.25-.011.504-.023.758-.023V12.324c-.254 0-.504.008-.758.016zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="M77.441 81.695c.051-.03.102-.054.153-.086-.051.032-.102.059-.153.086zm.149-.09.004.004zm-.2.118.005-.004zm-.19-.763-.391-.644-10.727-17.722c-.215.133-.437.25-.66.367-.223.121-.45.23-.676.34a15.303 15.303 0 0 1-6.523 1.469c-1.465 0-2.93-.211-4.344-.63-.238-.074-.473-.167-.711-.25-.238-.085-.48-.156-.715-.253l-7.91 19.117-.309.75-.265.644h-.004l.062.024c.024.012.043.016.067.027h.004c.004 0 .007.004.011.004.188.078.375.145.563.215.238.094.473.184.707.27.121.042.238.097.36.136a38.13 38.13 0 0 0 7.648 1.824c.105.012.207.028.308.04l.32.035c.2.023.4.047.602.066l.149.012c.25.023.496.043.742.062.082.004.168.008.25.016.219.016.433.027.648.039.133.004.266.008.399.016.172.004.343.011.515.015.246.008.496.008.746.012h.176c2.082 0 4.164-.172 6.223-.516l.105-.015c.215-.04.434-.078.653-.117.125-.024.246-.047.37-.075.126-.023.255-.05.384-.078.21-.043.421-.09.632-.14l.118-.024a37.8 37.8 0 0 0 8.992-3.34c.187-.097.367-.207.554-.308.22-.121.438-.246.657-.371.152-.086.308-.164.457-.254l.004-.004h.004l.003-.004c.004 0 .004 0 .004-.004l-.027-.047.027.047h.004c.004-.004.008-.004.008-.004.008-.008.016-.012.023-.016.051-.03.102-.058.149-.09zM48.625 37.938c.172-.141.348-.274.523-.407l-.039-.066L37.621 18.48c-.535.348-1.062.704-1.578 1.082a37.213 37.213 0 0 0-3.219 2.649l15.739 15.664Zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#4c5930",
+          fill: '#4c5930',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="m95.695 47.809-.035-.598c-.008-.102-.012-.2-.02-.3l-.058-.704c-.008-.059-.012-.121-.016-.18a53.501 53.501 0 0 0-.086-.785c-.003-.023-.003-.043-.007-.062 0-.012 0-.02-.004-.032-.035-.28-.07-.562-.114-.843 0-.012 0-.02-.003-.028a36.772 36.772 0 0 0-1.153-5.246 47.929 47.929 0 0 0-.258-.832c-.011-.035-.023-.07-.03-.105-.083-.242-.161-.48-.247-.719-.023-.063-.043-.129-.066-.195a39.302 39.302 0 0 0-.34-.91c-.067-.172-.133-.344-.2-.512-.054-.137-.109-.27-.163-.403-.055-.132-.114-.261-.168-.394l-.223-.504-.129-.285c-.09-.2-.188-.402-.281-.602-.032-.058-.059-.12-.086-.18-.113-.23-.227-.456-.34-.683-.016-.031-.031-.062-.05-.094-.13-.25-.259-.5-.395-.746l-.012-.023a36.958 36.958 0 0 0-2.133-3.446L72.628 44.77c.376 1.097.618 2.23.735 3.37h22.344l-.012-.331zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="M31.73 23.254c-.18.18-.347.363-.523.543-.172.18-.352.36-.523.543a38.163 38.163 0 0 0-3.32 4.125c-.106.156-.216.312-.321.469-.11.164-.219.328-.324.496-.04.058-.078.12-.117.18a37.099 37.099 0 0 0-5.82 18.527c-.009.25-.016.504-.02.754s-.012.5-.012.75h22.29c0-.25.023-.5.034-.75.012-.254.016-.504.043-.754a15.002 15.002 0 0 1 3.36-8.078c.16-.192.34-.375.507-.559.172-.188.329-.379.508-.559zm45.993-5.508a46.43 46.43 0 0 0-.684-.402c-.117-.067-.23-.133-.348-.196-.117-.066-.23-.128-.347-.195-.2-.11-.403-.219-.606-.324-.031-.016-.062-.031-.093-.05a38.014 38.014 0 0 0-4.02-1.798c-.035-.015-.074-.027-.11-.039a37.527 37.527 0 0 0-8.41-2.102c-.101-.015-.207-.027-.312-.042l-.313-.036a31.754 31.754 0 0 0-.777-.078c-.238-.023-.48-.043-.719-.062-.093-.004-.187-.012-.28-.016-.204-.015-.415-.027-.618-.039l-.328-.012v22.239c1.144.117 2.281.363 3.383.734l16.445-16.367a41.117 41.117 0 0 0-1.863-1.215zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#68a338",
+          fill: '#68a338',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="M73.45 49.64c0 .255-.024.505-.036.755-.012.25-.016.503-.043.753a15.002 15.002 0 0 1-3.36 8.079c-.16.191-.335.375-.507.558-.168.188-.328.38-.508.559L84.758 76.03c.18-.18.347-.363.523-.543.172-.183.352-.363.52-.547a36.965 36.965 0 0 0 3.195-3.937c.04-.055.074-.11.11-.16.117-.168.234-.34.347-.508.102-.152.203-.3.3-.453.048-.074.095-.153.142-.223a37.055 37.055 0 0 0 5.808-18.515c.012-.25.016-.5.024-.75.003-.25.011-.5.011-.754zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="m38.898 17.68.391.644zm18.59-5.34c-.25.004-.504.004-.754.015a38.117 38.117 0 0 0-4.71.48c-.036.009-.07.013-.106.02-.219.036-.434.079-.652.118l-.371.07c-.13.027-.258.05-.383.082a36.99 36.99 0 0 0-.75.164 37.925 37.925 0 0 0-8.996 3.336c-.184.098-.368.21-.551.312-.219.118-.438.243-.66.368-.16.093-.325.18-.489.277h-.003a.162.162 0 0 1-.036.02c-.043.027-.086.046-.129.074l.004.004.387.644 11.117 18.367c.215-.132.438-.25.66-.367a15.15 15.15 0 0 1 5.668-1.73c.25-.028.5-.047.754-.063.25-.011.504-.023.758-.023V12.324c-.254 0-.504.008-.758.016zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
       <path
         style={{
-          fill: "#3f3f42",
+          fill: '#4c5930',
           fillOpacity: 1,
-          fillRule: "nonzero",
-          stroke: "none"
-        }} d="M102.36 5.734c-4.079-4.058-10.688-4.058-14.766 0-3.254 3.235-3.903 8.075-1.965 11.961l-22.746 22.64c-3.906-1.925-8.77-1.28-12.024 1.958-4.078 4.059-4.074 10.64 0 14.7 4.082 4.058 10.692 4.054 14.77 0a10.356 10.356 0 0 0 1.965-11.966l22.746-22.64c3.906 1.93 8.765 1.281 12.02-1.957a10.355 10.355 0 0 0 0-14.696zm0 0" transform="translate(-26.793 -.606) scale(1.44332)"
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="m95.695 47.809-.035-.598c-.008-.102-.012-.2-.02-.3l-.058-.704c-.008-.059-.012-.121-.016-.18a53.501 53.501 0 0 0-.086-.785c-.003-.023-.003-.043-.007-.062 0-.012 0-.02-.004-.032-.035-.28-.07-.562-.114-.843 0-.012 0-.02-.003-.028a36.772 36.772 0 0 0-1.153-5.246 47.929 47.929 0 0 0-.258-.832c-.011-.035-.023-.07-.03-.105-.083-.242-.161-.48-.247-.719-.023-.063-.043-.129-.066-.195a39.302 39.302 0 0 0-.34-.91c-.067-.172-.133-.344-.2-.512-.054-.137-.109-.27-.163-.403-.055-.132-.114-.261-.168-.394l-.223-.504-.129-.285c-.09-.2-.188-.402-.281-.602-.032-.058-.059-.12-.086-.18-.113-.23-.227-.456-.34-.683-.016-.031-.031-.062-.05-.094-.13-.25-.259-.5-.395-.746l-.012-.023a36.958 36.958 0 0 0-2.133-3.446L72.628 44.77c.376 1.097.618 2.23.735 3.37h22.344l-.012-.331zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
+      />
+      <path
+        style={{
+          fill: '#68a338',
+          fillOpacity: 1,
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="M73.45 49.64c0 .255-.024.505-.036.755-.012.25-.016.503-.043.753a15.002 15.002 0 0 1-3.36 8.079c-.16.191-.335.375-.507.558-.168.188-.328.38-.508.559L84.758 76.03c.18-.18.347-.363.523-.543.172-.183.352-.363.52-.547a36.965 36.965 0 0 0 3.195-3.937c.04-.055.074-.11.11-.16.117-.168.234-.34.347-.508.102-.152.203-.3.3-.453.048-.074.095-.153.142-.223a37.055 37.055 0 0 0 5.808-18.515c.012-.25.016-.5.024-.75.003-.25.011-.5.011-.754zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
+      />
+      <path
+        style={{
+          fill: '#3f3f42',
+          fillOpacity: 1,
+          fillRule: 'nonzero',
+          stroke: 'none'
+        }}
+        d="M102.36 5.734c-4.079-4.058-10.688-4.058-14.766 0-3.254 3.235-3.903 8.075-1.965 11.961l-22.746 22.64c-3.906-1.925-8.77-1.28-12.024 1.958-4.078 4.059-4.074 10.64 0 14.7 4.082 4.058 10.692 4.054 14.77 0a10.356 10.356 0 0 0 1.965-11.966l22.746-22.64c3.906 1.93 8.765 1.281 12.02-1.957a10.355 10.355 0 0 0 0-14.696zm0 0"
+        transform="translate(-26.793 -.606) scale(1.44332)"
       />
     </svg>
   );
 };
 
-export default OpenApiLogo;
\ No newline at end of file
+export default OpenApiLogo;
diff --git a/packages/bruno-app/src/components/MarkDown/StyledWrapper.js b/packages/bruno-app/src/components/MarkDown/StyledWrapper.js
index 08467632d..6e51bfa81 100644
--- a/packages/bruno-app/src/components/MarkDown/StyledWrapper.js
+++ b/packages/bruno-app/src/components/MarkDown/StyledWrapper.js
@@ -9,36 +9,36 @@ const StyledMarkdownBodyWrapper = styled.div`
     box-sizing: border-box;
     height: 100%;
     margin: 0 auto;
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
 
     h1 {
       margin: 0.67em 0;
       font-weight: var(--base-text-weight-semibold, 600);
       padding-bottom: 0.3em;
-      font-size: 1.3em;
+      font-size: 1.4em;
       border-bottom: 1px solid var(--color-border-muted);
     }
 
     h2 {
       font-weight: var(--base-text-weight-semibold, 600);
       padding-bottom: 0.3em;
-      font-size: 1.2em;
+      font-size: 1.3em;
       border-bottom: 1px solid var(--color-border-muted);
     }
 
     h3 {
       font-weight: var(--base-text-weight-semibold, 600);
-      font-size: 1.1em;
+      font-size: 1.2em;
     }
 
     h4 {
       font-weight: var(--base-text-weight-semibold, 600);
-      font-size: 1em;
+      font-size: 1.1em;
     }
 
     h5 {
       font-weight: var(--base-text-weight-semibold, 600);
-      font-size: 0.95em;
+      font-size: 1em;
     }
 
     h6 {
diff --git a/packages/bruno-app/src/components/Modal/StyledWrapper.js b/packages/bruno-app/src/components/Modal/StyledWrapper.js
index f26d811f5..7f157dd74 100644
--- a/packages/bruno-app/src/components/Modal/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Modal/StyledWrapper.js
@@ -71,9 +71,9 @@ const Wrapper = styled.div`
     text-transform: uppercase;
     color: ${(props) => props.theme.modal.title.color};
     background-color: ${(props) => props.theme.modal.title.bg};
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     padding: 12px;
-    font-weight: 600;
+    font-weight: 500;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
 
diff --git a/packages/bruno-app/src/components/MultiLineEditor/StyledWrapper.js b/packages/bruno-app/src/components/MultiLineEditor/StyledWrapper.js
index fe532a6c1..cb50c6612 100644
--- a/packages/bruno-app/src/components/MultiLineEditor/StyledWrapper.js
+++ b/packages/bruno-app/src/components/MultiLineEditor/StyledWrapper.js
@@ -23,7 +23,7 @@ const StyledWrapper = styled.div`
   .CodeMirror {
     background: transparent;
     height: fit-content;
-    font-size: 14px;
+    font-size: ${(props) => props.theme.font.size.base};
     line-height: 30px;
     display: flex;
     flex-direction: column;
diff --git a/packages/bruno-app/src/components/MultiLineEditor/index.js b/packages/bruno-app/src/components/MultiLineEditor/index.js
index 19f2c3921..8651e39d9 100644
--- a/packages/bruno-app/src/components/MultiLineEditor/index.js
+++ b/packages/bruno-app/src/components/MultiLineEditor/index.js
@@ -5,6 +5,7 @@ import { defineCodeMirrorBrunoVariablesMode } from 'utils/common/codemirror';
 import { setupAutoComplete } from 'utils/codemirror/autocomplete';
 import { MaskedEditor } from 'utils/common/masked-editor';
 import StyledWrapper from './StyledWrapper';
+import { setupLinkAware } from 'utils/codemirror/linkAware';
 import { IconEye, IconEyeOff } from '@tabler/icons';
 
 const CodeMirror = require('codemirror');
@@ -24,18 +25,23 @@ class MultiLineEditor extends Component {
       maskInput: props.isSecret || false // Always mask the input by default (if it's a secret)
     };
   }
+
   componentDidMount() {
     // Initialize CodeMirror as a single line editor
     /** @type {import("codemirror").Editor} */
     const variables = getAllVariables(this.props.collection, this.props.item);
 
     this.editor = CodeMirror(this.editorRef.current, {
+      lineWrapping: false,
+      lineNumbers: false,
       theme: this.props.theme === 'dark' ? 'monokai' : 'default',
       placeholder: this.props.placeholder,
       mode: 'brunovariables',
-      brunoVarInfo: {
-        variables
-      },
+      brunoVarInfo: this.props.enableBrunoVarInfo !== false ? {
+        variables,
+        collection: this.props.collection,
+        item: this.props.item
+      } : false,
       readOnly: this.props.readOnly,
       tabindex: 0,
       extraKeys: {
@@ -62,15 +68,14 @@ class MultiLineEditor extends Component {
         'Cmd-F': () => {},
         'Ctrl-F': () => {},
         // Tabbing disabled to make tabindex work
-        Tab: false,
+        'Tab': false,
         'Shift-Tab': false
       }
     });
 
-
     const getAllVariablesHandler = () => getAllVariables(this.props.collection, this.props.item);
     const getAnywordAutocompleteHints = () => this.props.autocomplete || [];
-    
+
     // Setup AutoComplete Helper
     const autoCompleteOptions = {
       showHintsFor: ['variables'],
@@ -82,7 +87,9 @@ class MultiLineEditor extends Component {
       this.editor,
       autoCompleteOptions
     );
-    
+
+    setupLinkAware(this.editor);
+
     this.editor.setValue(String(this.props.value) || '');
     this.editor.on('change', this._onEdit);
     this.addOverlay(variables);
@@ -125,9 +132,21 @@ class MultiLineEditor extends Component {
 
     let variables = getAllVariables(this.props.collection, this.props.item);
     if (!isEqual(variables, this.variables)) {
-      this.editor.options.brunoVarInfo.variables = variables;
+      if (this.props.enableBrunoVarInfo !== false && this.editor.options.brunoVarInfo) {
+        this.editor.options.brunoVarInfo.variables = variables;
+      }
       this.addOverlay(variables);
     }
+
+    // Update collection and item when they change
+    if (this.props.enableBrunoVarInfo !== false && this.editor.options.brunoVarInfo) {
+      if (!isEqual(this.props.collection, this.editor.options.brunoVarInfo.collection)) {
+        this.editor.options.brunoVarInfo.collection = this.props.collection;
+      }
+      if (!isEqual(this.props.item, this.editor.options.brunoVarInfo.item)) {
+        this.editor.options.brunoVarInfo.item = this.props.item;
+      }
+    }
     if (this.props.theme !== prevProps.theme && this.editor) {
       this.editor.setOption('theme', this.props.theme === 'dark' ? 'monokai' : 'default');
     }
@@ -154,6 +173,9 @@ class MultiLineEditor extends Component {
     if (this.brunoAutoCompleteCleanup) {
       this.brunoAutoCompleteCleanup();
     }
+    if (this.editor?._destroyLinkAware) {
+      this.editor._destroyLinkAware();
+    }
     if (this.maskedEditor) {
       this.maskedEditor.destroy();
       this.maskedEditor = null;
diff --git a/packages/bruno-app/src/components/Notifications/StyleWrapper.js b/packages/bruno-app/src/components/Notifications/StyleWrapper.js
index 4a52fb7de..ba42b5892 100644
--- a/packages/bruno-app/src/components/Notifications/StyleWrapper.js
+++ b/packages/bruno-app/src/components/Notifications/StyleWrapper.js
@@ -59,7 +59,7 @@ const StyledWrapper = styled.div`
       }
 
       .notification-date {
-        font-size: 0.6875rem;
+        font-size: ${(props) => props.theme.font.size.xs};
       }
     }
   }
diff --git a/packages/bruno-app/src/components/Notifications/index.js b/packages/bruno-app/src/components/Notifications/index.js
index 951cb5f6e..c2c992a33 100644
--- a/packages/bruno-app/src/components/Notifications/index.js
+++ b/packages/bruno-app/src/components/Notifications/index.js
@@ -89,7 +89,7 @@ const Notifications = () => {
             className={`select-none ${1 == 2 ? 'opacity-50' : 'text-link mark-as-read cursor-pointer hover:underline'}`}
             onClick={() => dispatch(markAllNotificationsAsRead())}
           >
-            {'Mark all as read'}
+            Mark all as read
           </button>
         </>
       )}
@@ -123,88 +123,89 @@ const Notifications = () => {
 
       {showNotificationsModal && (
         <Portal>
-        <Modal
-          size="lg"
-          title="Notifications"
-          confirmText={'Close'}
-          handleConfirm={() => {
-            setShowNotificationsModal(false);
-          }}
-          handleCancel={() => {
-            setShowNotificationsModal(false);
-          }}
-          hideFooter={true}
-          customHeader={modalCustomHeader}
-          disableCloseOnOutsideClick={true}
-          disableEscapeKey={true}
-        >
-          <div className="notifications-modal">
-            {notifications?.length > 0 ? (
-              <div className="grid grid-cols-4 flex flex-row text-sm">
-                <div className="col-span-1 flex flex-col">
-                  <ul
-                    className="notifications w-full flex flex-col h-[50vh] max-h-[50vh] overflow-y-auto"
-                    style={{ maxHeight: '50vh', height: '46vh' }}
-                  >
-                    {notifications?.slice(notificationsStartIndex, notificationsEndIndex)?.map((notification) => (
-                      <li
-                        key={notification.id}
-                        className={`p-4 flex flex-col justify-center ${
-                          selectedNotification?.id == notification.id ? 'active' : notification.read ? 'read' : ''
+          <Modal
+            size="lg"
+            title="Notifications"
+            confirmText="Close"
+            handleConfirm={() => {
+              setShowNotificationsModal(false);
+            }}
+            handleCancel={() => {
+              setShowNotificationsModal(false);
+            }}
+            hideFooter={true}
+            customHeader={modalCustomHeader}
+            disableCloseOnOutsideClick={true}
+            disableEscapeKey={true}
+          >
+            <div className="notifications-modal">
+              {notifications?.length > 0 ? (
+                <div className="grid grid-cols-4 flex flex-row">
+                  <div className="col-span-1 flex flex-col">
+                    <ul
+                      className="notifications w-full flex flex-col h-[50vh] max-h-[50vh] overflow-y-auto"
+                      style={{ maxHeight: '50vh', height: '46vh' }}
+                    >
+                      {notifications?.slice(notificationsStartIndex, notificationsEndIndex)?.map((notification) => (
+                        <li
+                          key={notification.id}
+                          className={`p-4 flex flex-col justify-center ${
+                            selectedNotification?.id == notification.id ? 'active' : notification.read ? 'read' : ''
+                          }`}
+                          onClick={handleNotificationItemClick(notification)}
+                        >
+                          <div className="notification-title w-full">{notification?.title}</div>
+                          <div className="notification-date text-xs py-2">{relativeDate(notification?.date)}</div>
+                        </li>
+                      ))}
+                    </ul>
+                    <div className="w-full pagination flex flex-row gap-4 justify-center p-2 items-center text-xs">
+                      <button
+                        className={`pl-2 pr-2 py-3 select-none ${
+                          pageNumber <= 1 ? 'opacity-50' : 'text-link cursor-pointer hover:underline'
                         }`}
-                        onClick={handleNotificationItemClick(notification)}
+                        onClick={handlePrev}
                       >
-                        <div className="notification-title w-full">{notification?.title}</div>
-                        <div className="notification-date text-xs py-2">{relativeDate(notification?.date)}</div>
-                      </li>
-                    ))}
-                  </ul>
-                  <div className="w-full pagination flex flex-row gap-4 justify-center p-2 items-center text-xs">
-                    <button
-                      className={`pl-2 pr-2 py-3 select-none ${
-                        pageNumber <= 1 ? 'opacity-50' : 'text-link cursor-pointer hover:underline'
-                      }`}
-                      onClick={handlePrev}
-                    >
-                      {'Prev'}
-                    </button>
-                    <div className="flex flex-row items-center justify-center gap-1">
-                      Page
-                      <div className="w-[20px] flex justify-center" style={{ width: '20px' }}>
-                        {pageNumber}
-                      </div>
-                      of
-                      <div className="w-[20px] flex justify-center" style={{ width: '20px' }}>
-                        {totalPages}
+                        Prev
+                      </button>
+                      <div className="flex flex-row items-center justify-center gap-1">
+                        Page
+                        <div className="w-[20px] flex justify-center" style={{ width: '20px' }}>
+                          {pageNumber}
+                        </div>
+                        of
+                        <div className="w-[20px] flex justify-center" style={{ width: '20px' }}>
+                          {totalPages}
+                        </div>
                       </div>
+                      <button
+                        className={`pl-2 pr-2 py-3 select-none ${
+                          pageNumber == totalPages ? 'opacity-50' : 'text-link cursor-pointer hover:underline'
+                        }`}
+                        onClick={handleNext}
+                      >
+                        Next
+                      </button>
                     </div>
-                    <button
-                      className={`pl-2 pr-2 py-3 select-none ${
-                        pageNumber == totalPages ? 'opacity-50' : 'text-link cursor-pointer hover:underline'
-                      }`}
-                      onClick={handleNext}
+                  </div>
+                  <div className="flex w-full col-span-3 p-4 flex-col">
+                    <div className="w-full text-lg flex flex-wrap h-fit mb-1">{selectedNotification?.title}</div>
+                    <div className="w-full notification-date text-xs mb-4">
+                      {humanizeDate(selectedNotification?.date)}
+                    </div>
+                    <iframe
+                      src={`data:text/html,${getSanitizedDescription(selectedNotification?.description)}`}
+                      sandbox="allow-popups"
+                      style={{ width: '100%', height: '100%' }}
                     >
-                      {'Next'}
-                    </button>
+                    </iframe>
                   </div>
                 </div>
-                <div className="flex w-full col-span-3 p-4 flex-col">
-                  <div className="w-full text-lg flex flex-wrap h-fit mb-1">{selectedNotification?.title}</div>
-                  <div className="w-full notification-date text-xs mb-4">
-                    {humanizeDate(selectedNotification?.date)}
-                  </div>
-                  <iframe
-                    src={`data:text/html,${getSanitizedDescription(selectedNotification?.description)}`}
-                    sandbox="allow-popups"
-                    style={{ width: '100%', height: '100%' }}
-                  ></iframe>
-                </div>
-              </div>
-            ) : (
-              <div className="opacity-50 italic text-xs p-12 flex justify-center">You are all caught up!</div>
-            )}
-          </div>
-        </Modal>
+              ) : (
+                <div className="opacity-50 italic text-xs p-12 flex justify-center">You are all caught up!</div>
+              )}
+            </div>
+          </Modal>
         </Portal>
       )}
     </StyledWrapper>
diff --git a/packages/bruno-app/src/components/PathDisplay/StyledWrapper.js b/packages/bruno-app/src/components/PathDisplay/StyledWrapper.js
index 326e9f8da..0f40a16d9 100644
--- a/packages/bruno-app/src/components/PathDisplay/StyledWrapper.js
+++ b/packages/bruno-app/src/components/PathDisplay/StyledWrapper.js
@@ -6,7 +6,7 @@ const StyledWrapper = styled.div`
     background: ${(props) => props.theme.requestTabPanel.url.bg};
     border-radius: 4px;
     padding: 8px 12px;
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
     border: 1px solid rgba(0, 0, 0, 0.08);
     
     .icon-column {
@@ -36,4 +36,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/PathDisplay/index.js b/packages/bruno-app/src/components/PathDisplay/index.js
index 7413d5748..4df7d5fae 100644
--- a/packages/bruno-app/src/components/PathDisplay/index.js
+++ b/packages/bruno-app/src/components/PathDisplay/index.js
@@ -3,16 +3,16 @@ import { IconFolder, IconFile } from '@tabler/icons';
 import path from 'utils/common/path';
 import StyledWrapper from './StyledWrapper';
 
-const PathDisplay = ({ 
+const PathDisplay = ({
   baseName = '',
   iconType = 'file'
 }) => {
   return (
     <StyledWrapper>
-        <div className="path-display mt-2">
+      <div className="path-display mt-2">
         <div className="path-layout flex font-mono">
           <div className="icon-column flex">
-            {iconType === 'file' ? <IconFile size={16} /> : <IconFolder size={16} />} 
+            {iconType === 'file' ? <IconFile size={16} /> : <IconFolder size={16} />}
           </div>
           <span className="name-container">
             {baseName}
@@ -23,4 +23,4 @@ const PathDisplay = ({
   );
 };
 
-export default PathDisplay;
\ No newline at end of file
+export default PathDisplay;
diff --git a/packages/bruno-app/src/components/Preferences/Beta/index.js b/packages/bruno-app/src/components/Preferences/Beta/index.js
index 4092216d9..0387dc486 100644
--- a/packages/bruno-app/src/components/Preferences/Beta/index.js
+++ b/packages/bruno-app/src/components/Preferences/Beta/index.js
@@ -8,14 +8,16 @@ import toast from 'react-hot-toast';
 import { IconFlask } from '@tabler/icons';
 import get from 'lodash/get';
 
-// Beta features configuration
-const BETA_FEATURES = [
-  {
-    id: 'nodevm',
-    label: 'Node VM Runtime',
-    description: 'Enable Node VM runtime for JavaScript execution in Developer Mode'
-  }
-];
+/**
+ * Add beta features here.
+ * Example:
+ * {
+ *   id: 'nodevm',
+ *   label: 'Node VM Runtime',
+ *   description: 'Enable Node VM runtime for JavaScript execution in Developer Mode'
+ * }
+ */
+const BETA_FEATURES = [];
 
 const Beta = ({ close }) => {
   const preferences = useSelector((state) => state.app.preferences);
@@ -76,9 +78,9 @@ const Beta = ({ close }) => {
         <div className="mb-6">
           <div className="flex items-center mb-2">
             <IconFlask size={20} className="mr-2 text-orange-500" />
-            <h2 className="text-lg font-semibold">Beta Features</h2>
+            <h2 className="text-lg font-medium">Beta Features</h2>
           </div>
-          <p className="text-sm text-gray-500 dark:text-gray-400 mb-4 text-wrap">
+          <p className="text-gray-500 dark:text-gray-400 mb-4 text-wrap">
             Beta features are experimental previews that may change before full release. Try them and share feedback.
           </p>
         </div>
diff --git a/packages/bruno-app/src/components/Preferences/Display/Font/index.js b/packages/bruno-app/src/components/Preferences/Display/Font/index.js
index e6bbf9c3f..69e25a3db 100644
--- a/packages/bruno-app/src/components/Preferences/Display/Font/index.js
+++ b/packages/bruno-app/src/components/Preferences/Display/Font/index.js
@@ -10,7 +10,7 @@ const Font = ({ close }) => {
   const preferences = useSelector((state) => state.app.preferences);
 
   const [codeFont, setCodeFont] = useState(get(preferences, 'font.codeFont', 'default'));
-  const [codeFontSize, setCodeFontSize] = useState(get(preferences, 'font.codeFontSize', '14'));
+  const [codeFontSize, setCodeFontSize] = useState(get(preferences, 'font.codeFontSize', '13'));
 
   const handleCodeFontChange = (event) => {
     setCodeFont(event.target.value);
@@ -32,10 +32,10 @@ const Font = ({ close }) => {
         }
       })
     ).then(() => {
-      toast.success('Preferences saved successfully')
+      toast.success('Preferences saved successfully');
       close();
     }).catch(() => {
-      toast.error('Failed to save preferences')
+      toast.error('Failed to save preferences');
     });
   };
 
diff --git a/packages/bruno-app/src/components/Preferences/Display/index.js b/packages/bruno-app/src/components/Preferences/Display/index.js
index bff2d04b9..15a16882c 100644
--- a/packages/bruno-app/src/components/Preferences/Display/index.js
+++ b/packages/bruno-app/src/components/Preferences/Display/index.js
@@ -4,18 +4,18 @@ import Theme from './Theme/index';
 
 const Display = ({ close }) => {
   return (
-      <div className="flex flex-col my-2 gap-10 w-full">
-        <div className='w-full flex flex-col gap-2'>
-          <span>
-            Theme
-          </span>
-          <Theme close={close} />
-        </div>
-        <div className='h-[1px] bg-[#aaa5] w-full'></div>
-        <div className='w-fit flex flex-col gap-2'>
-          <Font close={close} />
-        </div>
+    <div className="flex flex-col my-2 gap-10 w-full">
+      <div className="w-full flex flex-col gap-2">
+        <span>
+          Theme
+        </span>
+        <Theme close={close} />
       </div>
+      <div className="h-[1px] bg-[#aaa5] w-full"></div>
+      <div className="w-fit flex flex-col gap-2">
+        <Font close={close} />
+      </div>
+    </div>
   );
 };
 
diff --git a/packages/bruno-app/src/components/Preferences/General/index.js b/packages/bruno-app/src/components/Preferences/General/index.js
index 14eff0709..8e603a091 100644
--- a/packages/bruno-app/src/components/Preferences/General/index.js
+++ b/packages/bruno-app/src/components/Preferences/General/index.js
@@ -37,6 +37,25 @@ const General = ({ close }) => {
       .test('isValidTimeout', 'Request Timeout must be equal or greater than 0', (value) => {
         return value === undefined || Number(value) >= 0;
       }),
+    autoSave: Yup.object({
+      enabled: Yup.boolean(),
+      interval: Yup.mixed()
+        .transform((value, originalValue) => {
+          return originalValue === '' ? undefined : value;
+        })
+        .test('isNumber', 'Save Delay must be a number', (value) => {
+          return value === undefined || !isNaN(value);
+        })
+        .test('isValidInterval', 'Save Delay must be at least 100ms', (value) => {
+          return value === undefined || Number(value) >= 100;
+        })
+    }).test('intervalRequired', 'Save Delay is required when Auto Save is enabled', (value) => {
+      // If autosave is enabled, interval must be provided
+      if (value.enabled && (value.interval === undefined || value.interval === '')) {
+        return false;
+      }
+      return true;
+    }),
     defaultCollectionLocation: Yup.string().max(1024)
   });
 
@@ -53,6 +72,10 @@ const General = ({ close }) => {
       timeout: preferences.request.timeout,
       storeCookies: get(preferences, 'request.storeCookies', true),
       sendCookies: get(preferences, 'request.sendCookies', true),
+      autoSave: {
+        enabled: get(preferences, 'autoSave.enabled', false),
+        interval: get(preferences, 'autoSave.interval', 1000)
+      },
       defaultCollectionLocation: get(preferences, 'general.defaultCollectionLocation', '')
     },
     validationSchema: preferencesSchema,
@@ -83,12 +106,16 @@ const General = ({ close }) => {
           storeCookies: newPreferences.storeCookies,
           sendCookies: newPreferences.sendCookies
         },
+        autoSave: {
+          enabled: newPreferences.autoSave.enabled,
+          interval: newPreferences.autoSave.interval
+        },
         general: {
           defaultCollectionLocation: newPreferences.defaultCollectionLocation
         }
       }))
       .then(() => {
-        toast.success('Preferences saved successfully')
+        toast.success('Preferences saved successfully');
         close();
       })
       .catch((err) => console.log(err) && toast.error('Failed to update preferences'));
@@ -250,6 +277,43 @@ const General = ({ close }) => {
         {formik.touched.timeout && formik.errors.timeout ? (
           <div className="text-red-500">{formik.errors.timeout}</div>
         ) : null}
+        <div className="flex items-center mt-6">
+          <input
+            id="autoSaveEnabled"
+            type="checkbox"
+            name="autoSave.enabled"
+            checked={formik.values.autoSave.enabled}
+            onChange={formik.handleChange}
+            className="mousetrap mr-0"
+          />
+          <label className="block ml-2 select-none" htmlFor="autoSaveEnabled">
+            Enable Auto Save
+          </label>
+        </div>
+        <div className={`flex flex-col mt-2 ${!formik.values.autoSave.enabled ? 'opacity-50' : ''}`}>
+          <label className="block select-none" htmlFor="autoSaveInterval">
+            Save Delay (in ms)
+          </label>
+          <input
+            type="text"
+            name="autoSave.interval"
+            id="autoSaveInterval"
+            className="block textbox mt-2 w-24"
+            autoComplete="off"
+            autoCorrect="off"
+            autoCapitalize="off"
+            spellCheck="false"
+            onChange={formik.handleChange}
+            value={formik.values.autoSave.interval}
+            disabled={!formik.values.autoSave.enabled}
+          />
+        </div>
+        {formik.touched.autoSave && formik.errors.autoSave && typeof formik.errors.autoSave === 'string' && (
+          <div className="text-red-500">{formik.errors.autoSave}</div>
+        )}
+        {formik.touched.autoSave?.interval && formik.errors.autoSave?.interval && (
+          <div className="text-red-500">{formik.errors.autoSave.interval}</div>
+        )}
         <div className="flex flex-col mt-6">
           <label className="block select-none default-collection-location-label" htmlFor="defaultCollectionLocation">
             Default Collection Location
@@ -257,6 +321,7 @@ const General = ({ close }) => {
           <input
             type="text"
             name="defaultCollectionLocation"
+            id="defaultCollectionLocation"
             className="block textbox mt-2 w-full cursor-pointer default-collection-location-input"
             autoComplete="off"
             autoCorrect="off"
diff --git a/packages/bruno-app/src/components/Preferences/Keybindings/StyledWrapper.js b/packages/bruno-app/src/components/Preferences/Keybindings/StyledWrapper.js
index 1a1fe7f01..d9741dce5 100644
--- a/packages/bruno-app/src/components/Preferences/Keybindings/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Preferences/Keybindings/StyledWrapper.js
@@ -12,16 +12,17 @@ const StyledWrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 1rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
 
     td {
       padding: 4px 8px;
+      font-size: ${(props) => props.theme.font.size.sm};
     }
 
     thead th {
-      font-weight: 600;
+      font-weight: 500;
       padding: 10px;
       text-align: left;
     }
diff --git a/packages/bruno-app/src/components/Preferences/ProxySettings/index.js b/packages/bruno-app/src/components/Preferences/ProxySettings/index.js
index 16695f60f..2b411adec 100644
--- a/packages/bruno-app/src/components/Preferences/ProxySettings/index.js
+++ b/packages/bruno-app/src/components/Preferences/ProxySettings/index.js
@@ -84,10 +84,10 @@ const ProxySettings = ({ close }) => {
             proxy: validatedProxy
           })
         ).then(() => {
-          toast.success('Preferences saved successfully')
+          toast.success('Preferences saved successfully');
           close();
         }).catch(() => {
-          toast.error('Failed to save preferences')
+          toast.error('Failed to save preferences');
         });
       })
       .catch((error) => {
@@ -163,7 +163,7 @@ const ProxySettings = ({ close }) => {
         {formik?.values?.mode === 'system' ? (
           <div className="mb-3 pt-1 text-muted system-proxy-settings">
             <small>
-              Below values are sourced from your system environment variables and cannot be directly updated in Bruno.<br/>
+              Below values are sourced from your system environment variables and cannot be directly updated in Bruno.<br />
               Please refer to your OS documentation to change these values.
             </small>
             <div className="flex flex-col justify-start items-start pt-2">
diff --git a/packages/bruno-app/src/components/ReorderTable/index.js b/packages/bruno-app/src/components/ReorderTable/index.js
index b5ea369a2..65c758843 100644
--- a/packages/bruno-app/src/components/ReorderTable/index.js
+++ b/packages/bruno-app/src/components/ReorderTable/index.js
@@ -79,7 +79,7 @@ const ReorderTable = ({ children, updateReorderedItem }) => {
                   <>
                     <div
                       draggable
-                      className="group drag-handle absolute z-10 left-[-17px] p-3.5 py-3.5 px-2.5 top-[3px] cursor-grab"
+                      className="group drag-handle absolute z-10 left-[-17px] top-1/2 -translate-y-[80%] p-2.5 cursor-grab"
                     >
                       {hoveredRow === index && (
                         <>
diff --git a/packages/bruno-app/src/components/RequestPane/Assertions/AssertionRow/index.js b/packages/bruno-app/src/components/RequestPane/Assertions/AssertionRow/index.js
index 345f037a4..6a7835c2a 100644
--- a/packages/bruno-app/src/components/RequestPane/Assertions/AssertionRow/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Assertions/AssertionRow/index.js
@@ -160,8 +160,7 @@ const AssertionRow = ({
               },
               assertion,
               'value'
-            )
-          }
+            )}
         />
       </td>
       <td>
@@ -179,9 +178,8 @@ const AssertionRow = ({
                 },
                 assertion,
                 'value'
-              )
-              }
-            }
+              );
+            }}
             onRun={handleRun}
             collection={collection}
             item={item}
diff --git a/packages/bruno-app/src/components/RequestPane/Assertions/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Assertions/StyledWrapper.js
index efb860893..1b86ef66a 100644
--- a/packages/bruno-app/src/components/RequestPane/Assertions/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Assertions/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -27,7 +27,7 @@ const Wrapper = styled.div`
     }
 
   .btn-add-assertion {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/RequestPane/Assertions/index.js b/packages/bruno-app/src/components/RequestPane/Assertions/index.js
index 7d173f3c5..b8cb7d601 100644
--- a/packages/bruno-app/src/components/RequestPane/Assertions/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Assertions/index.js
@@ -83,33 +83,33 @@ const Assertions = ({ item, collection }) => {
         <ReorderTable updateReorderedItem={handleAssertionDrag}>
           {assertions && assertions.length
             ? assertions.map((assertion) => {
-              return (
-                <tr key={assertion.uid} data-uid={assertion.uid}>
-                  <td className='flex relative'>
-                    <input
-                      type="text"
-                      autoComplete="off"
-                      autoCorrect="off"
-                      autoCapitalize="off"
-                      spellCheck="false"
-                      value={assertion.name}
-                      className="mousetrap"
-                      onChange={(e) => handleAssertionChange(e, assertion, 'name')}
+                return (
+                  <tr key={assertion.uid} data-uid={assertion.uid}>
+                    <td className="flex relative">
+                      <input
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        value={assertion.name}
+                        className="mousetrap"
+                        onChange={(e) => handleAssertionChange(e, assertion, 'name')}
+                      />
+                    </td>
+                    <AssertionRow
+                      key={assertion.uid}
+                      assertion={assertion}
+                      item={item}
+                      collection={collection}
+                      handleAssertionChange={handleAssertionChange}
+                      handleRemoveAssertion={handleRemoveAssertion}
+                      onSave={onSave}
+                      handleRun={handleRun}
                     />
-                  </td>
-                  <AssertionRow
-                    key={assertion.uid}
-                    assertion={assertion}
-                    item={item}
-                    collection={collection}
-                    handleAssertionChange={handleAssertionChange}
-                    handleRemoveAssertion={handleRemoveAssertion}
-                    onSave={onSave}
-                    handleRun={handleRun}
-                  />
-                </tr>
-              );
-            })
+                  </tr>
+                );
+              })
             : null}
         </ReorderTable>
       </Table>
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/ApiKeyAuth/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/ApiKeyAuth/StyledWrapper.js
index 3ef007f81..08185d048 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/ApiKeyAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/ApiKeyAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/ApiKeyAuth/index.js b/packages/bruno-app/src/components/RequestPane/Auth/ApiKeyAuth/index.js
index 513c29500..afa5c063e 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/ApiKeyAuth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/ApiKeyAuth/index.js
@@ -18,7 +18,7 @@ const ApiKeyAuth = ({ item, collection, updateAuth, request, save }) => {
   const apikeyAuth = get(request, 'auth.apikey', {});
 
   const handleRun = () => dispatch(sendRequest(item, collection.uid));
-  
+
   const handleSave = () => {
     save();
   };
@@ -47,17 +47,17 @@ const ApiKeyAuth = ({ item, collection, updateAuth, request, save }) => {
   };
 
   useEffect(() => {
-    !apikeyAuth?.placement &&
-      dispatch(
-        updateAuth({
-          mode: 'apikey',
-          collectionUid: collection.uid,
-          itemUid: item.uid,
-          content: {
-            placement: 'header'
-          }
-        })
-      );
+    !apikeyAuth?.placement
+    && dispatch(
+      updateAuth({
+        mode: 'apikey',
+        collectionUid: collection.uid,
+        itemUid: item.uid,
+        content: {
+          placement: 'header'
+        }
+      })
+    );
   }, [apikeyAuth]);
 
   return (
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/AuthMode/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/AuthMode/StyledWrapper.js
index cdbdf8424..9cf2c5fa4 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/AuthMode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/AuthMode/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
 
   .auth-mode-selector {
     background: transparent;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/AwsV4Auth/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/AwsV4Auth/StyledWrapper.js
index 316d3a7c5..c2901f80b 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/AwsV4Auth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/AwsV4Auth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/AwsV4Auth/index.js b/packages/bruno-app/src/components/RequestPane/Auth/AwsV4Auth/index.js
index aec7ee3de..26a35ede9 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/AwsV4Auth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/AwsV4Auth/index.js
@@ -18,7 +18,7 @@ const AwsV4Auth = ({ item, collection, updateAuth, request, save }) => {
   const { showWarning, warningMessage } = isSensitive(awsv4Auth?.secretAccessKey);
 
   const handleRun = () => dispatch(sendRequest(item, collection.uid));
-  
+
   const handleSave = () => {
     save();
   };
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/BasicAuth/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/BasicAuth/StyledWrapper.js
index 316d3a7c5..c2901f80b 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/BasicAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/BasicAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/BasicAuth/index.js b/packages/bruno-app/src/components/RequestPane/Auth/BasicAuth/index.js
index 355b2bfd1..dcd1798ca 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/BasicAuth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/BasicAuth/index.js
@@ -18,7 +18,7 @@ const BasicAuth = ({ item, collection, updateAuth, request, save }) => {
   const { showWarning, warningMessage } = isSensitive(basicAuth?.password);
 
   const handleRun = () => dispatch(sendRequest(item, collection.uid));
-  
+
   const handleSave = () => {
     save();
   };
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/BearerAuth/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/BearerAuth/StyledWrapper.js
index 316d3a7c5..c2901f80b 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/BearerAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/BearerAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/BearerAuth/index.js b/packages/bruno-app/src/components/RequestPane/Auth/BearerAuth/index.js
index 12d65cdbc..4a6fe7d29 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/BearerAuth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/BearerAuth/index.js
@@ -19,7 +19,7 @@ const BearerAuth = ({ item, collection, updateAuth, request, save }) => {
   const { showWarning, warningMessage } = isSensitive(bearerToken);
 
   const handleRun = () => dispatch(sendRequest(item, collection.uid));
-  
+
   const handleSave = () => {
     save();
   };
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/DigestAuth/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/DigestAuth/StyledWrapper.js
index 316d3a7c5..c2901f80b 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/DigestAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/DigestAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/DigestAuth/index.js b/packages/bruno-app/src/components/RequestPane/Auth/DigestAuth/index.js
index e872894d8..d068f4045 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/DigestAuth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/DigestAuth/index.js
@@ -17,7 +17,7 @@ const DigestAuth = ({ item, collection, updateAuth, request, save }) => {
   const { showWarning, warningMessage } = isSensitive(digestAuth?.password);
 
   const handleRun = () => dispatch(sendRequest(item, collection.uid));
-  
+
   const handleSave = () => {
     save();
   };
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/NTLMAuth/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/NTLMAuth/StyledWrapper.js
index 316d3a7c5..c2901f80b 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/NTLMAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/NTLMAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/NTLMAuth/index.js b/packages/bruno-app/src/components/RequestPane/Auth/NTLMAuth/index.js
index b1cdf474c..93e5a2dae 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/NTLMAuth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/NTLMAuth/index.js
@@ -18,7 +18,7 @@ const NTLMAuth = ({ item, collection, request, save, updateAuth }) => {
   const { showWarning, warningMessage } = isSensitive(ntlmAuth?.password);
 
   const handleRun = () => dispatch(sendRequest(item, collection.uid));
-  
+
   const handleSave = () => {
     save();
   };
@@ -66,7 +66,7 @@ const NTLMAuth = ({ item, collection, request, save, updateAuth }) => {
         }
       })
     );
-  };  
+  };
 
   return (
     <StyledWrapper className="mt-2 w-full">
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/StyledWrapper.js
index 712367fd7..d55fd00c3 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/StyledWrapper.js
@@ -5,7 +5,7 @@ const StyledWrapper = styled.div`
     .tab {
       cursor: pointer;
       padding: 4px 8px !important;
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       border-radius: 4px;
       
       &:hover {
@@ -15,7 +15,6 @@ const StyledWrapper = styled.div`
       &.active {
         background-color: ${(props) => props.theme.mode === 'dark' ? 'rgba(99, 102, 241, 0.2)' : 'rgba(99, 102, 241, 0.1)'};
         color: ${(props) => props.theme.mode === 'dark' ? '#6366f1' : '#4f46e5'};
-        font-weight: 500;
       }
     }
   }
@@ -23,7 +22,7 @@ const StyledWrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -33,7 +32,7 @@ const StyledWrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -61,6 +60,6 @@ const StyledWrapper = styled.div`
       color: ${(props) => props.theme.mode === 'dark' ? '#6366f1' : '#4f46e5'};
     }
   }
-`
+`;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/index.js
index 1d2f81bee..7a5ca6fdf 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/index.js
@@ -1,14 +1,15 @@
-import { useDispatch } from "react-redux";
+import { useDispatch } from 'react-redux';
 import React, { useState } from 'react';
 import get from 'lodash/get';
 import { useTheme } from 'providers/Theme';
 import { IconPlus, IconTrash, IconAdjustmentsHorizontal } from '@tabler/icons';
-import { cloneDeep } from "lodash";
-import SingleLineEditor from "components/SingleLineEditor/index";
-import StyledWrapper from "./StyledWrapper";
-import Table from "components/Table/index";
+import { cloneDeep } from 'lodash';
+import SingleLineEditor from 'components/SingleLineEditor/index';
+import MultiLineEditor from 'components/MultiLineEditor/index';
+import StyledWrapper from './StyledWrapper';
+import Table from 'components/Table/index';
 
-const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleSave }) => {
+const AdditionalParams = ({ item = {}, request, updateAuth, collection, handleSave }) => {
   const dispatch = useDispatch();
   const { storedTheme } = useTheme();
 
@@ -33,13 +34,13 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
 
   const updateAdditionalParameters = ({ updatedAdditionalParameters }) => {
     const filteredParams = cloneDeep(updatedAdditionalParameters);
-    
-    Object.keys(filteredParams).forEach(paramType => {
+
+    Object.keys(filteredParams).forEach((paramType) => {
       if (filteredParams[paramType]?.length) {
-        filteredParams[paramType] = filteredParams[paramType].filter(param => 
+        filteredParams[paramType] = filteredParams[paramType].filter((param) =>
           param.name.trim() || param.value.trim()
         );
-        
+
         if (filteredParams[paramType].length === 0) {
           delete filteredParams[paramType];
         }
@@ -60,15 +61,15 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
         }
       })
     );
-  }
+  };
 
   const handleUpdateAdditionalParam = ({ paramType, key, paramIndex, value }) => {
     const updatedAdditionalParameters = cloneDeep(additionalParameters);
-    
+
     if (!updatedAdditionalParameters[paramType]) {
       updatedAdditionalParameters[paramType] = [];
     }
-    
+
     if (!updatedAdditionalParameters[paramType][paramIndex]) {
       updatedAdditionalParameters[paramType][paramIndex] = {
         name: '',
@@ -77,27 +78,27 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
         enabled: true
       };
     }
-    
+
     updatedAdditionalParameters[paramType][paramIndex][key] = value;
-    
+
     // Only filter when updating a parameter
     updateAdditionalParameters({ updatedAdditionalParameters });
-  }
+  };
 
   const handleDeleteAdditionalParam = ({ paramType, paramIndex }) => {
     const updatedAdditionalParameters = cloneDeep(additionalParameters);
-    
+
     if (updatedAdditionalParameters[paramType]?.length) {
       updatedAdditionalParameters[paramType] = updatedAdditionalParameters[paramType].filter((_, index) => index !== paramIndex);
-      
+
       // If the array is now empty, ensure we're not sending empty arrays
       if (updatedAdditionalParameters[paramType].length === 0) {
         delete updatedAdditionalParameters[paramType];
       }
     }
-    
+
     updateAdditionalParameters({ updatedAdditionalParameters });
-  }
+  };
 
   const handleAddNewAdditionalParam = () => {
     // Prevent adding multiple empty rows
@@ -107,11 +108,11 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
 
     const paramType = activeTab;
     const localAdditionalParameters = cloneDeep(additionalParameters);
-    
+
     if (!localAdditionalParameters[paramType]) {
       localAdditionalParameters[paramType] = [];
     }
-    
+
     localAdditionalParameters[paramType] = [
       ...localAdditionalParameters[paramType],
       {
@@ -121,7 +122,7 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
         enabled: true
       }
     ];
-    
+
     // Don't filter here to allow the empty row to display in UI
     // But don't permanently store it in state until it has values
     dispatch(
@@ -131,11 +132,11 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
         itemUid: item.uid,
         content: {
           ...oAuth,
-          additionalParameters: localAdditionalParameters,
+          additionalParameters: localAdditionalParameters
         }
       })
     );
-  }
+  };
 
   // Add a class to the Add Parameter button if it's disabled
   const addButtonDisabled = hasEmptyRow();
@@ -143,10 +144,10 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
   // Define available tabs for each grant type
   const getAvailableTabs = (grantType) => {
     const tabConfig = {
-      'authorization_code': ['authorization', 'token', 'refresh'],
-      'implicit': ['authorization'],
-      'password': ['token', 'refresh'],
-      'client_credentials': ['token', 'refresh']
+      authorization_code: ['authorization', 'token', 'refresh'],
+      implicit: ['authorization'],
+      password: ['token', 'refresh'],
+      client_credentials: ['token', 'refresh']
     };
     return tabConfig[grantType] || ['token', 'refresh'];
   };
@@ -154,9 +155,9 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
   const availableTabs = getAvailableTabs(grantType);
 
   const renderTab = (tabKey, tabLabel) => (
-    <div 
+    <div
       key={tabKey}
-      className={`tab ${activeTab === tabKey ? 'active' : ''}`} 
+      className={`tab ${activeTab === tabKey ? 'active' : ''}`}
       onClick={() => setActiveTab(tabKey)}
     >
       {tabLabel}
@@ -169,11 +170,11 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconAdjustmentsHorizontal size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium text-gray-800 dark:text-gray-200">
+        <span className="font-medium text-gray-800 dark:text-gray-200">
           Additional Parameters
         </span>
       </div>
-      
+
       <div className="tabs flex w-full gap-2 my-2">
         {availableTabs.includes('authorization') && renderTab('authorization', 'Authorization')}
         {availableTabs.includes('token') && renderTab('token', 'Token')}
@@ -188,13 +189,13 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
         ]}
       >
         <tbody>
-          {(additionalParameters?.[activeTab] || []).map((param, index) => 
+          {(additionalParameters?.[activeTab] || []).map((param, index) => (
             <tr key={index}>
-              <td className='flex relative'>
+              <td className="flex relative">
                 <SingleLineEditor
                   value={param?.name || ''}
                   theme={storedTheme}
-                  onChange={(value) => handleUpdateAdditionalParam({ 
+                  onChange={(value) => handleUpdateAdditionalParam({
                     paramType: activeTab,
                     key: 'name',
                     paramIndex: index,
@@ -205,10 +206,10 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
                 />
               </td>
               <td>
-                <SingleLineEditor
+                <MultiLineEditor
                   value={param?.value || ''}
                   theme={storedTheme}
-                  onChange={(value) => handleUpdateAdditionalParam({ 
+                  onChange={(value) => handleUpdateAdditionalParam({
                     paramType: activeTab,
                     key: 'value',
                     paramIndex: index,
@@ -220,16 +221,16 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
               </td>
               <td>
                 <div className="w-full additional-parameter-sends-in-selector">
-                  <select 
-                    value={param?.sendIn || 'headers'} 
-                    onChange={e => {
-                      handleUpdateAdditionalParam({ 
+                  <select
+                    value={param?.sendIn || 'headers'}
+                    onChange={(e) => {
+                      handleUpdateAdditionalParam({
                         paramType: activeTab,
                         key: 'sendIn',
                         paramIndex: index,
                         value: e.target.value
-                      })
-                    }} 
+                      });
+                    }}
                     className="mousetrap bg-transparent"
                   >
                     {sendInOptionsMap[grantType || 'authorization_code'][activeTab].map((optionValue) => (
@@ -248,21 +249,21 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
                     tabIndex="-1"
                     className="mr-3 mousetrap"
                     onChange={(e) => {
-                      handleUpdateAdditionalParam({ 
+                      handleUpdateAdditionalParam({
                         paramType: activeTab,
                         key: 'enabled',
                         paramIndex: index,
                         value: e.target.checked
-                      })
+                      });
                     }}
                   />
-                  <button 
-                    tabIndex="-1" 
+                  <button
+                    tabIndex="-1"
                     onClick={() => {
                       handleDeleteAdditionalParam({
                         paramType: activeTab,
                         paramIndex: index
-                      })
+                      });
                     }}
                   >
                     <IconTrash strokeWidth={1.5} size={20} />
@@ -270,37 +271,38 @@ const AdditionalParams  = ({ item = {}, request, updateAuth, collection, handleS
                 </div>
               </td>
             </tr>
+          )
           )}
         </tbody>
       </Table>
-      <div 
-        className={`add-additional-param-actions w-fit flex items-center mt-2 ${addButtonDisabled ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'}`} 
+      <div
+        className={`add-additional-param-actions w-fit flex items-center mt-2 ${addButtonDisabled ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'}`}
         onClick={addButtonDisabled ? null : handleAddNewAdditionalParam}
       >
         <IconPlus size={16} strokeWidth={1.5} style={{ marginLeft: '2px' }} />
-        <span className="ml-1 text-sm text-gray-500">Add Parameter</span>
+        <span className="ml-1 text-gray-500">Add Parameter</span>
       </div>
     </StyledWrapper>
-  )
-}
+  );
+};
 
 export default AdditionalParams;
 
 const sendInOptionsMap = {
-  'authorization_code': {
-    'authorization': ['headers', 'queryparams'],
-    'token': ['headers', 'queryparams', 'body'],
-    'refresh': ['headers', 'queryparams', 'body']
+  authorization_code: {
+    authorization: ['headers', 'queryparams'],
+    token: ['headers', 'queryparams', 'body'],
+    refresh: ['headers', 'queryparams', 'body']
   },
-  'password': {
-    'token': ['headers', 'queryparams', 'body'],
-    'refresh': ['headers', 'queryparams', 'body']
+  password: {
+    token: ['headers', 'queryparams', 'body'],
+    refresh: ['headers', 'queryparams', 'body']
   },
-  'client_credentials': {
-    'token': ['headers', 'queryparams', 'body'],
-    'refresh': ['headers', 'queryparams', 'body']
+  client_credentials: {
+    token: ['headers', 'queryparams', 'body'],
+    refresh: ['headers', 'queryparams', 'body']
   },
-  'implicit': {
-    'authorization': ['headers', 'queryparams']
+  implicit: {
+    authorization: ['headers', 'queryparams']
   }
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/StyledWrapper.js
index b06deaedf..a162decf9 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
   .single-line-editor-wrapper {
     max-width: 400px;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/index.js
index 7c890513e..9e5f233bd 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/index.js
@@ -88,7 +88,7 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
           autoRefreshToken,
           autoFetchToken,
           additionalParameters,
-          [key]: value,
+          [key]: value
         }
       })
     );
@@ -129,7 +129,7 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconSettings size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">
+        <span className="font-medium">
           Configuration
         </span>
       </div>
@@ -137,7 +137,7 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
         const { key, label, isSecret } = input;
         const value = oAuth[key] || '';
         const { showWarning, warningMessage } = isSensitive(value);
-        
+
         return (
           <div className="flex items-center gap-4 w-full" key={`input-${key}`}>
             <label className="block min-w-[140px]">{label}</label>
@@ -157,7 +157,7 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
           </div>
         );
       })}
-      <div className="flex items-center gap-4 w-full" key={`input-credentials-placement`}>
+      <div className="flex items-center gap-4 w-full" key="input-credentials-placement">
         <label className="block min-w-[140px]">Add Credentials to</label>
         <div className="inline-flex items-center cursor-pointer token-placement-selector">
           <Dropdown onCreate={onDropdownCreate} icon={<CredentialsPlacementIcon />} placement="bottom-end">
@@ -195,11 +195,11 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconKey size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium text-gray-800 dark:text-gray-200">
+        <span className="font-medium text-gray-800 dark:text-gray-200">
           Token
         </span>
       </div>
-      <div className="flex items-center gap-4 w-full" key={`input-token-name`}>
+      <div className="flex items-center gap-4 w-full" key="input-token-name">
         <label className="block min-w-[140px]">Token ID</label>
         <div className="single-line-editor-wrapper flex-1">
           <SingleLineEditor
@@ -213,7 +213,7 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
           />
         </div>
       </div>
-      <div className="flex items-center gap-4 w-full" key={`input-token-placement`}>
+      <div className="flex items-center gap-4 w-full" key="input-token-placement">
         <label className="block min-w-[140px]">Add token to</label>
         <div className="inline-flex items-center cursor-pointer token-placement-selector">
           <Dropdown onCreate={onDropdownCreate} icon={<TokenPlacementIcon />} placement="bottom-end">
@@ -239,40 +239,43 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
         </div>
       </div>
       {
-        tokenPlacement === 'header' ?
-          <div className="flex items-center gap-4 w-full" key={`input-token-prefix`}>
-            <label className="block min-w-[140px]">Header Prefix</label>
-            <div className="single-line-editor-wrapper flex-1">
-              <SingleLineEditor
-                value={oAuth['tokenHeaderPrefix'] || ''}
-                theme={storedTheme}
-                onSave={handleSave}
-                onChange={(val) => handleChange('tokenHeaderPrefix', val)}
-                onRun={handleRun}
-                collection={collection}
-              />
-            </div>
-          </div>
-          :
-          <div className="flex items-center gap-4 w-full" key={`input-token-query-param-key`}>
-            <label className="block font-medium min-w-[140px]">Query Param Key</label>
-            <div className="single-line-editor-wrapper flex-1">
-              <SingleLineEditor
-                value={oAuth['tokenQueryKey'] || ''}
-                theme={storedTheme}
-                onSave={handleSave}
-                onChange={(val) => handleChange('tokenQueryKey', val)}
-                onRun={handleRun}
-                collection={collection}
-              />
-            </div>
-          </div>
+        tokenPlacement === 'header'
+          ? (
+              <div className="flex items-center gap-4 w-full" key="input-token-prefix">
+                <label className="block min-w-[140px]">Header Prefix</label>
+                <div className="single-line-editor-wrapper flex-1">
+                  <SingleLineEditor
+                    value={oAuth['tokenHeaderPrefix'] || ''}
+                    theme={storedTheme}
+                    onSave={handleSave}
+                    onChange={(val) => handleChange('tokenHeaderPrefix', val)}
+                    onRun={handleRun}
+                    collection={collection}
+                  />
+                </div>
+              </div>
+            )
+          : (
+              <div className="flex items-center gap-4 w-full" key="input-token-query-param-key">
+                <label className="block font-medium min-w-[140px]">Query Param Key</label>
+                <div className="single-line-editor-wrapper flex-1">
+                  <SingleLineEditor
+                    value={oAuth['tokenQueryKey'] || ''}
+                    theme={storedTheme}
+                    onSave={handleSave}
+                    onChange={(val) => handleChange('tokenQueryKey', val)}
+                    onRun={handleRun}
+                    collection={collection}
+                  />
+                </div>
+              </div>
+            )
       }
       <div className="flex items-center gap-2.5 mt-4 mb-2">
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconAdjustmentsHorizontal size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium text-gray-800 dark:text-gray-200">
+        <span className="font-medium text-gray-800 dark:text-gray-200">
           Advanced Settings
         </span>
       </div>
@@ -284,7 +287,7 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
             value={get(request, 'auth.oauth2.refreshTokenUrl', '')}
             theme={storedTheme}
             onSave={handleSave}
-            onChange={(val) => handleChange("refreshTokenUrl", val)}
+            onChange={(val) => handleChange('refreshTokenUrl', val)}
             collection={collection}
             item={item}
           />
@@ -295,7 +298,7 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconSettings size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">Settings</span>
+        <span className="font-medium">Settings</span>
       </div>
 
       {/* Automatically Fetch Token */}
@@ -348,4 +351,4 @@ const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAu
   );
 };
 
-export default OAuth2AuthorizationCode;
\ No newline at end of file
+export default OAuth2AuthorizationCode;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/StyledWrapper.js
index b06deaedf..a162decf9 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
   .single-line-editor-wrapper {
     max-width: 400px;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/index.js
index 253adeac0..0db7db450 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/ClientCredentials/index.js
@@ -21,16 +21,16 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
   const { isSensitive } = useDetectSensitiveField(collection);
   const oAuth = get(request, 'auth.oauth2', {});
 
-  const { 
-    accessTokenUrl, 
-    clientId, 
-    clientSecret, 
-    scope, 
-    credentialsPlacement, 
-    credentialsId, 
-    tokenPlacement, 
-    tokenHeaderPrefix, 
-    tokenQueryKey, 
+  const {
+    accessTokenUrl,
+    clientId,
+    clientSecret,
+    scope,
+    credentialsPlacement,
+    credentialsId,
+    tokenPlacement,
+    tokenHeaderPrefix,
+    tokenQueryKey,
     refreshTokenUrl,
     autoRefreshToken,
     autoFetchToken,
@@ -40,13 +40,12 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
   const refreshTokenUrlAvailable = refreshTokenUrl?.trim() !== '';
   const isAutoRefreshDisabled = !refreshTokenUrlAvailable;
 
-
   const handleSave = () => { save(); };
 
   const TokenPlacementIcon = forwardRef((props, ref) => {
     return (
       <div ref={ref} className="flex items-center justify-end token-placement-label select-none">
-        {tokenPlacement == 'url' ?  'URL' : 'Headers'}
+        {tokenPlacement == 'url' ? 'URL' : 'Headers'}
         <IconCaretDown className="caret ml-1 mr-1" size={14} strokeWidth={2} />
       </div>
     );
@@ -55,7 +54,7 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
   const CredentialsPlacementIcon = forwardRef((props, ref) => {
     return (
       <div ref={ref} className="flex items-center justify-end token-placement-label select-none">
-        {credentialsPlacement == 'body' ?  'Request Body' : 'Basic Auth Header'}
+        {credentialsPlacement == 'body' ? 'Request Body' : 'Basic Auth Header'}
         <IconCaretDown className="caret ml-1 mr-1" size={14} strokeWidth={2} />
       </div>
     );
@@ -95,7 +94,7 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconSettings size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">
+        <span className="font-medium">
           Configuration
         </span>
       </div>
@@ -103,7 +102,7 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
         const { key, label, isSecret } = input;
         const value = oAuth[key] || '';
         const { showWarning, warningMessage } = isSensitive(value);
-        
+
         return (
           <div className="flex items-center gap-4 w-full" key={`input-${key}`}>
             <label className="block min-w-[140px]">{label}</label>
@@ -123,7 +122,7 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
           </div>
         );
       })}
-      <div className="flex items-center gap-4 w-full" key={`input-credentials-placement`}>
+      <div className="flex items-center gap-4 w-full" key="input-credentials-placement">
         <label className="block min-w-[140px]">Add Credentials to</label>
         <div className="inline-flex items-center cursor-pointer token-placement-selector">
           <Dropdown onCreate={onDropdownCreate} icon={<CredentialsPlacementIcon />} placement="bottom-end">
@@ -152,11 +151,11 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconKey size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium text-gray-800 dark:text-gray-200">
+        <span className="font-medium text-gray-800 dark:text-gray-200">
           Token
         </span>
       </div>
-      <div className="flex items-center gap-4 w-full" key={`input-token-name`}>
+      <div className="flex items-center gap-4 w-full" key="input-token-name">
         <label className="block min-w-[140px]">Token ID</label>
         <div className="single-line-editor-wrapper flex-1">
           <SingleLineEditor
@@ -170,7 +169,7 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
           />
         </div>
       </div>
-      <div className="flex items-center gap-4 w-full" key={`input-token-placement`}>
+      <div className="flex items-center gap-4 w-full" key="input-token-placement">
         <label className="block min-w-[140px]">Add token to</label>
         <div className="inline-flex items-center cursor-pointer token-placement-selector w-fit">
           <Dropdown onCreate={onDropdownCreate} icon={<TokenPlacementIcon />} placement="bottom-end">
@@ -196,40 +195,43 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
         </div>
       </div>
       {
-        tokenPlacement === 'header' ?
-          <div className="flex items-center gap-4 w-full" key={`input-token-prefix`}>
-            <label className="block min-w-[140px]">Header Prefix</label>
-            <div className="single-line-editor-wrapper flex-1">
-              <SingleLineEditor
-                value={oAuth['tokenHeaderPrefix'] || ''}
-                theme={storedTheme}
-                onSave={handleSave}
-                onChange={(val) => handleChange('tokenHeaderPrefix', val)}
-                onRun={handleRun}
-                collection={collection}
-              />
-            </div>
-          </div>
-          :
-          <div className="flex items-center gap-4 w-full" key={`input-token-query-param-key`}>
-            <label className="block font-medium min-w-[140px]">Query Param Key</label>
-            <div className="single-line-editor-wrapper flex-1">
-              <SingleLineEditor
-                value={oAuth['tokenQueryKey'] || ''}
-                theme={storedTheme}
-                onSave={handleSave}
-                onChange={(val) => handleChange('tokenQueryKey', val)}
-                onRun={handleRun}
-                collection={collection}
-              />
-            </div>
-          </div>
+        tokenPlacement === 'header'
+          ? (
+              <div className="flex items-center gap-4 w-full" key="input-token-prefix">
+                <label className="block min-w-[140px]">Header Prefix</label>
+                <div className="single-line-editor-wrapper flex-1">
+                  <SingleLineEditor
+                    value={oAuth['tokenHeaderPrefix'] || ''}
+                    theme={storedTheme}
+                    onSave={handleSave}
+                    onChange={(val) => handleChange('tokenHeaderPrefix', val)}
+                    onRun={handleRun}
+                    collection={collection}
+                  />
+                </div>
+              </div>
+            )
+          : (
+              <div className="flex items-center gap-4 w-full" key="input-token-query-param-key">
+                <label className="block font-medium min-w-[140px]">Query Param Key</label>
+                <div className="single-line-editor-wrapper flex-1">
+                  <SingleLineEditor
+                    value={oAuth['tokenQueryKey'] || ''}
+                    theme={storedTheme}
+                    onSave={handleSave}
+                    onChange={(val) => handleChange('tokenQueryKey', val)}
+                    onRun={handleRun}
+                    collection={collection}
+                  />
+                </div>
+              </div>
+            )
       }
       <div className="flex items-center gap-2.5 mt-4 mb-2">
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconAdjustmentsHorizontal size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium text-gray-800 dark:text-gray-200">
+        <span className="font-medium text-gray-800 dark:text-gray-200">
           Advanced Settings
         </span>
       </div>
@@ -241,7 +243,7 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
             value={get(request, 'auth.oauth2.refreshTokenUrl', '')}
             theme={storedTheme}
             onSave={handleSave}
-            onChange={(val) => handleChange("refreshTokenUrl", val)}
+            onChange={(val) => handleChange('refreshTokenUrl', val)}
             collection={collection}
             item={item}
           />
@@ -252,7 +254,7 @@ const OAuth2ClientCredentials = ({ save, item = {}, request, handleRun, updateAu
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconSettings size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">Settings</span>
+        <span className="font-medium">Settings</span>
       </div>
 
       {/* Automatically Fetch Token */}
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/StyledWrapper.js
index bb42bdb49..5807de3c2 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
 
   .grant-type-mode-selector {
     padding: 0.5rem 0px;
@@ -47,7 +47,7 @@ const Wrapper = styled.div`
     fill: rgb(140 140 140);
   }
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 `;
 
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/index.js
index f89aa9579..888b495d6 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/GrantTypeSelector/index.js
@@ -47,28 +47,28 @@ const GrantTypeSelector = ({ item = {}, request, updateAuth, collection }) => {
   useEffect(() => {
     // initialize redux state with a default oauth2 grant type
     // authorization_code - default option
-    !oAuth?.grantType &&
-      dispatch(
-        updateAuth({
-          mode: 'oauth2',
-          collectionUid: collection.uid,
-          itemUid: item.uid,
-          content: {
-            grantType: 'authorization_code',
-            accessTokenUrl: '',
-            username: '',
-            password: '',
-            clientId: '',
-            clientSecret: '',
-            scope: '',
-            credentialsPlacement: 'body',
-            credentialsId: 'credentials',
-            tokenPlacement: 'header',
-            tokenHeaderPrefix: 'Bearer',
-            tokenQueryKey: 'access_token',
-          }
-        })
-      );
+    !oAuth?.grantType
+    && dispatch(
+      updateAuth({
+        mode: 'oauth2',
+        collectionUid: collection.uid,
+        itemUid: item.uid,
+        content: {
+          grantType: 'authorization_code',
+          accessTokenUrl: '',
+          username: '',
+          password: '',
+          clientId: '',
+          clientSecret: '',
+          scope: '',
+          credentialsPlacement: 'body',
+          credentialsId: 'credentials',
+          tokenPlacement: 'header',
+          tokenHeaderPrefix: 'Bearer',
+          tokenQueryKey: 'access_token'
+        }
+      })
+    );
   }, [oAuth]);
 
   return (
@@ -77,7 +77,7 @@ const GrantTypeSelector = ({ item = {}, request, updateAuth, collection }) => {
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconKey size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">
+        <span className="font-medium">
           Grant Type
         </span>
       </div>
@@ -124,4 +124,4 @@ const GrantTypeSelector = ({ item = {}, request, updateAuth, collection }) => {
     </StyledWrapper>
   );
 };
-export default GrantTypeSelector;
\ No newline at end of file
+export default GrantTypeSelector;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js
index 273806001..5ecbd80cb 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
   .oauth2-input-wrapper {
     max-width: 400px;
@@ -58,4 +58,4 @@ const Wrapper = styled.div`
   }
 `;
 
-export default Wrapper; 
\ No newline at end of file
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/index.js
index 9715aa3ce..eefe8928d 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/index.js
@@ -67,7 +67,7 @@ const OAuth2Implicit = ({ save, item = {}, request, handleRun, updateAuth, colle
           tokenHeaderPrefix,
           tokenQueryKey,
           autoFetchToken,
-          [key]: value,
+          [key]: value
         }
       })
     );
@@ -84,7 +84,7 @@ const OAuth2Implicit = ({ save, item = {}, request, handleRun, updateAuth, colle
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconSettings size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">
+        <span className="font-medium">
           Configuration
         </span>
       </div>
@@ -113,12 +113,12 @@ const OAuth2Implicit = ({ save, item = {}, request, handleRun, updateAuth, colle
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconKey size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium text-gray-800 dark:text-gray-200">
+        <span className="font-medium text-gray-800 dark:text-gray-200">
           Token
         </span>
       </div>
 
-      <div className="flex items-center gap-4 w-full" key={`input-token-name`}>
+      <div className="flex items-center gap-4 w-full" key="input-token-name">
         <label className="block min-w-[140px]">Token ID</label>
         <div className="oauth2-input-wrapper flex-1">
           <SingleLineEditor
@@ -133,7 +133,7 @@ const OAuth2Implicit = ({ save, item = {}, request, handleRun, updateAuth, colle
         </div>
       </div>
 
-      <div className="flex items-center gap-4 w-full" key={`input-token-placement`}>
+      <div className="flex items-center gap-4 w-full" key="input-token-placement">
         <label className="block min-w-[140px]">Add Token to</label>
         <div className="inline-flex items-center cursor-pointer token-placement-selector">
           <Dropdown onCreate={onDropdownCreate} icon={<TokenPlacementIcon />} placement="bottom-end">
@@ -160,7 +160,7 @@ const OAuth2Implicit = ({ save, item = {}, request, handleRun, updateAuth, colle
       </div>
 
       {tokenPlacement == 'header' ? (
-        <div className="flex items-center gap-4 w-full" key={`input-token-header-prefix`}>
+        <div className="flex items-center gap-4 w-full" key="input-token-header-prefix">
           <label className="block min-w-[140px]">Header Prefix</label>
           <div className="oauth2-input-wrapper flex-1">
             <SingleLineEditor
@@ -175,7 +175,7 @@ const OAuth2Implicit = ({ save, item = {}, request, handleRun, updateAuth, colle
           </div>
         </div>
       ) : (
-        <div className="flex items-center gap-4 w-full" key={`input-token-query-key`}>
+        <div className="flex items-center gap-4 w-full" key="input-token-query-key">
           <label className="block min-w-[140px]">URL Query Key</label>
           <div className="oauth2-input-wrapper flex-1">
             <SingleLineEditor
@@ -195,7 +195,7 @@ const OAuth2Implicit = ({ save, item = {}, request, handleRun, updateAuth, colle
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconAdjustmentsHorizontal size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">
+        <span className="font-medium">
           Advanced Options
         </span>
       </div>
@@ -230,4 +230,4 @@ const OAuth2Implicit = ({ save, item = {}, request, handleRun, updateAuth, colle
   );
 };
 
-export default OAuth2Implicit; 
\ No newline at end of file
+export default OAuth2Implicit;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/inputsConfig.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/inputsConfig.js
index 86040b838..2764be870 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/inputsConfig.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Implicit/inputsConfig.js
@@ -21,4 +21,4 @@ const inputsConfig = [
   }
 ];
 
-export { inputsConfig }; 
\ No newline at end of file
+export { inputsConfig };
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2ActionButtons/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2ActionButtons/index.js
index 3d3dc697d..d89883903 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2ActionButtons/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2ActionButtons/index.js
@@ -1,11 +1,11 @@
-import { useMemo, useState } from "react";
-import { useDispatch } from "react-redux";
+import { useMemo, useState } from 'react';
+import { useDispatch } from 'react-redux';
 import toast from 'react-hot-toast';
 import { cloneDeep, find } from 'lodash';
 import { IconLoader2 } from '@tabler/icons';
 import { interpolate } from '@usebruno/common';
 import { fetchOauth2Credentials, clearOauth2Cache, refreshOauth2Credentials } from 'providers/ReduxStore/slices/collections/actions';
-import { getAllVariables } from "utils/collections/index";
+import { getAllVariables } from 'utils/collections/index';
 
 const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, credentialsId }) => {
   const { uid: collectionUid } = collection;
@@ -19,7 +19,7 @@ const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, c
     return interpolate(accessTokenUrl, variables);
   }, [collection, item, accessTokenUrl]);
 
-  const credentialsData = find(collection?.oauth2Credentials, creds => creds?.url == interpolatedAccessTokenUrl && creds?.collectionUid == collectionUid && creds?.credentialsId == credentialsId);
+  const credentialsData = find(collection?.oauth2Credentials, (creds) => creds?.url == interpolatedAccessTokenUrl && creds?.collectionUid == collectionUid && creds?.credentialsId == credentialsId);
   const creds = credentialsData?.credentials || {};
 
   const handleFetchOauth2Credentials = async () => {
@@ -28,15 +28,15 @@ const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, c
     requestCopy.headers = {};
     toggleFetchingToken(true);
     try {
-      const result = await dispatch(fetchOauth2Credentials({ 
-        itemUid: item.uid, 
-        request: requestCopy, 
+      const result = await dispatch(fetchOauth2Credentials({
+        itemUid: item.uid,
+        request: requestCopy,
         collection,
         forceGetToken: true
       }));
-      
+
       toggleFetchingToken(false);
-      
+
       // Check if the result contains error or if access_token is missing
       if (!result || !result.access_token) {
         const errorMessage = result?.error || 'No access token received from authorization server';
@@ -44,16 +44,15 @@ const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, c
         toast.error(errorMessage);
         return;
       }
-      
+
       toast.success('Token fetched successfully!');
-    }
-    catch (error) {
+    } catch (error) {
       console.error('could not fetch the token!');
       console.error(error);
       toggleFetchingToken(false);
       toast.error(error?.message || 'An error occurred while fetching token!');
     }
-  }
+  };
 
   const handleRefreshAccessToken = async () => {
     let requestCopy = cloneDeep(request);
@@ -61,15 +60,15 @@ const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, c
     requestCopy.headers = {};
     toggleRefreshingToken(true);
     try {
-      const result = await dispatch(refreshOauth2Credentials({ 
-        itemUid: item.uid, 
-        request: requestCopy, 
+      const result = await dispatch(refreshOauth2Credentials({
+        itemUid: item.uid,
+        request: requestCopy,
         collection,
         forceGetToken: true
       }));
-      
+
       toggleRefreshingToken(false);
-      
+
       // Check if the result contains error or if access_token is missing
       if (!result || !result.access_token) {
         const errorMessage = result?.error || 'No access token received from authorization server';
@@ -77,10 +76,9 @@ const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, c
         toast.error(errorMessage);
         return;
       }
-      
+
       toast.success('Token refreshed successfully!');
-    }
-    catch(error) {
+    } catch (error) {
       console.error(error);
       toggleRefreshingToken(false);
       toast.error(error?.message || 'An error occurred while refreshing token!');
@@ -89,37 +87,39 @@ const Oauth2ActionButtons = ({ item, request, collection, url: accessTokenUrl, c
 
   const handleClearCache = (e) => {
     dispatch(clearOauth2Cache({ collectionUid: collection?.uid, url: interpolatedAccessTokenUrl, credentialsId }))
-    .then(() => {
-      toast.success('Cleared cache successfully');
-    })
-    .catch((err) => {
-      toast.error(err.message);
-    });
+      .then(() => {
+        toast.success('Cleared cache successfully');
+      })
+      .catch((err) => {
+        toast.error(err.message);
+      });
   };
 
   return (
     <div className="flex flex-row gap-4 mt-4">
-      <button 
-        onClick={handleFetchOauth2Credentials} 
-        className={`submit btn btn-sm btn-secondary w-fit flex flex-row`}
+      <button
+        onClick={handleFetchOauth2Credentials}
+        className="submit btn btn-sm btn-secondary w-fit flex flex-row"
         disabled={fetchingToken || refreshingToken}
       >
-        Get Access Token{fetchingToken? <IconLoader2 className="animate-spin ml-2" size={18} strokeWidth={1.5} /> : ""}
+        Get Access Token{fetchingToken ? <IconLoader2 className="animate-spin ml-2" size={18} strokeWidth={1.5} /> : ''}
       </button>
-      {creds?.refresh_token ? 
-        <button 
-          onClick={handleRefreshAccessToken}
-          className={`submit btn btn-sm btn-secondary w-fit flex flex-row`}
-          disabled={fetchingToken || refreshingToken}
-        >
-          Refresh Token{refreshingToken? <IconLoader2 className="animate-spin ml-2" size={18} strokeWidth={1.5} /> : ""}
-        </button> 
-      : null}
+      {creds?.refresh_token
+        ? (
+            <button
+              onClick={handleRefreshAccessToken}
+              className="submit btn btn-sm btn-secondary w-fit flex flex-row"
+              disabled={fetchingToken || refreshingToken}
+            >
+              Refresh Token{refreshingToken ? <IconLoader2 className="animate-spin ml-2" size={18} strokeWidth={1.5} /> : ''}
+            </button>
+          )
+        : null}
       <button onClick={handleClearCache} className="submit btn btn-sm btn-secondary w-fit">
         Clear Cache
       </button>
     </div>
-  )
-}
+  );
+};
 
-export default Oauth2ActionButtons;
\ No newline at end of file
+export default Oauth2ActionButtons;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2TokenViewer/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2TokenViewer/index.js
index 7692b5891..55c7da274 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2TokenViewer/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/Oauth2TokenViewer/index.js
@@ -1,6 +1,6 @@
-import { useState, useEffect, useMemo } from "react";
-import { find } from "lodash";
-import StyledWrapper from "./StyledWrapper";
+import { useState, useEffect, useMemo } from 'react';
+import { find } from 'lodash';
+import StyledWrapper from './StyledWrapper';
 import { IconChevronDown, IconChevronRight, IconCopy, IconCheck } from '@tabler/icons';
 import { getAllVariables } from 'utils/collections/index';
 import { interpolate } from '@usebruno/common';
@@ -39,18 +39,17 @@ const TokenSection = ({ title, token }) => {
         onClick={() => setIsExpanded(!isExpanded)}
       >
         <div className="flex items-center space-x-2 w-full">
-          {isExpanded ?
-            <IconChevronDown size={18} className="text-gray-500" /> :
-            <IconChevronRight size={18} className="text-gray-500" />
-          }
+          {isExpanded
+            ? <IconChevronDown size={18} className="text-gray-500" />
+            : <IconChevronRight size={18} className="text-gray-500" />}
           <div className="flex flex-row justify-between w-full">
-            <h3 className="text-sm font-medium">{title}</h3>
+            <h3 className="font-medium">{title}</h3>
             {decodedToken?.exp && <ExpiryTimer expiresIn={decodedToken?.exp} />}
           </div>
         </div>
       </div>
       {isExpanded && (
-        <div className="p-3 text-sm">
+        <div className="p-3">
           <div className="relative group">
             <div className="absolute right-2 top-2 opacity-0 group-hover:opacity-100 transition-opacity">
               <button
@@ -58,10 +57,9 @@ const TokenSection = ({ title, token }) => {
                 className="p-1 bg-indigo-100 dark:hover:bg-indigo-200 rounded"
                 title="Copy token"
               >
-                {copied ?
-                  <IconCheck size={16} className="text-green-700" /> :
-                  <IconCopy size={16} className="text-gray-500" />
-                }
+                {copied
+                  ? <IconCheck size={16} className="text-green-700" />
+                  : <IconCopy size={16} className="text-gray-500" />}
               </button>
             </div>
             <div className="font-mono text-xs bg-gray-50 dark:bg-gray-800 p-2 rounded break-all">
@@ -115,16 +113,15 @@ const ExpiryTimer = ({ expiresIn }) => {
   return (
     <div
       className={`text-xs px-2 py-1 rounded-full min-w-[120px] text-center ${timeLeft <= 30
-          ? "bg-red-50 dark:bg-red-900/30 text-red-600 dark:text-red-400"
-          : "bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400"
-        }`}
+        ? 'bg-red-50 dark:bg-red-900/30 text-red-600 dark:text-red-400'
+        : 'bg-blue-50 dark:bg-blue-900/30 text-blue-600 dark:text-blue-400'
+      }`}
     >
       {timeLeft > 0 ? `Expires in ${formatExpiryTime(timeLeft)}` : `Expired`}
     </div>
   );
 };
 
-
 const Oauth2TokenViewer = ({ collection, item, url, credentialsId, handleRun }) => {
   const { uid: collectionUid } = collection;
 
@@ -133,7 +130,7 @@ const Oauth2TokenViewer = ({ collection, item, url, credentialsId, handleRun })
     return interpolate(url, variables);
   }, [collection, item, url]);
 
-  const credentialsData = find(collection?.oauth2Credentials, creds => creds?.url == interpolatedUrl && creds?.collectionUid == collectionUid && creds?.credentialsId == credentialsId);
+  const credentialsData = find(collection?.oauth2Credentials, (creds) => creds?.url == interpolatedUrl && creds?.collectionUid == collectionUid && creds?.credentialsId == credentialsId);
   const creds = credentialsData?.credentials || {};
 
   return (
@@ -146,27 +143,33 @@ const Oauth2TokenViewer = ({ collection, item, url, credentialsId, handleRun })
             <TokenSection title="Access Token" token={creds.access_token} />
             <TokenSection title="Refresh Token" token={creds.refresh_token} />
             <TokenSection title="ID Token" token={creds.id_token} />
-            {(creds.token_type || creds.scope) ? <div className="mt-3 p-2 bg-gray-50 dark:bg-gray-800 rounded-lg text-xs">
-              <div className="grid grid-cols-2 gap-2">
-                {creds.token_type ? <div className="flex items-center space-x-1">
-                  <span className="font-medium">Token Type:</span>
-                  <span className="text-gray-600 dark:text-gray-300">{creds.token_type}</span>
-                </div> : null}
-                {creds?.scope ? <div className="flex items-center space-x-1 min-w-0">
-                  <span className="font-medium flex-shrink-0">Scope:</span>
-                  <span className="text-gray-600 dark:text-gray-300 truncate" title={creds.scope}>
-                    {creds.scope}
-                  </span>
-                </div> : null}
+            {(creds.token_type || creds.scope) ? (
+              <div className="mt-3 p-2 bg-gray-50 dark:bg-gray-800 rounded-lg text-xs">
+                <div className="grid grid-cols-2 gap-2">
+                  {creds.token_type ? (
+                    <div className="flex items-center space-x-1">
+                      <span className="font-medium">Token Type:</span>
+                      <span className="text-gray-600 dark:text-gray-300">{creds.token_type}</span>
+                    </div>
+                  ) : null}
+                  {creds?.scope ? (
+                    <div className="flex items-center space-x-1 min-w-0">
+                      <span className="font-medium flex-shrink-0">Scope:</span>
+                      <span className="text-gray-600 dark:text-gray-300 truncate" title={creds.scope}>
+                        {creds.scope}
+                      </span>
+                    </div>
+                  ) : null}
+                </div>
               </div>
-            </div> : null}
+            ) : null}
           </div>
-        )     
+        )
       ) : (
-        <div className="text-sm text-gray-500 dark:text-gray-400">No token found</div>
+        <div className="text-gray-500 dark:text-gray-400">No token found</div>
       )}
     </StyledWrapper>
   );
 };
 
-export default Oauth2TokenViewer;
\ No newline at end of file
+export default Oauth2TokenViewer;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/StyledWrapper.js
index b06deaedf..a162decf9 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
   .single-line-editor-wrapper {
     max-width: 400px;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/index.js
index f048183e6..dcba8be17 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/PasswordCredentials/index.js
@@ -21,18 +21,18 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
   const oAuth = get(request, 'auth.oauth2', {});
   const { isSensitive } = useDetectSensitiveField(collection);
 
-  const { 
-    accessTokenUrl, 
-    username, 
-    password, 
-    clientId, 
-    clientSecret, 
-    scope, 
-    credentialsPlacement, 
-    credentialsId, 
-    tokenPlacement, 
-    tokenHeaderPrefix, 
-    tokenQueryKey, 
+  const {
+    accessTokenUrl,
+    username,
+    password,
+    clientId,
+    clientSecret,
+    scope,
+    credentialsPlacement,
+    credentialsId,
+    tokenPlacement,
+    tokenHeaderPrefix,
+    tokenQueryKey,
     refreshTokenUrl,
     autoRefreshToken,
     autoFetchToken,
@@ -42,12 +42,12 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
   const refreshTokenUrlAvailable = refreshTokenUrl?.trim() !== '';
   const isAutoRefreshDisabled = !refreshTokenUrlAvailable;
 
-  const handleSave = () => { save(); }
+  const handleSave = () => { save(); };
 
   const TokenPlacementIcon = forwardRef((props, ref) => {
     return (
       <div ref={ref} className="flex items-center justify-end token-placement-label select-none">
-        {tokenPlacement == 'url' ?  'URL' : 'Headers'}
+        {tokenPlacement == 'url' ? 'URL' : 'Headers'}
         <IconCaretDown className="caret ml-1 mr-1" size={14} strokeWidth={2} />
       </div>
     );
@@ -56,7 +56,7 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
   const CredentialsPlacementIcon = forwardRef((props, ref) => {
     return (
       <div ref={ref} className="flex items-center justify-end token-placement-label select-none">
-        {credentialsPlacement == 'body' ?  'Request Body' : 'Basic Auth Header'}
+        {credentialsPlacement == 'body' ? 'Request Body' : 'Basic Auth Header'}
         <IconCaretDown className="caret ml-1 mr-1" size={14} strokeWidth={2} />
       </div>
     );
@@ -98,7 +98,7 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconSettings size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">
+        <span className="font-medium">
           Configuration
         </span>
       </div>
@@ -106,7 +106,7 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
         const { key, label, isSecret } = input;
         const value = oAuth[key] || '';
         const { showWarning, warningMessage } = isSensitive(value);
-        
+
         return (
           <div className="flex items-center gap-4 w-full" key={`input-${key}`}>
             <label className="block min-w-[140px]">{label}</label>
@@ -126,7 +126,7 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
           </div>
         );
       })}
-      <div className="flex items-center gap-4 w-full" key={`input-credentials-placement`}>
+      <div className="flex items-center gap-4 w-full" key="input-credentials-placement">
         <label className="block min-w-[140px]">Add Credentials to</label>
         <div className="inline-flex items-center cursor-pointer token-placement-selector">
           <Dropdown onCreate={onDropdownCreate} icon={<CredentialsPlacementIcon />} placement="bottom-end">
@@ -155,11 +155,11 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconKey size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium text-gray-800 dark:text-gray-200">
+        <span className="font-medium text-gray-800 dark:text-gray-200">
           Token
         </span>
       </div>
-      <div className="flex items-center gap-4 w-full" key={`input-token-name`}>
+      <div className="flex items-center gap-4 w-full" key="input-token-name">
         <label className="block min-w-[140px]">Token ID</label>
         <div className="single-line-editor-wrapper flex-1">
           <SingleLineEditor
@@ -173,7 +173,7 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
           />
         </div>
       </div>
-      <div className="flex items-center gap-4 w-full" key={`input-token-placement`}>
+      <div className="flex items-center gap-4 w-full" key="input-token-placement">
         <label className="block min-w-[140px]">Add token to</label>
         <div className="inline-flex items-center cursor-pointer token-placement-selector">
           <Dropdown onCreate={onDropdownCreate} icon={<TokenPlacementIcon />} placement="bottom-end">
@@ -199,40 +199,43 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
         </div>
       </div>
       {
-        tokenPlacement === 'header' ?
-          <div className="flex items-center gap-4 w-full" key={`input-token-prefix`}>
-            <label className="block min-w-[140px]">Header Prefix</label>
-            <div className="single-line-editor-wrapper flex-1">
-              <SingleLineEditor
-                value={oAuth['tokenHeaderPrefix'] || ''}
-                theme={storedTheme}
-                onSave={handleSave}
-                onChange={(val) => handleChange('tokenHeaderPrefix', val)}
-                onRun={handleRun}
-                collection={collection}
-              />
-            </div>
-          </div>
-          :
-          <div className="flex items-center gap-4 w-full" key={`input-token-query-param-key`}>
-            <label className="block font-medium min-w-[140px]">Query Param Key</label>
-            <div className="single-line-editor-wrapper flex-1">
-              <SingleLineEditor
-                value={oAuth['tokenQueryKey'] || ''}
-                theme={storedTheme}
-                onSave={handleSave}
-                onChange={(val) => handleChange('tokenQueryKey', val)}
-                onRun={handleRun}
-                collection={collection}
-              />
-            </div>
-          </div>
+        tokenPlacement === 'header'
+          ? (
+              <div className="flex items-center gap-4 w-full" key="input-token-prefix">
+                <label className="block min-w-[140px]">Header Prefix</label>
+                <div className="single-line-editor-wrapper flex-1">
+                  <SingleLineEditor
+                    value={oAuth['tokenHeaderPrefix'] || ''}
+                    theme={storedTheme}
+                    onSave={handleSave}
+                    onChange={(val) => handleChange('tokenHeaderPrefix', val)}
+                    onRun={handleRun}
+                    collection={collection}
+                  />
+                </div>
+              </div>
+            )
+          : (
+              <div className="flex items-center gap-4 w-full" key="input-token-query-param-key">
+                <label className="block font-medium min-w-[140px]">Query Param Key</label>
+                <div className="single-line-editor-wrapper flex-1">
+                  <SingleLineEditor
+                    value={oAuth['tokenQueryKey'] || ''}
+                    theme={storedTheme}
+                    onSave={handleSave}
+                    onChange={(val) => handleChange('tokenQueryKey', val)}
+                    onRun={handleRun}
+                    collection={collection}
+                  />
+                </div>
+              </div>
+            )
       }
       <div className="flex items-center gap-2.5 mt-4 mb-2">
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconAdjustmentsHorizontal size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium text-gray-800 dark:text-gray-200">
+        <span className="font-medium text-gray-800 dark:text-gray-200">
           Advanced Settings
         </span>
       </div>
@@ -244,7 +247,7 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
             value={get(request, 'auth.oauth2.refreshTokenUrl', '')}
             theme={storedTheme}
             onSave={handleSave}
-            onChange={(val) => handleChange("refreshTokenUrl", val)}
+            onChange={(val) => handleChange('refreshTokenUrl', val)}
             collection={collection}
             item={item}
           />
@@ -255,7 +258,7 @@ const OAuth2PasswordCredentials = ({ save, item = {}, request, handleRun, update
         <div className="flex items-center px-2.5 py-1.5 bg-indigo-50/50 dark:bg-indigo-500/10 rounded-md">
           <IconSettings size={14} className="text-indigo-500 dark:text-indigo-400" />
         </div>
-        <span className="text-sm font-medium">Settings</span>
+        <span className="font-medium">Settings</span>
       </div>
 
       {/* Automatically Fetch Token */}
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/StyledWrapper.js
index 856f35b9b..65cb5cba9 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
   .single-line-editor-wrapper {
     max-width: 400px;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/index.js
index 98b435f1d..f92fb4d3a 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/index.js
@@ -24,7 +24,6 @@ const GrantTypeComponentMap = ({ item, collection }) => {
     dispatch(sendRequest(item, collection.uid));
   };
 
-
   switch (grantType) {
     case 'password':
       return <OAuth2PasswordCredentials item={item} save={save} request={request} handleRun={handleRun} updateAuth={updateAuth} collection={collection} />;
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/WsseAuth/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Auth/WsseAuth/StyledWrapper.js
index 316d3a7c5..c2901f80b 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/WsseAuth/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/WsseAuth/StyledWrapper.js
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   label {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .single-line-editor-wrapper {
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/WsseAuth/index.js b/packages/bruno-app/src/components/RequestPane/Auth/WsseAuth/index.js
index fde2310c9..3ff583a98 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/WsseAuth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/WsseAuth/index.js
@@ -18,7 +18,7 @@ const WsseAuth = ({ item, collection, updateAuth, request, save }) => {
   const { showWarning, warningMessage } = isSensitive(wsseAuth?.password);
 
   const handleRun = () => dispatch(sendRequest(item, collection.uid));
-  
+
   const handleSave = () => {
     save();
   };
diff --git a/packages/bruno-app/src/components/RequestPane/Auth/index.js b/packages/bruno-app/src/components/RequestPane/Auth/index.js
index c1043918c..be3bb8ed5 100644
--- a/packages/bruno-app/src/components/RequestPane/Auth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Auth/index.js
@@ -31,9 +31,9 @@ const Auth = ({ item, collection }) => {
   const dispatch = useDispatch();
   const authMode = item.draft ? get(item, 'draft.request.auth.mode') : get(item, 'request.auth.mode');
   const requestTreePath = getTreePathFromCollectionToItem(collection, item);
-  
+
   // Create a request object to pass to the auth components
-  const request = item.draft 
+  const request = item.draft
     ? get(item, 'draft.request', {})
     : get(item, 'request', {});
 
@@ -87,7 +87,7 @@ const Auth = ({ item, collection }) => {
       }
       case 'ntlm': {
         return <NTLMAuth collection={collection} item={item} request={request} save={save} updateAuth={updateAuth} />;
-      }      
+      }
       case 'oauth2': {
         return <OAuth2 collection={collection} item={item} request={request} save={save} updateAuth={updateAuth} />;
       }
diff --git a/packages/bruno-app/src/components/RequestPane/FileBody/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/FileBody/StyledWrapper.js
index 35adfcc1f..1853f1c5e 100644
--- a/packages/bruno-app/src/components/RequestPane/FileBody/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/FileBody/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -39,7 +39,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-param {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/RequestPane/FileBody/index.js b/packages/bruno-app/src/components/RequestPane/FileBody/index.js
index d97953aa5..62f7dd90c 100644
--- a/packages/bruno-app/src/components/RequestPane/FileBody/index.js
+++ b/packages/bruno-app/src/components/RequestPane/FileBody/index.js
@@ -20,7 +20,7 @@ const FileBody = ({ item, collection }) => {
     dispatch(
       _addFile({
         itemUid: item.uid,
-        collectionUid: collection.uid,
+        collectionUid: collection.uid
       })
     );
   };
@@ -33,7 +33,7 @@ const FileBody = ({ item, collection }) => {
     switch (type) {
       case 'filePath': {
         param.filePath = e.target.filePath;
-        param.contentType = "";
+        param.contentType = '';
         break;
       }
       case 'contentType': {
@@ -42,7 +42,7 @@ const FileBody = ({ item, collection }) => {
       }
       case 'selected': {
         param.selected = e.target.selected;
-        setEnableFileUid(param.uid)
+        setEnableFileUid(param.uid);
         break;
       }
     }
@@ -100,8 +100,7 @@ const FileBody = ({ item, collection }) => {
                             },
                             param,
                             'filePath'
-                          )
-                        }
+                          )}
                         collection={collection}
                       />
                     </td>
@@ -121,8 +120,7 @@ const FileBody = ({ item, collection }) => {
                             },
                             param,
                             'contentType'
-                          )
-                        }
+                          )}
                         onRun={handleRun}
                         collection={collection}
                       />
@@ -161,4 +159,4 @@ const FileBody = ({ item, collection }) => {
     </StyledWrapper>
   );
 };
-export default FileBody;
\ No newline at end of file
+export default FileBody;
diff --git a/packages/bruno-app/src/components/RequestPane/FormUrlEncodedParams/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/FormUrlEncodedParams/StyledWrapper.js
index 517415935..70a8edfc4 100644
--- a/packages/bruno-app/src/components/RequestPane/FormUrlEncodedParams/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/FormUrlEncodedParams/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -23,7 +23,7 @@ const Wrapper = styled.div`
     }
 
   .btn-add-param {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/RequestPane/FormUrlEncodedParams/index.js b/packages/bruno-app/src/components/RequestPane/FormUrlEncodedParams/index.js
index c8eeda531..eff560436 100644
--- a/packages/bruno-app/src/components/RequestPane/FormUrlEncodedParams/index.js
+++ b/packages/bruno-app/src/components/RequestPane/FormUrlEncodedParams/index.js
@@ -89,59 +89,58 @@ const FormUrlEncodedParams = ({ item, collection }) => {
         <ReorderTable updateReorderedItem={handleParamDrag}>
           {params && params.length
             ? params.map((param, index) => {
-              return (
-                <tr key={param.uid} data-uid={param.uid}>
-                  <td className='flex relative'>
-                    <input
-                      type="text"
-                      autoComplete="off"
-                      autoCorrect="off"
-                      autoCapitalize="off"
-                      spellCheck="false"
-                      value={param.name}
-                      className="mousetrap"
-                      onChange={(e) => handleParamChange(e, param, 'name')}
-                    />
-                  </td>
-                  <td>
-                    <MultiLineEditor
-                      value={param.value}
-                      theme={storedTheme}
-                      onSave={onSave}
-                      onChange={(newValue) =>
-                        handleParamChange(
-                          {
-                            target: {
-                              value: newValue
-                            }
-                          },
-                          param,
-                          'value'
-                        )
-                      }
-                      allowNewlines={true}
-                      onRun={handleRun}
-                      collection={collection}
-                      item={item}
-                    />
-                  </td>
-                  <td>
-                    <div className="flex items-center">
+                return (
+                  <tr key={param.uid} data-uid={param.uid}>
+                    <td className="flex relative">
                       <input
-                        type="checkbox"
-                        checked={param.enabled}
-                        tabIndex="-1"
-                        className="mr-3 mousetrap"
-                        onChange={(e) => handleParamChange(e, param, 'enabled')}
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        value={param.name}
+                        className="mousetrap"
+                        onChange={(e) => handleParamChange(e, param, 'name')}
                       />
-                      <button tabIndex="-1" onClick={() => handleRemoveParams(param)}>
-                        <IconTrash strokeWidth={1.5} size={20} />
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-              );
-            })
+                    </td>
+                    <td>
+                      <MultiLineEditor
+                        value={param.value}
+                        theme={storedTheme}
+                        onSave={onSave}
+                        onChange={(newValue) =>
+                          handleParamChange(
+                            {
+                              target: {
+                                value: newValue
+                              }
+                            },
+                            param,
+                            'value'
+                          )}
+                        allowNewlines={true}
+                        onRun={handleRun}
+                        collection={collection}
+                        item={item}
+                      />
+                    </td>
+                    <td>
+                      <div className="flex items-center">
+                        <input
+                          type="checkbox"
+                          checked={param.enabled}
+                          tabIndex="-1"
+                          className="mr-3 mousetrap"
+                          onChange={(e) => handleParamChange(e, param, 'enabled')}
+                        />
+                        <button tabIndex="-1" onClick={() => handleRemoveParams(param)}>
+                          <IconTrash strokeWidth={1.5} size={20} />
+                        </button>
+                      </div>
+                    </td>
+                  </tr>
+                );
+              })
             : null}
         </ReorderTable>
       </Table>
diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js
index 3b1cc6109..6faef5924 100644
--- a/packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js
@@ -40,7 +40,7 @@ const GraphQLSchemaActions = ({ item, collection, onSchemaLoad, toggleDocs }) =>
   });
 
   return (
-    <div className="flex flex-grow justify-end items-center" style={{ fontSize: 13 }}>
+    <div className="flex flex-grow justify-end items-center">
       <div className="flex items-center cursor-pointer hover:underline" onClick={toggleDocs}>
         <IconBook size={18} strokeWidth={1.5} />
         <span className="ml-1">Docs</span>
diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLVariables/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLVariables/index.js
index 6ab530ebd..d8704fb30 100644
--- a/packages/bruno-app/src/components/RequestPane/GraphQLVariables/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GraphQLVariables/index.js
@@ -52,7 +52,7 @@ const GraphQLVariables = ({ variables, item, collection }) => {
       <button
         className="btn-add-param text-link px-4 py-4 select-none absolute top-0 right-0 z-10"
         onClick={onPrettify}
-        title={'Prettify'}
+        title="Prettify"
       >
         <IconWand size={20} strokeWidth={1.5} />
       </button>
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcBody/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/GrpcBody/StyledWrapper.js
index 4b1ebcdb1..6f529e7ac 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcBody/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcBody/StyledWrapper.js
@@ -56,4 +56,4 @@ const Wrapper = styled.div`
   }
 `;
 
-export default Wrapper;
\ No newline at end of file
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js b/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
index 0e1eb8d0b..4d0bcff63 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
@@ -12,7 +12,7 @@ import StyledWrapper from './StyledWrapper';
 import { IconSend, IconRefresh, IconWand, IconPlus, IconTrash, IconChevronDown, IconChevronUp } from '@tabler/icons';
 import ToolHint from 'components/ToolHint/index';
 import { toastError } from 'utils/common/error';
-import toast from 'react-hot-toast'
+import toast from 'react-hot-toast';
 import { getAbsoluteFilePath } from 'utils/common/path';
 import { prettifyJsonString } from 'utils/common/index';
 
@@ -33,7 +33,7 @@ const SingleGrpcMessage = ({ message, item, collection, index, methodType, isCol
 
   const onEdit = (value) => {
     const currentMessages = [...(body.grpc || [])];
-    
+
     currentMessages[index] = {
       name: name ? name : `message ${index + 1}`,
       content: value
@@ -41,8 +41,8 @@ const SingleGrpcMessage = ({ message, item, collection, index, methodType, isCol
 
     dispatch(updateRequestBody({
       content: currentMessages,
-            itemUid: item.uid,
-            collectionUid: collection.uid
+      itemUid: item.uid,
+      collectionUid: collection.uid
     }));
   };
 
@@ -159,7 +159,7 @@ const SingleGrpcMessage = ({ message, item, collection, index, methodType, isCol
           {isCollapsed
             ? <IconChevronDown size={16} strokeWidth={1.5} className="text-zinc-700 dark:text-zinc-300" />
             : <IconChevronUp size={16} strokeWidth={1.5} className="text-zinc-700 dark:text-zinc-300" />}
-          <span className="font-medium text-sm">{`Message ${canClientStream ? index + 1 : ''}`}</span>
+          <span className="font-medium">{`Message ${canClientStream ? index + 1 : ''}`}</span>
         </div>
         <div className="flex items-center gap-2" onClick={(e) => e.stopPropagation()}>
           <ToolHint text="Format JSON with proper indentation and spacing" toolhintId={`prettify-msg-${index}`}>
@@ -186,6 +186,7 @@ const SingleGrpcMessage = ({ message, item, collection, index, methodType, isCol
                 onClick={onSend}
                 disabled={!isConnectionActive}
                 className={`p-1 rounded ${isConnectionActive ? 'hover:bg-zinc-200 dark:hover:bg-zinc-600' : 'opacity-50 cursor-not-allowed'} transition-colors`}
+                data-testid={`grpc-send-message-${index}`}
               >
                 <IconSend
                   size={16}
@@ -249,9 +250,9 @@ const GrpcBody = ({ item, collection, handleRun }) => {
   }, [body?.grpc?.length]);
 
   const toggleMessageCollapse = (index) => {
-    setCollapsedMessages(prev => {
+    setCollapsedMessages((prev) => {
       if (prev.includes(index)) {
-        return prev.filter(i => i !== index);
+        return prev.filter((i) => i !== index);
       } else {
         return [...prev, index];
       }
@@ -286,7 +287,7 @@ const GrpcBody = ({ item, collection, handleRun }) => {
               className="flex items-center justify-center gap-2 py-2 px-4 rounded-md border border-neutral-200 dark:border-neutral-800 bg-neutral-100 dark:bg-neutral-700 hover:bg-neutral-200 dark:hover:bg-neutral-600 transition-colors"
             >
               <IconPlus size={16} strokeWidth={1.5} className="text-neutral-700 dark:text-neutral-300" />
-              <span className="font-medium text-sm text-neutral-700 dark:text-neutral-300">Add First Message</span>
+              <span className="font-medium text-neutral-700 dark:text-neutral-300">Add First Message</span>
             </button>
           </ToolHint>
         </div>
@@ -299,6 +300,7 @@ const GrpcBody = ({ item, collection, handleRun }) => {
       <div
         ref={messagesContainerRef}
         id="grpc-messages-container"
+        data-testid="grpc-messages-container"
         className={`flex-1 ${body.grpc.length === 1 || !canClientSendMultipleMessages ? 'h-full' : 'overflow-y-auto'} ${canClientSendMultipleMessages && 'pb-16'}`}
       >
         {body.grpc
@@ -325,9 +327,10 @@ const GrpcBody = ({ item, collection, handleRun }) => {
             <button
               onClick={addNewMessage}
               className="add-message-btn flex items-center justify-center gap-2 py-2 px-4 rounded-md border border-neutral-200 dark:border-neutral-800 bg-neutral-100 dark:bg-neutral-700 hover:bg-neutral-200 dark:hover:bg-neutral-600 transition-colors shadow-md"
+              data-testid="grpc-add-message-button"
             >
               <IconPlus size={16} strokeWidth={1.5} className="text-neutral-700 dark:text-neutral-300" />
-              <span className="font-medium text-sm text-neutral-700 dark:text-neutral-300">Add Message</span>
+              <span className="font-medium text-neutral-700 dark:text-neutral-300">Add Message</span>
             </button>
           </ToolHint>
         </div>
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/MethodDropdown/index.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/MethodDropdown/index.js
index 8c7845ed7..924eb1e71 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/MethodDropdown/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/MethodDropdown/index.js
@@ -16,7 +16,6 @@ const MethodDropdown = ({
   onMethodSelect,
   onMethodDropdownCreate
 }) => {
-
   const [searchText, setSearchText] = useState('');
   const [focusedIndex, setFocusedIndex] = useState(-1);
   const searchInputRef = useRef();
@@ -73,7 +72,7 @@ const MethodDropdown = ({
 
   const MethodsDropdownIcon = forwardRef((props, ref) => {
     return (
-      <div ref={ref} className="flex items-center justify-center ml-2 cursor-pointer select-none">
+      <div ref={ref} className="flex items-center justify-center ml-2 cursor-pointer select-none" data-testid="grpc-method-dropdown-trigger">
         {selectedGrpcMethod && <div className="mr-2">{getIconForMethodType(selectedGrpcMethod.type)}</div>}
         <span className="text-xs">
           {selectedGrpcMethod ? (
@@ -162,7 +161,7 @@ const MethodDropdown = ({
         <div ref={listRef} className="max-h-96 overflow-y-auto w-96 min-w-60" data-testid="grpc-methods-list">
           {Object.entries(groupedMethods).map(([serviceName, methods], serviceIndex) => (
             <div key={serviceIndex} className="service-group mb-2" onKeyDown={handleKeyDown} tabIndex={0}>
-              <div className="service-header px-3 py-1 bg-neutral-100 dark:bg-neutral-800 text-sm font-medium truncate sticky top-0 z-10">
+              <div className="service-header px-3 py-1 bg-neutral-100 dark:bg-neutral-800 font-medium truncate sticky top-0 z-10">
                 {serviceName || 'Default Service'}
               </div>
               <div className="service-methods">
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/ProtoFileDropdown/index.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/ProtoFileDropdown/index.js
index 6d23f042d..5e1983e54 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/ProtoFileDropdown/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/ProtoFileDropdown/index.js
@@ -147,7 +147,7 @@ const ProtoFileDropdown = ({
         <div className="max-h-fit overflow-y-auto w-[30rem]">
           <div className="px-3 py-2 border-b border-neutral-200 dark:border-neutral-700" data-testid="grpc-mode-toggle">
             <div className="flex items-center justify-between">
-              <span className="text-sm">Mode</span>
+              <span>Mode</span>
               <div className="flex items-center gap-2">
                 <span className={`text-xs ${!isReflectionMode ? 'font-medium' : 'text-neutral-500'}`} style={{ color: !isReflectionMode ? theme.colors.text.yellow : undefined }}>
                   Proto File
@@ -203,7 +203,7 @@ const ProtoFileDropdown = ({
 
           {isReflectionMode && (
             <div className="px-3 py-2">
-              <div className="text-sm text-neutral-600 dark:text-neutral-400 mb-2">
+              <div className="text-neutral-600 dark:text-neutral-400 mb-2">
                 Using server reflection to discover gRPC methods.
               </div>
             </div>
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/StyledWrapper.js
index 64c29be51..9c69f132e 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/StyledWrapper.js
@@ -2,17 +2,19 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   height: 2.3rem;
+  border: ${(props) => props.theme.requestTabPanel.url.border};
+  border-radius: ${(props) => props.theme.border.radius.base};
 
   .method-selector-container {
     background-color: ${(props) => props.theme.requestTabPanel.url.bg};
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
+    border-top-left-radius: ${(props) => props.theme.border.radius.base};
+    border-bottom-left-radius: ${(props) => props.theme.border.radius.base};
   }
 
   .input-container {
     background-color: ${(props) => props.theme.requestTabPanel.url.bg};
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
+    border-top-right-radius: ${(props) => props.theme.border.radius.base};
+    border-bottom-right-radius: ${(props) => props.theme.border.radius.base};
 
     input {
       background-color: ${(props) => props.theme.requestTabPanel.url.bg};
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/Tabs/ImportPathsTab/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/Tabs/ImportPathsTab/StyledWrapper.js
index f7d7afefa..f2a21a891 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/Tabs/ImportPathsTab/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/Tabs/ImportPathsTab/StyledWrapper.js
@@ -13,7 +13,7 @@ const Wrapper = styled.div`
   }
 
   .header-text {
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     color: ${(props) => props.theme.grpc.importPaths.header.text};
   }
 
@@ -36,7 +36,7 @@ const Wrapper = styled.div`
     padding: 0.5rem;
     background-color: ${(props) => props.theme.grpc.importPaths.error.bg};
     border-radius: 0.25rem;
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     color: ${(props) => props.theme.grpc.importPaths.error.text};
   }
 
@@ -104,13 +104,13 @@ const Wrapper = styled.div`
   .item-text {
     display: flex;
     align-items: center;
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     white-space: nowrap;
   }
 
   .invalid-icon {
     color: ${(props) => props.theme.grpc.importPaths.item.invalid.text};
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     display: flex;
     align-items: center;
   }
@@ -121,7 +121,7 @@ const Wrapper = styled.div`
 
   .empty-text {
     color: ${(props) => props.theme.grpc.importPaths.empty.text};
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
     font-style: italic;
     text-align: center;
     padding: 0.5rem 0;
@@ -141,7 +141,7 @@ const Wrapper = styled.div`
     border: 1px solid ${(props) => props.theme.grpc.importPaths.button.border};
     padding: 0.5rem 1rem;
     border-radius: 0.25rem;
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
     cursor: pointer;
     transition: border-color 0.2s ease;
 
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/Tabs/ProtoFilesTab/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/Tabs/ProtoFilesTab/StyledWrapper.js
index 05e535f7c..f4610374c 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/Tabs/ProtoFilesTab/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/Tabs/ProtoFilesTab/StyledWrapper.js
@@ -13,7 +13,7 @@ const Wrapper = styled.div`
   }
 
   .header-text {
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     color: ${(props) => props.theme.grpc.protoFiles.header.text};
   }
 
@@ -36,7 +36,7 @@ const Wrapper = styled.div`
     padding: 0.5rem;
     background-color: ${(props) => props.theme.grpc.protoFiles.error.bg};
     border-radius: 0.25rem;
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     color: ${(props) => props.theme.grpc.protoFiles.error.text};
   }
 
@@ -110,14 +110,14 @@ const Wrapper = styled.div`
   }
 
   .item-title {
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
     display: flex;
     align-items: center;
     color: ${(props) => props.theme.grpc.protoFiles.item.text};
   }
 
   .item-path {
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     color: ${(props) => props.theme.grpc.protoFiles.item.secondaryText};
     overflow: hidden;
     text-overflow: ellipsis;
@@ -127,7 +127,7 @@ const Wrapper = styled.div`
 
   .invalid-icon {
     color: ${(props) => props.theme.grpc.protoFiles.item.invalid.text};
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     display: flex;
     align-items: center;
     margin-left: 0.5rem;
@@ -139,7 +139,7 @@ const Wrapper = styled.div`
 
   .empty-text {
     color: ${(props) => props.theme.grpc.protoFiles.empty.text};
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
     font-style: italic;
     text-align: center;
     padding: 0.5rem 0;
@@ -159,7 +159,7 @@ const Wrapper = styled.div`
     border: 1px solid ${(props) => props.theme.grpc.protoFiles.button.border};
     padding: 0.5rem 1rem;
     border-radius: 0.25rem;
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
     cursor: pointer;
     transition: border-color 0.2s ease;
 
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
index c8b7cd09b..5b2fece89 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
@@ -12,7 +12,7 @@ import {
   IconRefresh,
   IconDeviceFloppy,
   IconArrowRight,
-  IconCode,
+  IconCode
 } from '@tabler/icons';
 import toast from 'react-hot-toast';
 import {
@@ -129,11 +129,15 @@ const GrpcQueryUrl = ({ item, collection, handleRun }) => {
     setProtoFilePath('');
     setIsReflectionMode(true);
 
-    dispatch(updateRequestProtoPath({
-      protoPath: '',
-      itemUid: item.uid,
-      collectionUid: collection.uid
-    }));
+    // Only update protoPath if it was previously set (to avoid creating unnecessary draft state)
+    const currentProtoPath = getPropertyFromDraftOrRequest(item, 'request.protoPath', '');
+    if (currentProtoPath) {
+      dispatch(updateRequestProtoPath({
+        protoPath: '',
+        itemUid: item.uid,
+        collectionUid: collection.uid
+      }));
+    }
 
     if (methods && methods.length > 0) {
       toast.success(`Loaded ${methods.length} gRPC methods from reflection`);
@@ -381,7 +385,7 @@ const GrpcQueryUrl = ({ item, collection, handleRun }) => {
               strokeWidth={1.5}
               size={22}
               className={`${item.draft ? 'cursor-pointer' : 'cursor-default'}`}
-            />  
+            />
             <span className="infotip-text text-xs">
               Save <span className="shortcut">({saveShortcut})</span>
             </span>
@@ -389,19 +393,21 @@ const GrpcQueryUrl = ({ item, collection, handleRun }) => {
 
           {isConnectionActive && isStreamingMethod && (
             <div className="connection-controls relative flex items-center h-full gap-3">
-              <div className="infotip" onClick={handleCancelConnection}>
+              <div className="infotip" onClick={handleCancelConnection} data-testid="grpc-cancel-connection-button">
                 <IconX color={theme.requestTabs.icon.color} strokeWidth={1.5} size={22} className="cursor-pointer" />
                 <span className="infotip-text text-xs">Cancel</span>
               </div>
 
-            {isClientStreamingMethod && <div onClick={handleEndConnection}>
-                <IconCheck
-                  color={theme.colors.text.green}
-                  strokeWidth={2}
-                  size={22}
-                  className="cursor-pointer"
-                />
-              </div>}
+              {isClientStreamingMethod && (
+                <div onClick={handleEndConnection} data-testid="grpc-end-connection-button">
+                  <IconCheck
+                    color={theme.colors.text.green}
+                    strokeWidth={2}
+                    size={22}
+                    className="cursor-pointer"
+                  />
+                </div>
+              )}
             </div>
           )}
 
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/GrpcAuth/GrpcAuthMode/index.js b/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/GrpcAuth/GrpcAuthMode/index.js
index 9819068b3..088920f6d 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/GrpcAuth/GrpcAuthMode/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/GrpcAuth/GrpcAuthMode/index.js
@@ -66,7 +66,7 @@ const GrpcAuthMode = ({ item, collection }) => {
     dropdownTippyRef?.current?.hide();
     onModeChange(mode);
   };
-  
+
   return (
     <StyledWrapper>
       <div className="inline-flex items-center cursor-pointer auth-mode-selector">
@@ -86,4 +86,4 @@ const GrpcAuthMode = ({ item, collection }) => {
   );
 };
 
-export default GrpcAuthMode; 
\ No newline at end of file
+export default GrpcAuthMode;
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/GrpcAuth/index.js b/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/GrpcAuth/index.js
index ee1f81c06..8ce1b51fa 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/GrpcAuth/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/GrpcAuth/index.js
@@ -24,7 +24,7 @@ const GrpcAuth = ({ item, collection }) => {
   const authMode = item.draft ? get(item, 'draft.request.auth.mode') : get(item, 'request.auth.mode');
   const requestTreePath = getTreePathFromCollectionToItem(collection, item);
 
-  const request = item.draft 
+  const request = item.draft
     ? get(item, 'draft.request', {})
     : get(item, 'request', {});
 
@@ -93,7 +93,7 @@ const GrpcAuth = ({ item, collection }) => {
       }
       case 'inherit': {
         const source = getEffectiveAuthSource();
-        
+
         // Only show inherited auth if it's one of the supported types
         if (source && supportedGrpcAuthModes.includes(source.auth?.mode)) {
           return (
@@ -130,4 +130,4 @@ const GrpcAuth = ({ item, collection }) => {
   );
 };
 
-export default GrpcAuth; 
\ No newline at end of file
+export default GrpcAuth;
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/index.js
index ef961b79d..bc87963ce 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcRequestPane/index.js
@@ -30,7 +30,7 @@ const GrpcRequestPane = ({ item, collection, handleRun }) => {
   const getTabPanel = (tab) => {
     switch (tab) {
       case 'body': {
-        return <GrpcBody item={item} collection={collection} hideModeSelector={true} hidePrettifyButton={true} handleRun={handleRun}/>;
+        return <GrpcBody item={item} collection={collection} hideModeSelector={true} hidePrettifyButton={true} handleRun={handleRun} />;
       }
       case 'headers': {
         return <RequestHeaders item={item} collection={collection} addHeaderText="Add Metadata" />;
diff --git a/packages/bruno-app/src/components/RequestPane/HttpRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/HttpRequestPane/index.js
index 1ca7d39c6..a8f76ff98 100644
--- a/packages/bruno-app/src/components/RequestPane/HttpRequestPane/index.js
+++ b/packages/bruno-app/src/components/RequestPane/HttpRequestPane/index.js
@@ -99,16 +99,13 @@ const HttpRequestPane = ({ item, collection }) => {
   const tests = getPropertyFromDraftOrRequest('request.tests');
   const docs = getPropertyFromDraftOrRequest('request.docs');
   const requestVars = getPropertyFromDraftOrRequest('request.vars.req');
-  const responseVars = getPropertyFromDraftOrRequest('request.vars.res');
   const auth = getPropertyFromDraftOrRequest('request.auth');
   const tags = getPropertyFromDraftOrRequest('tags');
 
   const activeParamsLength = params.filter((param) => param.enabled).length;
   const activeHeadersLength = headers.filter((header) => header.enabled).length;
   const activeAssertionsLength = assertions.filter((assertion) => assertion.enabled).length;
-  const activeVarsLength =
-    requestVars.filter((request) => request.enabled).length +
-    responseVars.filter((response) => response.enabled).length;
+  const activeVarsLength = requestVars.filter((request) => request.enabled).length;
 
   useEffect(() => {
     if (activeParamsLength === 0 && body.mode !== 'none') {
@@ -142,9 +139,9 @@ const HttpRequestPane = ({ item, collection }) => {
         <div className={getTabClassname('script')} role="tab" onClick={() => selectTab('script')}>
           Script
           {(script.req || script.res) && (
-            item.preRequestScriptErrorMessage || item.postResponseScriptErrorMessage ?
-            <StatusDot type="error" /> :
-            <StatusDot />
+            item.preRequestScriptErrorMessage || item.postResponseScriptErrorMessage
+              ? <StatusDot type="error" />
+              : <StatusDot />
           )}
         </div>
         <div className={getTabClassname('assert')} role="tab" onClick={() => selectTab('assert')}>
@@ -154,9 +151,9 @@ const HttpRequestPane = ({ item, collection }) => {
         <div className={getTabClassname('tests')} role="tab" onClick={() => selectTab('tests')}>
           Tests
           {tests && tests.length > 0 && (
-            item.testScriptErrorMessage ?
-              <StatusDot type="error" /> :
-              <StatusDot />
+            item.testScriptErrorMessage
+              ? <StatusDot type="error" />
+              : <StatusDot />
           )}
         </div>
         <div className={getTabClassname('docs')} role="tab" onClick={() => selectTab('docs')}>
diff --git a/packages/bruno-app/src/components/RequestPane/MultipartFormParams/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/MultipartFormParams/StyledWrapper.js
index f7b6e5d13..44bf208c5 100644
--- a/packages/bruno-app/src/components/RequestPane/MultipartFormParams/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/MultipartFormParams/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -23,7 +23,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-param {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/RequestPane/MultipartFormParams/index.js b/packages/bruno-app/src/components/RequestPane/MultipartFormParams/index.js
index 790f7d5fa..9dad1dbb1 100644
--- a/packages/bruno-app/src/components/RequestPane/MultipartFormParams/index.js
+++ b/packages/bruno-app/src/components/RequestPane/MultipartFormParams/index.js
@@ -108,42 +108,64 @@ const MultipartFormParams = ({ item, collection }) => {
         <ReorderTable updateReorderedItem={handleParamDrag}>
           {params && params.length
             ? params.map((param, index) => {
-              return (
-                <tr key={param.uid} className='w-full' data-uid={param.uid}>
-                  <td className="flex relative">
-                    <input
-                      type="text"
-                      autoComplete="off"
-                      autoCorrect="off"
-                      autoCapitalize="off"
-                      spellCheck="false"
-                      value={param.name}
-                      className="mousetrap"
-                      onChange={(e) => handleParamChange(e, param, 'name')}
-                    />
-                  </td>
-                  <td>
-                    {param.type === 'file' ? (
-                      <FilePickerEditor
-                        value={param.value}
-                        onChange={(newValue) =>
-                          handleParamChange(
-                            {
-                              target: {
-                                value: newValue
-                              }
-                            },
-                            param,
-                            'value'
-                          )
-                        }
-                        collection={collection}
+                return (
+                  <tr key={param.uid} className="w-full" data-uid={param.uid}>
+                    <td className="flex relative">
+                      <input
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        value={param.name}
+                        className="mousetrap"
+                        onChange={(e) => handleParamChange(e, param, 'name')}
                       />
-                    ) : (
+                    </td>
+                    <td>
+                      {param.type === 'file' ? (
+                        <FilePickerEditor
+                          value={param.value}
+                          onChange={(newValue) =>
+                            handleParamChange(
+                              {
+                                target: {
+                                  value: newValue
+                                }
+                              },
+                              param,
+                              'value'
+                            )}
+                          collection={collection}
+                        />
+                      ) : (
+                        <MultiLineEditor
+                          onSave={onSave}
+                          theme={storedTheme}
+                          value={param.value}
+                          onChange={(newValue) =>
+                            handleParamChange(
+                              {
+                                target: {
+                                  value: newValue
+                                }
+                              },
+                              param,
+                              'value'
+                            )}
+                          onRun={handleRun}
+                          allowNewlines={true}
+                          collection={collection}
+                          item={item}
+                        />
+                      )}
+                    </td>
+                    <td>
                       <MultiLineEditor
                         onSave={onSave}
                         theme={storedTheme}
-                        value={param.value}
+                        placeholder="Auto"
+                        value={param.contentType}
                         onChange={(newValue) =>
                           handleParamChange(
                             {
@@ -152,54 +174,29 @@ const MultipartFormParams = ({ item, collection }) => {
                               }
                             },
                             param,
-                            'value'
-                          )
-                        }
+                            'contentType'
+                          )}
                         onRun={handleRun}
-                        allowNewlines={true}
                         collection={collection}
-                        item={item}
                       />
-                    )}
-                  </td>
-                  <td>
-                    <MultiLineEditor
-                      onSave={onSave}
-                      theme={storedTheme}
-                      placeholder="Auto"
-                      value={param.contentType}
-                      onChange={(newValue) =>
-                        handleParamChange(
-                          {
-                            target: {
-                              value: newValue
-                            }
-                          },
-                          param,
-                          'contentType'
-                        )
-                      }
-                      onRun={handleRun}
-                      collection={collection}
-                    />
-                  </td>
-                  <td>
-                    <div className="flex items-center">
-                      <input
-                        type="checkbox"
-                        checked={param.enabled}
-                        tabIndex="-1"
-                        className="mr-3 mousetrap"
-                        onChange={(e) => handleParamChange(e, param, 'enabled')}
-                      />
-                      <button tabIndex="-1" onClick={() => handleRemoveParams(param)}>
-                        <IconTrash strokeWidth={1.5} size={20} />
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-              );
-            })
+                    </td>
+                    <td>
+                      <div className="flex items-center">
+                        <input
+                          type="checkbox"
+                          checked={param.enabled}
+                          tabIndex="-1"
+                          className="mr-3 mousetrap"
+                          onChange={(e) => handleParamChange(e, param, 'enabled')}
+                        />
+                        <button tabIndex="-1" onClick={() => handleRemoveParams(param)}>
+                          <IconTrash strokeWidth={1.5} size={20} />
+                        </button>
+                      </div>
+                    </td>
+                  </tr>
+                );
+              })
             : null}
         </ReorderTable>
       </Table>
diff --git a/packages/bruno-app/src/components/RequestPane/PromptVariables/PromptVariablesModal/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/PromptVariables/PromptVariablesModal/StyledWrapper.js
new file mode 100644
index 000000000..524909f3d
--- /dev/null
+++ b/packages/bruno-app/src/components/RequestPane/PromptVariables/PromptVariablesModal/StyledWrapper.js
@@ -0,0 +1,9 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  max-height: 60vh;
+  overflow-y: auto;
+  padding: 0 0.2rem;
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/RequestPane/PromptVariables/PromptVariablesModal/index.js b/packages/bruno-app/src/components/RequestPane/PromptVariables/PromptVariablesModal/index.js
new file mode 100644
index 000000000..486ab8d4a
--- /dev/null
+++ b/packages/bruno-app/src/components/RequestPane/PromptVariables/PromptVariablesModal/index.js
@@ -0,0 +1,56 @@
+import React, { useState } from 'react';
+import Portal from 'components/Portal';
+import Modal from 'components/Modal';
+import StyledWrapper from './StyledWrapper';
+import { IconAlertTriangle } from '@tabler/icons';
+
+export default function PromptVariablesModal({ title = 'Input Required', prompts, onSubmit, onCancel }) {
+  const [values, setValues] = useState({});
+
+  const handleChange = (prompt, value) => {
+    setValues((prev) => ({ ...prev, [prompt]: value }));
+  };
+
+  if (!prompts?.length) {
+    return null;
+  }
+
+  return (
+    <Portal>
+      <Modal
+        size="lg"
+        title={title}
+        confirmText="Continue"
+        cancelText="Cancel"
+        handleConfirm={() => onSubmit(values)}
+        handleCancel={onCancel}
+      >
+        <StyledWrapper data-testid="prompt-variables-modal-content">
+          <div className="space-y-5 mt-2">
+            {prompts.map((prompt, index) => (
+              <div key={prompt} data-testid="prompt-variable-input-container">
+                <label htmlFor={`prompt-${index}`} className="block font-medium">
+                  {prompt}
+                </label>
+                <input
+                  id={`prompt-${index}`}
+                  type="text"
+                  data-testid={`prompt-variable-input-${index}`}
+                  className="textbox mt-2 w-full"
+                  placeholder="Enter value"
+                  value={values[prompt] || ''}
+                  onChange={(e) => handleChange(prompt, e.target.value)}
+                  autoFocus={index === 0}
+                  autoComplete="off"
+                  autoCorrect="off"
+                  autoCapitalize="off"
+                  spellCheck="false"
+                />
+              </div>
+            ))}
+          </div>
+        </StyledWrapper>
+      </Modal>
+    </Portal>
+  );
+}
diff --git a/packages/bruno-app/src/components/RequestPane/QueryEditor/index.js b/packages/bruno-app/src/components/RequestPane/QueryEditor/index.js
index decc7bd1d..ddb359109 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryEditor/index.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryEditor/index.js
@@ -17,6 +17,7 @@ import StyledWrapper from './StyledWrapper';
 import { IconWand } from '@tabler/icons';
 
 import onHasCompletion from './onHasCompletion';
+import { setupLinkAware } from 'utils/codemirror/linkAware';
 
 const CodeMirror = require('codemirror');
 
@@ -138,6 +139,8 @@ export default class QueryEditor extends React.Component {
       editor.on('beforeChange', this._onBeforeChange);
     }
     this.addOverlay();
+
+    setupLinkAware(editor);
   }
 
   componentDidUpdate(prevProps) {
@@ -170,6 +173,9 @@ export default class QueryEditor extends React.Component {
 
   componentWillUnmount() {
     if (this.editor) {
+      if (this.editor?._destroyLinkAware) {
+        this.editor._destroyLinkAware();
+      }
       this.editor.off('change', this._onEdit);
       this.editor.off('keyup', this._onKeyUp);
       this.editor.off('hasCompletion', this._onHasCompletion);
diff --git a/packages/bruno-app/src/components/RequestPane/QueryEditor/onHasCompletion.js b/packages/bruno-app/src/components/RequestPane/QueryEditor/onHasCompletion.js
index 080a4cfba..5b3746b58 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryEditor/onHasCompletion.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryEditor/onHasCompletion.js
@@ -59,10 +59,10 @@ export default function onHasCompletion(_cm, data, onHintInformationRender) {
     const description = ctx.description ? md.render(ctx.description) : 'Self descriptive.';
     const type = ctx.type ? '<span className="infoType">' + renderType(ctx.type) + '</span>' : '';
 
-    information.innerHTML =
-      '<div className="content">' +
-      (description.slice(0, 3) === '<p>' ? '<p>' + type + description.slice(3) : type + description) +
-      '</div>';
+    information.innerHTML
+      = '<div className="content">'
+        + (description.slice(0, 3) === '<p>' ? '<p>' + type + description.slice(3) : type + description)
+        + '</div>';
 
     if (ctx && deprecation && ctx.deprecationReason) {
       const reason = ctx.deprecationReason ? md.render(ctx.deprecationReason) : '';
diff --git a/packages/bruno-app/src/components/RequestPane/QueryParams/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/QueryParams/StyledWrapper.js
index 9a23f2f9c..618575a97 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryParams/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryParams/StyledWrapper.js
@@ -7,7 +7,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -17,7 +17,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -32,7 +32,7 @@ const Wrapper = styled.div`
   }
 
   .btn-action {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
     &:hover span {
       text-decoration: underline;
     }
diff --git a/packages/bruno-app/src/components/RequestPane/QueryParams/index.js b/packages/bruno-app/src/components/RequestPane/QueryParams/index.js
index b5c2c69a7..f02ec98d0 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryParams/index.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryParams/index.js
@@ -13,7 +13,7 @@ import {
   updatePathParam,
   setQueryParams
 } from 'providers/ReduxStore/slices/collections';
-import SingleLineEditor from 'components/SingleLineEditor';
+import MultiLineEditor from 'components/MultiLineEditor';
 import { saveRequest, sendRequest } from 'providers/ReduxStore/slices/collections/actions';
 
 import StyledWrapper from './StyledWrapper';
@@ -27,7 +27,7 @@ const QueryParams = ({ item, collection }) => {
   const params = item.draft ? get(item, 'draft.request.params') : get(item, 'request.params');
   const queryParams = params.filter((param) => param.type === 'query');
   const pathParams = params.filter((param) => param.type === 'path');
-  
+
   const [isBulkEditMode, setIsBulkEditMode] = useState(false);
 
   const handleAddQueryParam = () => {
@@ -168,13 +168,14 @@ const QueryParams = ({ item, collection }) => {
                       />
                     </td>
                     <td>
-                      <SingleLineEditor
+                      <MultiLineEditor
                         value={param.value}
                         theme={storedTheme}
                         onSave={onSave}
                         onChange={(newValue) => handleQueryParamChange({ target: { value: newValue } }, param, 'value')}
                         onRun={handleRun}
                         collection={collection}
+                        item={item}
                         variablesAutocomplete={true}
                       />
                     </td>
@@ -212,7 +213,7 @@ const QueryParams = ({ item, collection }) => {
             <div>
               Path variables are automatically added whenever the
               <code className="font-mono mx-2">:name</code>
-              template is used in the URL. <br/> For example:
+              template is used in the URL. <br /> For example:
               <code className="font-mono mx-2">
                 https://example.com/v1/users/<span>:id</span>
               </code>
@@ -244,7 +245,7 @@ const QueryParams = ({ item, collection }) => {
                         />
                       </td>
                       <td>
-                        <SingleLineEditor
+                        <MultiLineEditor
                           value={path.value}
                           theme={storedTheme}
                           onSave={onSave}
@@ -256,8 +257,7 @@ const QueryParams = ({ item, collection }) => {
                                 }
                               },
                               path
-                            )
-                          }
+                            )}
                           onRun={handleRun}
                           collection={collection}
                           item={item}
diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/StyledWrapper.js
index c649f740f..f96403125 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
 
   .dropdown {
     width: 100%;
diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.js
index 67e9a42dd..19ffc9339 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.js
@@ -3,7 +3,7 @@ import { IconCaretDown } from '@tabler/icons';
 import Dropdown from 'components/Dropdown';
 import StyledWrapper from './StyledWrapper';
 
-const STANDARD_METHODS = Object.freeze(['GET','POST','PUT','DELETE','PATCH','OPTIONS','HEAD','TRACE','CONNECT']);
+const STANDARD_METHODS = Object.freeze(['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT']);
 
 const KEY = Object.freeze({ ENTER: 'Enter', ESCAPE: 'Escape' });
 
@@ -27,7 +27,7 @@ const Icon = forwardRef(function IconComponent(
         <input
           ref={inputRef}
           type="text"
-          className="font-medium px-2 w-full focus:bg-transparent"
+          className="px-2 w-full focus:bg-transparent"
           value={inputValue}
           onChange={handleInputChange}
           onBlur={handleBlur}
@@ -46,7 +46,7 @@ const Icon = forwardRef(function IconComponent(
         className="cursor-pointer flex items-center text-left w-full"
       >
         <span
-          className="font-medium px-2 truncate method-span"
+          className="px-2 truncate method-span"
           id="create-new-request-method"
           title={inputValue}
         >
@@ -62,7 +62,7 @@ const HttpMethodSelector = ({ method = DEFAULT_METHOD, onMethodSelect }) => {
   const [isCustomMode, setIsCustomMode] = useState(false);
   const dropdownTippyRef = useRef();
   const inputRef = useRef();
-  
+
   const blurInput = () => inputRef.current?.blur();
 
   const handleInputChange = (e) => {
@@ -85,7 +85,7 @@ const HttpMethodSelector = ({ method = DEFAULT_METHOD, onMethodSelect }) => {
     setIsCustomMode(true);
     onMethodSelect('');
     dropdownTippyRef.current?.hide();
-    
+
     setTimeout(() => {
       inputRef.current?.focus();
       inputRef.current?.select();
@@ -117,7 +117,7 @@ const HttpMethodSelector = ({ method = DEFAULT_METHOD, onMethodSelect }) => {
       <div className="flex method-selector">
         <Dropdown
           onCreate={onDropdownCreate}
-          icon={
+          icon={(
             <Icon
               isCustomMode={isCustomMode}
               inputValue={method}
@@ -126,7 +126,7 @@ const HttpMethodSelector = ({ method = DEFAULT_METHOD, onMethodSelect }) => {
               handleKeyDown={handleKeyDown}
               inputRef={inputRef}
             />
-          }
+          )}
           placement="bottom-start"
         >
           <div>
diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.spec.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.spec.js
index 568284dfd..5431dce23 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.spec.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.spec.js
@@ -24,7 +24,7 @@ describe('HttpMethodSelector', () => {
   describe('Initial Render', () => {
     it('should render with default GET method when no method prop is provided', () => {
       renderWithTheme(<HttpMethodSelector onMethodSelect={mockOnMethodSelect} />);
-      
+
       const methodSpan = screen.getByText('GET');
       expect(methodSpan).toBeInTheDocument();
       expect(methodSpan).toHaveClass('method-span');
@@ -33,7 +33,7 @@ describe('HttpMethodSelector', () => {
 
     it('should render with a standard method when method prop is provided', () => {
       renderWithTheme(<HttpMethodSelector method="POST" onMethodSelect={mockOnMethodSelect} />);
-      
+
       const methodSpan = screen.getByText('POST');
       expect(methodSpan).toBeInTheDocument();
       expect(methodSpan).toHaveAttribute('title', 'POST');
@@ -41,7 +41,7 @@ describe('HttpMethodSelector', () => {
 
     it('should render with a custom method when method prop is provided', () => {
       renderWithTheme(<HttpMethodSelector method="CUSTOM" onMethodSelect={mockOnMethodSelect} />);
-      
+
       const methodSpan = screen.getByText('CUSTOM');
       expect(methodSpan).toBeInTheDocument();
       expect(methodSpan).toHaveAttribute('title', 'CUSTOM');
@@ -51,18 +51,18 @@ describe('HttpMethodSelector', () => {
   describe('Dropdown Interaction', () => {
     it('should display all standard HTTP methods in dropdown when clicked', async () => {
       renderWithTheme(<HttpMethodSelector onMethodSelect={mockOnMethodSelect} />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const standardMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT'];
         const dropdownItems = screen.getAllByText((content, element) => {
           return element?.classList.contains('dropdown-item');
         });
-        const renderedMethods = dropdownItems.map(item => item.textContent);
-        
-        standardMethods.forEach(method => {
+        const renderedMethods = dropdownItems.map((item) => item.textContent);
+
+        standardMethods.forEach((method) => {
           expect(renderedMethods).toContain(method);
         });
       });
@@ -70,10 +70,10 @@ describe('HttpMethodSelector', () => {
 
     it('should display "Add Custom" option in dropdown', async () => {
       renderWithTheme(<HttpMethodSelector onMethodSelect={mockOnMethodSelect} />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const addCustomSpan = screen.getByText('+ Add Custom');
         expect(addCustomSpan).toBeInTheDocument();
@@ -83,15 +83,15 @@ describe('HttpMethodSelector', () => {
 
     it('should call onMethodSelect when a standard method is clicked', async () => {
       renderWithTheme(<HttpMethodSelector onMethodSelect={mockOnMethodSelect} />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const postMethod = screen.getByText('POST');
         fireEvent.click(postMethod);
       });
-      
+
       expect(mockOnMethodSelect).toHaveBeenCalledWith('POST');
     });
   });
@@ -99,17 +99,17 @@ describe('HttpMethodSelector', () => {
   describe('Custom Method Mode', () => {
     it('should enter custom mode when "Add Custom" is clicked', async () => {
       renderWithTheme(<HttpMethodSelector onMethodSelect={mockOnMethodSelect} />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const addCustom = screen.getByText('+ Add Custom');
         fireEvent.click(addCustom);
       });
-      
+
       expect(mockOnMethodSelect).toHaveBeenCalledWith('');
-      
+
       // Should show input field
       await waitFor(() => {
         const input = screen.getByRole('textbox');
@@ -120,37 +120,37 @@ describe('HttpMethodSelector', () => {
 
     it('should call onMethodSelect with uppercase value when typing in custom input', async () => {
       const user = userEvent.setup();
-      
+
       // Create a wrapper component that manages the method state
       const TestWrapper = () => {
         const [method, setMethod] = React.useState('GET');
-        
+
         const handleMethodSelect = (newMethod) => {
           mockOnMethodSelect(newMethod);
           setMethod(newMethod);
         };
-        
+
         return (
-          <HttpMethodSelector 
-            method={method} 
-            onMethodSelect={handleMethodSelect} 
+          <HttpMethodSelector
+            method={method}
+            onMethodSelect={handleMethodSelect}
           />
         );
       };
-      
+
       renderWithTheme(<TestWrapper />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const addCustom = screen.getByText('+ Add Custom');
         fireEvent.click(addCustom);
       });
-      
+
       const input = await screen.findByRole('textbox');
       await user.type(input, 'custom');
-      
+
       expect(mockOnMethodSelect).toHaveBeenCalledWith('');
       expect(mockOnMethodSelect).toHaveBeenCalledWith('C');
       expect(mockOnMethodSelect).toHaveBeenCalledWith('CU');
@@ -163,21 +163,21 @@ describe('HttpMethodSelector', () => {
 
     it('should exit custom mode and set method on Enter key', async () => {
       renderWithTheme(<HttpMethodSelector onMethodSelect={mockOnMethodSelect} />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const addCustom = screen.getByText('+ Add Custom');
         fireEvent.click(addCustom);
       });
-      
+
       const input = await screen.findByRole('textbox');
       fireEvent.change(input, { target: { value: 'CUSTOM' } });
       fireEvent.keyDown(input, { key: 'Enter' });
-      
+
       expect(mockOnMethodSelect).toHaveBeenCalledWith('CUSTOM');
-      
+
       // Should exit custom mode
       await waitFor(() => {
         expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
@@ -186,36 +186,36 @@ describe('HttpMethodSelector', () => {
 
     it('should set default method on Enter key with empty input', async () => {
       renderWithTheme(<HttpMethodSelector onMethodSelect={mockOnMethodSelect} />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const addCustom = screen.getByText('+ Add Custom');
         fireEvent.click(addCustom);
       });
-      
+
       const input = await screen.findByRole('textbox');
       fireEvent.keyDown(input, { key: 'Enter' });
-      
+
       expect(mockOnMethodSelect).toHaveBeenCalledWith('GET');
     });
 
     it('should exit custom mode on Escape key and keep the custom method', async () => {
       renderWithTheme(<HttpMethodSelector method="POST" onMethodSelect={mockOnMethodSelect} />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const addCustom = screen.getByText('+ Add Custom');
         fireEvent.click(addCustom);
       });
-      
+
       const input = await screen.findByRole('textbox');
       fireEvent.change(input, { target: { value: 'CUSTOM' } });
       fireEvent.keyDown(input, { key: 'Escape' });
-      
+
       // Should exit custom mode and onMethodSelect should be called with custom method
       await waitFor(() => {
         expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
@@ -225,19 +225,19 @@ describe('HttpMethodSelector', () => {
 
     it('should exit custom mode on blur and keep the custom method', async () => {
       renderWithTheme(<HttpMethodSelector onMethodSelect={mockOnMethodSelect} />);
-      
+
       const button = screen.getByRole('button');
       fireEvent.click(button);
-      
+
       await waitFor(() => {
         const addCustom = screen.getByText('+ Add Custom');
         fireEvent.click(addCustom);
       });
-      
+
       const input = await screen.findByRole('textbox');
       fireEvent.change(input, { target: { value: 'CUSTOM' } });
       fireEvent.blur(input);
-      
+
       // Should exit custom mode and onMethodSelect should be called with custom method
       await waitFor(() => {
         expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
@@ -245,4 +245,4 @@ describe('HttpMethodSelector', () => {
       });
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/StyledWrapper.js
index cca562025..4930d51c7 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryUrl/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/StyledWrapper.js
@@ -2,17 +2,19 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   height: 2.3rem;
+  border: ${(props) => props.theme.requestTabPanel.url.border};
+  border-radius: ${(props) => props.theme.border.radius.base};
 
   div.method-selector-container {
     background-color: ${(props) => props.theme.requestTabPanel.url.bg};
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
+    border-top-left-radius: ${(props) => props.theme.border.radius.base};
+    border-bottom-left-radius: ${(props) => props.theme.border.radius.base};
   }
 
   div.input-container {
     background-color: ${(props) => props.theme.requestTabPanel.url.bg};
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
+    border-top-right-radius: ${(props) => props.theme.border.radius.base};
+    border-bottom-right-radius: ${(props) => props.theme.border.radius.base};
 
     input {
       background-color: ${(props) => props.theme.requestTabPanel.url.bg};
diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
index bcfd07f24..0814a7418 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
@@ -2,10 +2,10 @@ import React, { useState, useEffect, useRef, useMemo } from 'react';
 import get from 'lodash/get';
 import { useDispatch } from 'react-redux';
 import { requestUrlChanged, updateRequestMethod } from 'providers/ReduxStore/slices/collections';
-import { saveRequest } from 'providers/ReduxStore/slices/collections/actions';
+import { cancelRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
 import HttpMethodSelector from './HttpMethodSelector';
 import { useTheme } from 'providers/Theme';
-import { IconDeviceFloppy, IconArrowRight, IconCode } from '@tabler/icons';
+import { IconDeviceFloppy, IconArrowRight, IconCode, IconSquareRoundedX } from '@tabler/icons';
 import SingleLineEditor from 'components/SingleLineEditor';
 import { isMacOS } from 'utils/common/platform';
 import { hasRequestChanges } from 'utils/collections';
@@ -22,6 +22,7 @@ const QueryUrl = ({ item, collection, handleRun }) => {
   const saveShortcut = isMac ? 'Cmd + S' : 'Ctrl + S';
   const editorRef = useRef(null);
   const isGrpc = item.type === 'grpc-request';
+  const isLoading = ['queued', 'sending'].includes(item.requestState);
 
   const [methodSelectorWidth, setMethodSelectorWidth] = useState(90);
   const [generateCodeItemModalOpen, setGenerateCodeItemModalOpen] = useState(false);
@@ -32,7 +33,7 @@ const QueryUrl = ({ item, collection, handleRun }) => {
     setMethodSelectorWidth(el.offsetWidth);
   }, [method]);
 
-  const onSave = (finalValue) => {
+  const onSave = () => {
     dispatch(saveRequest(item.uid, collection.uid));
   };
 
@@ -40,9 +41,9 @@ const QueryUrl = ({ item, collection, handleRun }) => {
     if (!editorRef.current?.editor) return;
     const editor = editorRef.current.editor;
     const cursor = editor.getCursor();
-  
+
     const finalUrl = value?.trim() ?? value;
-  
+
     dispatch(
       requestUrlChanged({
         itemUid: item.uid,
@@ -50,7 +51,7 @@ const QueryUrl = ({ item, collection, handleRun }) => {
         url: finalUrl
       })
     );
-  
+
     // Restore cursor position only if URL was trimmed
     if (finalUrl !== value) {
       setTimeout(() => {
@@ -80,6 +81,12 @@ const QueryUrl = ({ item, collection, handleRun }) => {
     }
   };
 
+  const handleCancelRequest = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    dispatch(cancelRequest(item.cancelTokenUid, item, collection));
+  };
+
   return (
     <StyledWrapper className="flex items-center">
       <div className="flex flex-1 items-center h-full method-selector-container">
@@ -87,7 +94,6 @@ const QueryUrl = ({ item, collection, handleRun }) => {
           <div className="flex items-center justify-center h-full w-16">
             <span className="text-xs text-indigo-500 font-bold">gRPC</span>
           </div>
-          
         ) : (
           <HttpMethodSelector method={method} onMethodSelect={onMethodSelect} />
         )}
@@ -111,6 +117,7 @@ const QueryUrl = ({ item, collection, handleRun }) => {
           collection={collection}
           highlightPathParams={true}
           item={item}
+          showNewlineArrow={true}
         />
         <div className="flex items-center h-full mr-2 cursor-pointer" id="send-request" onClick={handleRun}>
           <div
@@ -120,15 +127,8 @@ const QueryUrl = ({ item, collection, handleRun }) => {
               handleGenerateCode(e);
             }}
           >
-            <IconCode
-              color={theme.requestTabs.icon.color}
-              strokeWidth={1.5}
-              size={22}
-              className={'cursor-pointer'}
-            />
-            <span className="infotiptext text-xs">
-              Generate Code
-            </span>
+            <IconCode color={theme.requestTabs.icon.color} strokeWidth={1.5} size={22} className="cursor-pointer" />
+            <span className="infotiptext text-xs">Generate Code</span>
           </div>
           <div
             title="Save Request"
@@ -149,11 +149,30 @@ const QueryUrl = ({ item, collection, handleRun }) => {
               Save <span className="shortcut">({saveShortcut})</span>
             </span>
           </div>
-          <IconArrowRight color={theme.requestTabPanel.url.icon} strokeWidth={1.5} size={22} data-testid="send-arrow-icon" />
+          {isLoading || item.response?.stream?.running ? (
+            <IconSquareRoundedX
+              color={theme.requestTabPanel.url.iconDanger}
+              strokeWidth={1.5}
+              size={22}
+              data-testid="cancel-request-icon"
+              onClick={handleCancelRequest}
+            />
+          ) : (
+            <IconArrowRight
+              color={theme.requestTabPanel.url.icon}
+              strokeWidth={1.5}
+              size={22}
+              data-testid="send-arrow-icon"
+            />
+          )}
         </div>
       </div>
       {generateCodeItemModalOpen && (
-        <GenerateCodeItem collectionUid={collection.uid} item={item} onClose={() => setGenerateCodeItemModalOpen(false)} />
+        <GenerateCodeItem
+          collectionUid={collection.uid}
+          item={item}
+          onClose={() => setGenerateCodeItemModalOpen(false)}
+        />
       )}
     </StyledWrapper>
   );
diff --git a/packages/bruno-app/src/components/RequestPane/RequestBody/RequestBodyMode/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/RequestBody/RequestBodyMode/StyledWrapper.js
index 3d571b4bf..983ab3cf7 100644
--- a/packages/bruno-app/src/components/RequestPane/RequestBody/RequestBodyMode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/RequestBody/RequestBodyMode/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
 
   .body-mode-selector {
     background: transparent;
diff --git a/packages/bruno-app/src/components/RequestPane/RequestBody/RequestBodyMode/index.js b/packages/bruno-app/src/components/RequestPane/RequestBody/RequestBodyMode/index.js
index e8240efc8..907ab7b03 100644
--- a/packages/bruno-app/src/components/RequestPane/RequestBody/RequestBodyMode/index.js
+++ b/packages/bruno-app/src/components/RequestPane/RequestBody/RequestBodyMode/index.js
@@ -1,6 +1,15 @@
 import React, { useRef, forwardRef } from 'react';
 import get from 'lodash/get';
-import { IconCaretDown } from '@tabler/icons';
+import {
+  IconCaretDown,
+  IconForms,
+  IconBraces,
+  IconCode,
+  IconFileText,
+  IconDatabase,
+  IconFile,
+  IconX
+} from '@tabler/icons';
 import Dropdown from 'components/Dropdown';
 import { useDispatch } from 'react-redux';
 import { updateRequestBodyMode } from 'providers/ReduxStore/slices/collections';
@@ -70,81 +79,105 @@ const RequestBodyMode = ({ item, collection }) => {
     <StyledWrapper>
       <div className="inline-flex items-center cursor-pointer body-mode-selector">
         <Dropdown onCreate={onDropdownCreate} icon={<Icon />} placement="bottom-end">
-        <div className="label-item font-medium">Form</div>
-        <div
-          className="dropdown-item"
-          onClick={() => {
-            dropdownTippyRef.current.hide();
-            onModeChange('multipartForm');
-          }}
-        >
-          Multipart Form
-        </div>
-        <div
-          className="dropdown-item"
-          onClick={() => {
-            dropdownTippyRef.current.hide();
-            onModeChange('formUrlEncoded');
-          }}
-        >
-          Form URL Encoded
-        </div>
-        <div className="label-item font-medium">Raw</div>
-        <div
-          className="dropdown-item"
-          onClick={() => {
-            dropdownTippyRef.current.hide();
-            onModeChange('json');
-          }}
-        >
-          JSON
-        </div>
-        <div
-          className="dropdown-item"
-          onClick={() => {
-            dropdownTippyRef.current.hide();
-            onModeChange('xml');
-          }}
-        >
-          XML
-        </div>
-        <div
-          className="dropdown-item"
-          onClick={() => {
-            dropdownTippyRef.current.hide();
-            onModeChange('text');
-          }}
-        >
-          TEXT
-        </div>
-        <div
-          className="dropdown-item"
-          onClick={() => {
-            dropdownTippyRef.current.hide();
-            onModeChange('sparql');
-          }}
-        >
-          SPARQL
-        </div>
-        <div className="label-item font-medium">Other</div>
-        <div
-          className="dropdown-item"
-          onClick={() => {
-            dropdownTippyRef.current.hide();
-            onModeChange('file');
-          }}
-        >
-          File / Binary
-        </div>
-        <div
-          className="dropdown-item"
-          onClick={() => {
-            dropdownTippyRef.current.hide();
-            onModeChange('none');
-          }}
-        >
-          No Body
-        </div>
+          <div className="label-item">Form</div>
+          <div
+            className="dropdown-item"
+            onClick={() => {
+              dropdownTippyRef.current.hide();
+              onModeChange('multipartForm');
+            }}
+          >
+            <span className="dropdown-icon">
+              <IconForms size={16} strokeWidth={2} />
+            </span>
+            Multipart Form
+          </div>
+          <div
+            className="dropdown-item"
+            onClick={() => {
+              dropdownTippyRef.current.hide();
+              onModeChange('formUrlEncoded');
+            }}
+          >
+            <span className="dropdown-icon">
+              <IconForms size={16} strokeWidth={2} />
+            </span>
+            Form URL Encoded
+          </div>
+          <div className="label-item">Raw</div>
+          <div
+            className="dropdown-item"
+            onClick={() => {
+              dropdownTippyRef.current.hide();
+              onModeChange('json');
+            }}
+          >
+            <span className="dropdown-icon">
+              <IconBraces size={16} strokeWidth={2} />
+            </span>
+            JSON
+          </div>
+          <div
+            className="dropdown-item"
+            onClick={() => {
+              dropdownTippyRef.current.hide();
+              onModeChange('xml');
+            }}
+          >
+            <span className="dropdown-icon">
+              <IconCode size={16} strokeWidth={2} />
+            </span>
+            XML
+          </div>
+          <div
+            className="dropdown-item"
+            onClick={() => {
+              dropdownTippyRef.current.hide();
+              onModeChange('text');
+            }}
+          >
+            <span className="dropdown-icon">
+              <IconFileText size={16} strokeWidth={2} />
+            </span>
+            TEXT
+          </div>
+          <div
+            className="dropdown-item"
+            onClick={() => {
+              dropdownTippyRef.current.hide();
+              onModeChange('sparql');
+            }}
+          >
+            <span className="dropdown-icon">
+              <IconDatabase size={16} strokeWidth={2} />
+            </span>
+            SPARQL
+          </div>
+          <div className="label-item">Other</div>
+          <div
+            className="dropdown-item"
+            onClick={() => {
+              dropdownTippyRef.current.hide();
+              onModeChange('file');
+            }}
+          >
+            <span className="dropdown-icon">
+              <IconFile size={16} strokeWidth={2} />
+            </span>
+            File / Binary
+          </div>
+          <div
+            className="dropdown-item"
+            onClick={() => {
+              dropdownTippyRef.current.hide();
+              onModeChange('none');
+            }}
+          >
+            <span className="dropdown-icon">
+              <IconX size={16} strokeWidth={2} />
+            </span>
+            No Body
+          </div>
         </Dropdown>
       </div>
       {(bodyMode === 'json' || bodyMode === 'xml') && (
diff --git a/packages/bruno-app/src/components/RequestPane/RequestBody/index.js b/packages/bruno-app/src/components/RequestPane/RequestBody/index.js
index fdc674ae6..d562684e5 100644
--- a/packages/bruno-app/src/components/RequestPane/RequestBody/index.js
+++ b/packages/bruno-app/src/components/RequestPane/RequestBody/index.js
@@ -79,4 +79,4 @@ const RequestBody = ({ item, collection }) => {
 
   return <StyledWrapper className="w-full">No Body</StyledWrapper>;
 };
-export default RequestBody;
\ No newline at end of file
+export default RequestBody;
diff --git a/packages/bruno-app/src/components/RequestPane/RequestHeaders/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/RequestHeaders/StyledWrapper.js
index 86cb4e365..8a47eb68e 100644
--- a/packages/bruno-app/src/components/RequestPane/RequestHeaders/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/RequestHeaders/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -23,7 +23,7 @@ const Wrapper = styled.div`
   }
 
   .btn-action {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
     &:hover span {
       text-decoration: underline;
     }
diff --git a/packages/bruno-app/src/components/RequestPane/RequestHeaders/index.js b/packages/bruno-app/src/components/RequestPane/RequestHeaders/index.js
index 930a056f9..82f1ffb48 100644
--- a/packages/bruno-app/src/components/RequestPane/RequestHeaders/index.js
+++ b/packages/bruno-app/src/components/RequestPane/RequestHeaders/index.js
@@ -20,7 +20,7 @@ const RequestHeaders = ({ item, collection, addHeaderText }) => {
   const dispatch = useDispatch();
   const { storedTheme } = useTheme();
   const headers = item.draft ? get(item, 'draft.request.headers') : get(item, 'request.headers');
-  
+
   const [isBulkEditMode, setIsBulkEditMode] = useState(false);
 
   const addHeader = () => {
@@ -36,9 +36,11 @@ const RequestHeaders = ({ item, collection, addHeaderText }) => {
   const handleRun = () => dispatch(sendRequest(item, collection.uid));
   const handleHeaderValueChange = (e, _header, type) => {
     const header = cloneDeep(_header);
+
     switch (type) {
       case 'name': {
-        header.name = e.target.value;
+        // Strip newlines from header keys
+        header.name = e.target.value.replace(/[\r\n]/g, '');
         break;
       }
       case 'value': {
@@ -50,6 +52,7 @@ const RequestHeaders = ({ item, collection, addHeaderText }) => {
         break;
       }
     }
+
     dispatch(
       updateRequestHeader({
         header: header,
@@ -69,15 +72,15 @@ const RequestHeaders = ({ item, collection, addHeaderText }) => {
     );
   };
 
-    const handleHeaderDrag = ({ updateReorderedItem }) => {
-      dispatch(
-        moveRequestHeader({
-          collectionUid: collection.uid,
-          itemUid: item.uid,
-          updateReorderedItem
-        })
-      );
-    };
+  const handleHeaderDrag = ({ updateReorderedItem }) => {
+    dispatch(
+      moveRequestHeader({
+        collectionUid: collection.uid,
+        itemUid: item.uid,
+        updateReorderedItem
+      })
+    );
+  };
 
   const toggleBulkEditMode = () => {
     setIsBulkEditMode(!isBulkEditMode);
@@ -111,11 +114,11 @@ const RequestHeaders = ({ item, collection, addHeaderText }) => {
         ]}
       >
         <ReorderTable updateReorderedItem={handleHeaderDrag}>
-        {headers && headers.length
+          {headers && headers.length
             ? headers.map((header) => {
                 return (
                   <tr key={header.uid} data-uid={header.uid}>
-                    <td className='flex relative'>
+                    <td className="flex relative">
                       <SingleLineEditor
                         value={header.name}
                         theme={storedTheme}
@@ -129,8 +132,7 @@ const RequestHeaders = ({ item, collection, addHeaderText }) => {
                             },
                             header,
                             'name'
-                          )
-                        }
+                          )}
                         autocomplete={headerAutoCompleteList}
                         onRun={handleRun}
                         collection={collection}
@@ -150,11 +152,9 @@ const RequestHeaders = ({ item, collection, addHeaderText }) => {
                             },
                             header,
                             'value'
-                          )
-                        }
+                          )}
                         onRun={handleRun}
                         autocomplete={MimeTypes}
-                        allowNewlines={true}
                         collection={collection}
                         item={item}
                       />
diff --git a/packages/bruno-app/src/components/RequestPane/Settings/Tags/index.js b/packages/bruno-app/src/components/RequestPane/Settings/Tags/index.js
index 006a9894f..cb833f266 100644
--- a/packages/bruno-app/src/components/RequestPane/Settings/Tags/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Settings/Tags/index.js
@@ -14,7 +14,7 @@ const Tags = ({ item, collection }) => {
   const tags = item.draft ? get(item, 'draft.tags', []) : get(item, 'tags', []);
 
   // Filter out tags that are already associated with the current request
-  const collectionTagsWithoutCurrentRequestTags = collectionTags?.filter(tag => !tags.includes(tag)) || [];
+  const collectionTagsWithoutCurrentRequestTags = collectionTags?.filter((tag) => !tags.includes(tag)) || [];
 
   const handleAdd = useCallback((tag) => {
     const trimmedTag = tag.trim();
@@ -41,7 +41,7 @@ const Tags = ({ item, collection }) => {
 
   const handleRequestSave = () => {
     dispatch(saveRequest(item.uid, collection.uid));
-  }
+  };
 
   useEffect(() => {
     dispatch(updateCollectionTagsList({ collectionUid: collection.uid }));
@@ -49,9 +49,9 @@ const Tags = ({ item, collection }) => {
 
   return (
     <div className="flex flex-col">
-      <TagList 
+      <TagList
         tagsHintList={collectionTagsWithoutCurrentRequestTags}
-        handleAddTag={handleAdd} 
+        handleAddTag={handleAdd}
         handleRemoveTag={handleRemove}
         tags={tags}
         onSave={handleRequestSave}
@@ -60,4 +60,4 @@ const Tags = ({ item, collection }) => {
   );
 };
 
-export default Tags; 
\ No newline at end of file
+export default Tags;
diff --git a/packages/bruno-app/src/components/RequestPane/Settings/ToggleSelector/index.js b/packages/bruno-app/src/components/RequestPane/Settings/ToggleSelector/index.js
index 05ad36f4f..686cc2f70 100644
--- a/packages/bruno-app/src/components/RequestPane/Settings/ToggleSelector/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Settings/ToggleSelector/index.js
@@ -50,13 +50,13 @@ const ToggleSelector = ({
           relative inline-flex ${currentSize.container} flex-shrink-0 items-center rounded-full transition-colors
           focus:outline-none focus:ring-1 focus:ring-offset-1
           ${disabled
-            ? 'opacity-50 cursor-not-allowed'
-            : 'cursor-pointer'
-          }
+      ? 'opacity-50 cursor-not-allowed'
+      : 'cursor-pointer'
+    }
           ${checked
-            ? 'bg-blue-600 dark:bg-blue-500'
-            : 'bg-gray-200 dark:bg-gray-700'
-          }
+      ? 'bg-blue-600 dark:bg-blue-500'
+      : 'bg-gray-200 dark:bg-gray-700'
+    }
         `}
         role="switch"
         aria-checked={checked}
@@ -73,4 +73,4 @@ const ToggleSelector = ({
   );
 };
 
-export default ToggleSelector;
\ No newline at end of file
+export default ToggleSelector;
diff --git a/packages/bruno-app/src/components/RequestPane/Settings/index.js b/packages/bruno-app/src/components/RequestPane/Settings/index.js
index 9a3340b6d..f3cc73f48 100644
--- a/packages/bruno-app/src/components/RequestPane/Settings/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Settings/index.js
@@ -156,4 +156,4 @@ const Settings = ({ item, collection }) => {
   );
 };
 
-export default Settings;
\ No newline at end of file
+export default Settings;
diff --git a/packages/bruno-app/src/components/RequestPane/Vars/VarsTable/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/Vars/VarsTable/StyledWrapper.js
index c8ec78387..561a18f4e 100644
--- a/packages/bruno-app/src/components/RequestPane/Vars/VarsTable/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/Vars/VarsTable/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -23,7 +23,7 @@ const Wrapper = styled.div`
     }
 
   .btn-add-var {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/RequestPane/Vars/VarsTable/index.js b/packages/bruno-app/src/components/RequestPane/Vars/VarsTable/index.js
index cd3f83797..d19c7c859 100644
--- a/packages/bruno-app/src/components/RequestPane/Vars/VarsTable/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Vars/VarsTable/index.js
@@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux';
 import { useTheme } from 'providers/Theme';
 import { addVar, updateVar, deleteVar, moveVar } from 'providers/ReduxStore/slices/collections';
 import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
-import SingleLineEditor from 'components/SingleLineEditor';
+import MultiLineEditor from 'components/MultiLineEditor';
 import InfoTip from 'components/InfoTip';
 import StyledWrapper from './StyledWrapper';
 import toast from 'react-hot-toast';
@@ -92,24 +92,24 @@ const VarsTable = ({ item, collection, vars, varType }) => {
         headers={[
           { name: 'Name', accessor: 'name', width: '40%' },
           { name: varType === 'request' ? (
-              <div className="flex items-center">
-                <span>Value</span>
-              </div>
+            <div className="flex items-center">
+              <span>Value</span>
+            </div>
           ) : (
-              <div className="flex items-center">
-                <span>Expr</span>
-                <InfoTip content="You can write any valid JS expression here" infotipId="response-var" />
-              </div>
+            <div className="flex items-center">
+              <span>Expr</span>
+              <InfoTip content="You can write any valid JS expression here" infotipId="response-var" />
+            </div>
           ), accessor: 'value', width: '46%' },
           { name: '', accessor: '', width: '14%' }
         ]}
       >
         <ReorderTable updateReorderedItem={handleVarDrag}>
-        {vars && vars.length
+          {vars && vars.length
             ? vars.map((_var) => {
                 return (
                   <tr key={_var.uid} data-uid={_var.uid}>
-                    <td className='flex relative'>
+                    <td className="flex relative">
                       <input
                         type="text"
                         autoComplete="off"
@@ -122,7 +122,7 @@ const VarsTable = ({ item, collection, vars, varType }) => {
                       />
                     </td>
                     <td>
-                      <SingleLineEditor
+                      <MultiLineEditor
                         value={_var.value}
                         theme={storedTheme}
                         onSave={onSave}
@@ -135,8 +135,7 @@ const VarsTable = ({ item, collection, vars, varType }) => {
                             },
                             _var,
                             'value'
-                          )
-                        }
+                          )}
                         onRun={handleRun}
                         collection={collection}
                         item={item}
diff --git a/packages/bruno-app/src/components/RequestPane/Vars/index.js b/packages/bruno-app/src/components/RequestPane/Vars/index.js
index eb292e9c2..89b15beca 100644
--- a/packages/bruno-app/src/components/RequestPane/Vars/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Vars/index.js
@@ -2,6 +2,7 @@ import React from 'react';
 import get from 'lodash/get';
 import VarsTable from './VarsTable';
 import StyledWrapper from './StyledWrapper';
+import DeprecationWarning from 'components/DeprecationWarning';
 
 const Vars = ({ item, collection }) => {
   const requestVars = item.draft ? get(item, 'draft.request.vars.req') : get(item, 'request.vars.req');
@@ -10,13 +11,8 @@ const Vars = ({ item, collection }) => {
   return (
     <StyledWrapper className="w-full flex flex-col">
       <div className="mt-2">
-        <div className="mb-1 title text-xs">Pre Request</div>
         <VarsTable item={item} collection={collection} vars={requestVars} varType="request" />
       </div>
-      <div>
-        <div className="mt-1 mb-1 title text-xs">Post Response</div>
-        <VarsTable item={item} collection={collection} vars={responseVars} varType="response" />
-      </div>
     </StyledWrapper>
   );
 };
diff --git a/packages/bruno-app/src/components/RequestPane/WSSettingsPane/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/WSSettingsPane/StyledWrapper.js
index e04c6d331..c1cd7afd1 100644
--- a/packages/bruno-app/src/components/RequestPane/WSSettingsPane/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/WSSettingsPane/StyledWrapper.js
@@ -13,7 +13,7 @@ const StyledWrapper = styled.div`
   }
 
   .tooltip-mod {
-    font-size: 11px !important;
+    font-size: ${(props) => props.theme.font.size.xs} !important;
     width: 150px !important;
 
     & ul {
diff --git a/packages/bruno-app/src/components/RequestPane/WsBody/BodyMode/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/WsBody/BodyMode/StyledWrapper.js
index 3d571b4bf..983ab3cf7 100644
--- a/packages/bruno-app/src/components/RequestPane/WsBody/BodyMode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/WsBody/BodyMode/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
 
   .body-mode-selector {
     background: transparent;
diff --git a/packages/bruno-app/src/components/RequestPane/WsBody/index.js b/packages/bruno-app/src/components/RequestPane/WsBody/index.js
index 1938fe595..22bc91594 100644
--- a/packages/bruno-app/src/components/RequestPane/WsBody/index.js
+++ b/packages/bruno-app/src/components/RequestPane/WsBody/index.js
@@ -62,7 +62,7 @@ const WSBody = ({ item, collection, handleRun }) => {
               className="flex items-center justify-center gap-2 py-2 px-4 rounded-md border border-neutral-200 dark:border-neutral-800 bg-neutral-100 dark:bg-neutral-700 hover:bg-neutral-200 dark:hover:bg-neutral-600 transition-colors"
             >
               <IconPlus size={16} strokeWidth={1.5} className="text-neutral-700 dark:text-neutral-300" />
-              <span className="font-medium text-sm text-neutral-700 dark:text-neutral-300">Add First Message</span>
+              <span className="font-medium text-neutral-700 dark:text-neutral-300">Add First Message</span>
             </button>
           </ToolHint>
         </div>
@@ -104,7 +104,7 @@ const WSBody = ({ item, collection, handleRun }) => {
               className="add-message-btn flex items-center justify-center gap-2 py-2 px-4 rounded-md border border-neutral-200 dark:border-neutral-800 bg-neutral-100 dark:bg-neutral-700 hover:bg-neutral-200 dark:hover:bg-neutral-600 transition-colors shadow-md"
             >
               <IconPlus size={16} strokeWidth={1.5} className="text-neutral-700 dark:text-neutral-300" />
-              <span className="font-medium text-sm text-neutral-700 dark:text-neutral-300">Add Message</span>
+              <span className="font-medium text-neutral-700 dark:text-neutral-300">Add Message</span>
             </button>
           </ToolHint>
         </div>
diff --git a/packages/bruno-app/src/components/RequestPane/WsQueryUrl/StyledWrapper.js b/packages/bruno-app/src/components/RequestPane/WsQueryUrl/StyledWrapper.js
index ecada4e18..7cec49328 100644
--- a/packages/bruno-app/src/components/RequestPane/WsQueryUrl/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestPane/WsQueryUrl/StyledWrapper.js
@@ -3,11 +3,12 @@ import styled from 'styled-components';
 const StyledWrapper = styled.div`
   height: 2.3rem;
   position: relative;
+  border: ${(props) => props.theme.requestTabPanel.url.border};
+  border-radius: ${(props) => props.theme.border.radius.base};
 
   .input-container {
     background-color: ${(props) => props.theme.requestTabPanel.url.bg};
-    border-top-right-radius: 3px;
-    border-bottom-right-radius: 3px;
+    border-radius: ${(props) => props.theme.border.radius.base};
 
     input {
       background-color: ${(props) => props.theme.requestTabPanel.url.bg};
diff --git a/packages/bruno-app/src/components/RequestPane/WsQueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/WsQueryUrl/index.js
index f06102998..61f550f3c 100644
--- a/packages/bruno-app/src/components/RequestPane/WsQueryUrl/index.js
+++ b/packages/bruno-app/src/components/RequestPane/WsQueryUrl/index.js
@@ -1,76 +1,94 @@
 import { IconArrowRight, IconDeviceFloppy, IconPlugConnected, IconPlugConnectedX } from '@tabler/icons';
-import { IconWebSocket } from 'components/Icons/Grpc';
 import classnames from 'classnames';
 import SingleLineEditor from 'components/SingleLineEditor/index';
 import { requestUrlChanged } from 'providers/ReduxStore/slices/collections';
 import { wsConnectOnly, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
 import { useTheme } from 'providers/Theme';
-import React, { useEffect, useState, useMemo } from 'react';
+import React, { useEffect, useState, useMemo, useRef } from 'react';
 import toast from 'react-hot-toast';
 import { useDispatch } from 'react-redux';
-import { getPropertyFromDraftOrRequest } from 'utils/collections';
 import { isMacOS } from 'utils/common/platform';
 import { hasRequestChanges } from 'utils/collections';
-import { closeWsConnection, isWsConnectionActive } from 'utils/network/index';
+import { closeWsConnection, getWsConnectionStatus } from 'utils/network/index';
 import StyledWrapper from './StyledWrapper';
+import { interpolateUrl } from 'utils/url';
+import { getAllVariables } from 'utils/collections';
+import useDebounce from 'hooks/useDebounce';
 import get from 'lodash/get';
 
+const CONNECTION_STATUS = {
+  CONNECTING: 'connecting',
+  CONNECTED: 'connected',
+  DISCONNECTED: 'disconnected'
+};
+
+const useWsConnectionStatus = (requestId) => {
+  const [connectionStatus, setConnectionStatus] = useState(CONNECTION_STATUS.DISCONNECTED);
+  useEffect(() => {
+    const checkConnectionStatus = async () => {
+      const result = await getWsConnectionStatus(requestId);
+      setConnectionStatus(result?.status ?? CONNECTION_STATUS.DISCONNECTED);
+    };
+    checkConnectionStatus();
+    const interval = setInterval(checkConnectionStatus, 2000);
+    return () => clearInterval(interval);
+  }, [requestId]);
+  return [connectionStatus, setConnectionStatus];
+};
+
 const WsQueryUrl = ({ item, collection, handleRun }) => {
   const dispatch = useDispatch();
   const { theme, displayedTheme } = useTheme();
-  const [isConnectionActive, setIsConnectionActive] = useState(false);
   // TODO: reaper, better state for connecting
-  const [isConnecting, setIsConnecting] = useState(false);
-  const url = getPropertyFromDraftOrRequest(item, 'request.url');
-  const response = item.draft ? get(item, 'draft.response', {}) : get(item, 'response', {});
   const saveShortcut = isMacOS() ? '⌘S' : 'Ctrl+S';
   const hasChanges = useMemo(() => hasRequestChanges(item), [item]);
 
-  const showConnectingPulse = isConnecting && response.status !== 'CLOSED';
+  const [connectionStatus, setConnectionStatus] = useWsConnectionStatus(item.uid);
+  const url = item.draft ? get(item, 'draft.request.url', '') : get(item, 'request.url', '');
 
-  // Check connection status
-  useEffect(() => {
-    const checkConnectionStatus = async () => {
-      try {
-        const result = await isWsConnectionActive(item.uid);
-        const active = Boolean(result.isActive);
-        setIsConnectionActive(active);
-        setIsConnecting(false);
-      } catch (error) {
-        setIsConnectionActive(false);
-        setIsConnecting(false);
-      }
-    };
+  const allVariables = useMemo(() => {
+    return getAllVariables(collection, item);
+  }, [collection, item]);
 
-    checkConnectionStatus();
-    const interval = setInterval(checkConnectionStatus, 2000);
-    return () => clearInterval(interval);
-  }, [item.uid]);
+  const interpolatedURL = useMemo(() => {
+    if (!url) return '';
+    return interpolateUrl({ url, variables: allVariables }) || '';
+  }, [url, allVariables]);
 
-  const onUrlChange = (value) => {
-    closeWsConnection(item.uid);
-    dispatch(requestUrlChanged({
-      url: value,
-      itemUid: item.uid,
-      collectionUid: collection.uid
-    }));
+  // Debounce interpolated URL to avoid excessive reconnections
+  const debouncedInterpolatedURL = useDebounce(interpolatedURL, 400);
+  const previousDeboundedInterpolatedURL = useRef(debouncedInterpolatedURL);
+
+  const handleConnect = async () => {
+    dispatch(wsConnectOnly(item, collection.uid));
+    previousDeboundedInterpolatedURL.current = debouncedInterpolatedURL;
   };
 
-  const handleCloseConnection = (e) => {
-    e.stopPropagation();
-
+  const handleDisconnect = async (e, notify) => {
+    e && e.stopPropagation();
     closeWsConnection(item.uid)
       .then(() => {
-        toast.success('WebSocket connection closed');
-        setIsConnectionActive(false);
-        setIsConnecting(false);
+        notify && toast.success('WebSocket connection closed');
+        setConnectionStatus('disconnected');
       })
       .catch((err) => {
         console.error('Failed to close WebSocket connection:', err);
-        toast.error('Failed to close WebSocket connection');
+        notify && toast.error('Failed to close WebSocket connection');
       });
   };
 
+  const handleReconnect = async (e) => {
+    e && e.stopPropagation();
+    try {
+      handleDisconnect(e, false);
+      setTimeout(() => {
+        handleConnect(e, false);
+      }, 2000);
+    } catch (err) {
+      console.error('Failed to re-connect WebSocket connection', err);
+    }
+  };
+
   const handleRunClick = async (e) => {
     e.stopPropagation();
     if (!url) {
@@ -80,15 +98,28 @@ const WsQueryUrl = ({ item, collection, handleRun }) => {
     handleRun(e);
   };
 
-  const handleConnect = (e) => {
-    setIsConnecting(true);
-    dispatch(wsConnectOnly(item, collection.uid));
-  };
-
   const onSave = (finalValue) => {
     dispatch(saveRequest(item.uid, collection.uid));
   };
 
+  const handleUrlChange = (value) => {
+    const finalUrl = value?.trim() ?? value;
+    console.log('finalUrl: ', finalUrl);
+    dispatch(requestUrlChanged({
+      itemUid: item.uid,
+      collectionUid: collection.uid,
+      url: finalUrl
+    }));
+  };
+
+  // Detect interpolated URL changes and reconnect if connection is active
+  useEffect(() => {
+    if (connectionStatus !== 'connected') return;
+    if (previousDeboundedInterpolatedURL.current === debouncedInterpolatedURL) return;
+    if (debouncedInterpolatedURL === '') return;
+    handleReconnect();
+  }, [debouncedInterpolatedURL, connectionStatus]);
+
   return (
     <StyledWrapper>
       <div className="flex items-center h-full">
@@ -99,11 +130,13 @@ const WsQueryUrl = ({ item, collection, handleRun }) => {
           <SingleLineEditor
             value={url}
             onSave={(finalValue) => onSave(finalValue)}
-            onChange={onUrlChange}
+            onChange={handleUrlChange}
             placeholder="ws://localhost:8080 or wss://example.com"
             className="w-full"
             theme={displayedTheme}
             onRun={handleRun}
+            collection={collection}
+            item={item}
           />
           <div className="flex items-center h-full mr-2 cursor-pointer">
             <div
@@ -125,9 +158,9 @@ const WsQueryUrl = ({ item, collection, handleRun }) => {
               </span>
             </div>
 
-            {isConnectionActive && (
+            {connectionStatus === 'connected' && (
               <div className="connection-controls relative flex items-center h-full gap-3 mr-3">
-                <div className="infotip" onClick={handleCloseConnection}>
+                <div className="infotip" onClick={(e) => handleDisconnect(e, true)}>
                   <IconPlugConnectedX
                     color={theme.colors.text.danger}
                     strokeWidth={1.5}
@@ -139,15 +172,13 @@ const WsQueryUrl = ({ item, collection, handleRun }) => {
               </div>
             )}
 
-            {!isConnectionActive && (
+            {connectionStatus !== 'connected' && (
               <div className="connection-controls relative flex items-center h-full gap-3 mr-3">
                 <div className="infotip" onClick={handleConnect}>
                   <IconPlugConnected
-                    className={
-                      classnames('cursor-pointer', {
-                        'animate-pulse': showConnectingPulse
-                      })
-                    }
+                    className={classnames('cursor-pointer', {
+                      'animate-pulse': connectionStatus === CONNECTION_STATUS.CONNECTING
+                    })}
                     color={theme.colors.text.green}
                     strokeWidth={1.5}
                     size={22}
@@ -164,7 +195,7 @@ const WsQueryUrl = ({ item, collection, handleRun }) => {
         </div>
       </div>
 
-      {isConnectionActive && <div className="connection-status-strip"></div>}
+      {connectionStatus === CONNECTION_STATUS.CONNECTED && <div className="connection-status-strip"></div>}
     </StyledWrapper>
   );
 };
diff --git a/packages/bruno-app/src/components/RequestTabPanel/FolderNotFound/index.js b/packages/bruno-app/src/components/RequestTabPanel/FolderNotFound/index.js
index eff188890..9c450ffd2 100644
--- a/packages/bruno-app/src/components/RequestTabPanel/FolderNotFound/index.js
+++ b/packages/bruno-app/src/components/RequestTabPanel/FolderNotFound/index.js
@@ -39,4 +39,4 @@ const FolderNotFound = ({ folderUid }) => {
   );
 };
 
-export default FolderNotFound; 
\ No newline at end of file
+export default FolderNotFound;
diff --git a/packages/bruno-app/src/components/RequestTabPanel/RequestIsLoading/index.js b/packages/bruno-app/src/components/RequestTabPanel/RequestIsLoading/index.js
index 9d2ff1346..35ae9c253 100644
--- a/packages/bruno-app/src/components/RequestTabPanel/RequestIsLoading/index.js
+++ b/packages/bruno-app/src/components/RequestTabPanel/RequestIsLoading/index.js
@@ -2,46 +2,48 @@ import { IconLoader2, IconFile } from '@tabler/icons';
 import StyledWrapper from './StyledWrapper';
 
 const RequestIsLoading = ({ item }) => {
-  return <StyledWrapper>
-    <div className='flex flex-col p-4'>
-      <div className='card shadow-sm rounded-md p-4 w-[600px]'>
-        <div>
-          <div className='font-medium flex items-center gap-2 pb-4'>
-            <IconFile size={16} strokeWidth={1.5} className="text-gray-400" />
-            File Info
-          </div>
-          <div className='hr'/>
+  return (
+    <StyledWrapper>
+      <div className="flex flex-col p-4">
+        <div className="card shadow-sm rounded-md p-4 w-[600px]">
+          <div>
+            <div className="font-medium flex items-center gap-2 pb-4">
+              <IconFile size={16} strokeWidth={1.5} className="text-gray-400" />
+              File Info
+            </div>
+            <div className="hr" />
 
-          <div className='flex items-center mt-2'>
-            <span className='w-12 mr-2 text-muted'>Name:</span>
-            <div>
-              {item?.name}
+            <div className="flex items-center mt-2">
+              <span className="w-12 mr-2 text-muted">Name:</span>
+              <div>
+                {item?.name}
+              </div>
             </div>
-          </div>
-          
-          <div className='flex items-center mt-1'>
-            <span className='w-12 mr-2 text-muted'>Path:</span>
-            <div className='break-all'>
-              {item?.pathname}
-            </div>
-          </div>
-          
-          <div className='flex items-center mt-1 pb-4'>
-            <span className='w-12 mr-2 text-muted'>Size:</span>
-            <div>
-              {item?.size?.toFixed?.(2)} MB
-            </div>
-          </div>
 
-          <div className='hr'/>
-          <div className='flex items-center gap-2 mt-4'>
-            <IconLoader2 className="animate-spin" size={16} strokeWidth={2} />
-            <span>Loading...</span>
+            <div className="flex items-center mt-1">
+              <span className="w-12 mr-2 text-muted">Path:</span>
+              <div className="break-all">
+                {item?.pathname}
+              </div>
+            </div>
+
+            <div className="flex items-center mt-1 pb-4">
+              <span className="w-12 mr-2 text-muted">Size:</span>
+              <div>
+                {item?.size?.toFixed?.(2)} MB
+              </div>
+            </div>
+
+            <div className="hr" />
+            <div className="flex items-center gap-2 mt-4">
+              <IconLoader2 className="animate-spin" size={16} strokeWidth={2} />
+              <span>Loading...</span>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-  </StyledWrapper>
-}
+    </StyledWrapper>
+  );
+};
 
-export default RequestIsLoading;
\ No newline at end of file
+export default RequestIsLoading;
diff --git a/packages/bruno-app/src/components/RequestTabPanel/RequestNotLoaded/index.js b/packages/bruno-app/src/components/RequestTabPanel/RequestNotLoaded/index.js
index 08d011326..39b9a76b3 100644
--- a/packages/bruno-app/src/components/RequestTabPanel/RequestNotLoaded/index.js
+++ b/packages/bruno-app/src/components/RequestTabPanel/RequestNotLoaded/index.js
@@ -8,64 +8,66 @@ const RequestNotLoaded = ({ collection, item }) => {
 
   const handleLoadLargeRequest = () => {
     !item?.loading && dispatch(loadLargeRequest({ collectionUid: collection?.uid, pathname: item?.pathname }));
-  }
+  };
 
-  return <StyledWrapper>
-    <div className='flex flex-col p-4'>
-      <div className='card shadow-sm rounded-md p-4 w-[685px]'>
-        <div>
-          <div className='font-medium flex items-center gap-2 pb-4'>
-            <IconFile size={16} strokeWidth={1.5} className="text-gray-400" />
-            File Info
-          </div>
-          <div className='hr' />
+  return (
+    <StyledWrapper>
+      <div className="flex flex-col p-4">
+        <div className="card shadow-sm rounded-md p-4 w-[685px]">
+          <div>
+            <div className="font-medium flex items-center gap-2 pb-4">
+              <IconFile size={16} strokeWidth={1.5} className="text-gray-400" />
+              File Info
+            </div>
+            <div className="hr" />
 
-          <div className='flex items-center mt-2'>
-            <span className='w-12 mr-2 text-muted'>Name:</span>
-            <div>{item?.name}</div>
-          </div>
+            <div className="flex items-center mt-2">
+              <span className="w-12 mr-2 text-muted">Name:</span>
+              <div>{item?.name}</div>
+            </div>
 
-          <div className='flex items-center mt-1'>
-            <span className='w-12 mr-2 text-muted'>Path:</span>
-            <div className='break-all'>{item?.pathname}</div>
-          </div>
+            <div className="flex items-center mt-1">
+              <span className="w-12 mr-2 text-muted">Path:</span>
+              <div className="break-all">{item?.pathname}</div>
+            </div>
 
-          <div className='flex items-center mt-1 pb-4'>
-            <span className='w-12 mr-2 text-muted'>Size:</span>
-            <div>{item?.size?.toFixed?.(2)} MB</div>
-          </div>
+            <div className="flex items-center mt-1 pb-4">
+              <span className="w-12 mr-2 text-muted">Size:</span>
+              <div>{item?.size?.toFixed?.(2)} MB</div>
+            </div>
 
-          {!item?.error && (
-            <div className='flex flex-col'>
-              <div className='flex items-center gap-2 px-3 py-2 title bg-yellow-50 dark:bg-yellow-900/20'>
-                <IconAlertTriangle size={16} className="text-yellow-500" />
-                <span>The request wasn't loaded due to its large size. Please try again with the following options:</span>
-              </div>
-              <div className='flex flex-row mt-6 items-center gap-2 w-full'>
-                  <button 
-                    className={`submit btn btn-sm btn-secondary w-fit h-fit flex flex-row gap-2 ${item?.loading? 'opacity-50 cursor-blocked': ''}`} 
+            {!item?.error && (
+              <div className="flex flex-col">
+                <div className="flex items-center gap-2 px-3 py-2 title bg-yellow-50 dark:bg-yellow-900/20">
+                  <IconAlertTriangle size={16} className="text-yellow-500" />
+                  <span>The request wasn't loaded due to its large size. Please try again with the following options:</span>
+                </div>
+                <div className="flex flex-row mt-6 items-center gap-2 w-full">
+                  <button
+                    className={`submit btn btn-sm btn-secondary w-fit h-fit flex flex-row gap-2 ${item?.loading ? 'opacity-50 cursor-blocked' : ''}`}
                     onClick={handleLoadLargeRequest}
                   >
                     Load Request
                   </button>
                   <p>(Uses a regex based parsing approach)</p>
+                </div>
               </div>
-            </div>
-          )}
+            )}
 
-          {item?.loading && (
-            <>
-              <div className='hr mt-4' />
-              <div className='flex items-center gap-2 mt-4'>
-                <IconLoader2 className="animate-spin" size={16} strokeWidth={2} />
-                <span>Loading...</span>
-              </div>
-            </>
-          )}
+            {item?.loading && (
+              <>
+                <div className="hr mt-4" />
+                <div className="flex items-center gap-2 mt-4">
+                  <IconLoader2 className="animate-spin" size={16} strokeWidth={2} />
+                  <span>Loading...</span>
+                </div>
+              </>
+            )}
+          </div>
         </div>
       </div>
-    </div>
-  </StyledWrapper>
-}
+    </StyledWrapper>
+  );
+};
 
-export default RequestNotLoaded;
\ No newline at end of file
+export default RequestNotLoaded;
diff --git a/packages/bruno-app/src/components/RequestTabPanel/index.js b/packages/bruno-app/src/components/RequestTabPanel/index.js
index f7880e509..b08e6f100 100644
--- a/packages/bruno-app/src/components/RequestTabPanel/index.js
+++ b/packages/bruno-app/src/components/RequestTabPanel/index.js
@@ -7,10 +7,8 @@ import HttpRequestPane from 'components/RequestPane/HttpRequestPane';
 import GrpcRequestPane from 'components/RequestPane/GrpcRequestPane/index';
 import ResponsePane from 'components/ResponsePane';
 import GrpcResponsePane from 'components/ResponsePane/GrpcResponsePane';
-import Welcome from 'components/Welcome';
 import { findItemInCollection } from 'utils/collections';
-import { updateRequestPaneTabWidth } from 'providers/ReduxStore/slices/tabs';
-import { sendRequest } from 'providers/ReduxStore/slices/collections/actions';
+import { cancelRequest, sendRequest } from 'providers/ReduxStore/slices/collections/actions';
 import RequestNotFound from './RequestNotFound';
 import QueryUrl from 'components/RequestPane/QueryUrl/index';
 import GrpcQueryUrl from 'components/RequestPane/GrpcQueryUrl/index';
@@ -33,7 +31,9 @@ import ExampleNotFound from './ExampleNotFound';
 import WsQueryUrl from 'components/RequestPane/WsQueryUrl';
 import WSRequestPane from 'components/RequestPane/WSRequestPane';
 import WSResponsePane from 'components/ResponsePane/WsResponsePane';
+import { useTabPaneBoundaries } from 'hooks/useTabPaneBoundaries/index';
 import ResponseExample from 'components/ResponseExample';
+import WorkspaceHome from 'components/WorkspaceHome';
 
 const MIN_LEFT_PANE_WIDTH = 300;
 const MIN_RIGHT_PANE_WIDTH = 350;
@@ -70,15 +70,9 @@ const RequestTabPanel = () => {
   });
 
   let collection = find(collections, (c) => c.uid === focusedTab?.collectionUid);
-
-  const screenWidth = useSelector((state) => state.app.screenWidth);
-  let asideWidth = useSelector((state) => state.app.leftSidebarWidth);
-  const [leftPaneWidth, setLeftPaneWidth] = useState(
-    focusedTab && focusedTab.requestPaneWidth ? focusedTab.requestPaneWidth : (screenWidth - asideWidth) / 2.2
-  ); // 2.2 is intentional to make both panes appear to be of equal width
-  const [topPaneHeight, setTopPaneHeight] = useState(focusedTab?.requestPaneHeight || MIN_TOP_PANE_HEIGHT);
   const [dragging, setDragging] = useState(false);
   const dragOffset = useRef({ x: 0, y: 0 });
+  const { left: leftPaneWidth, top: topPaneHeight, reset: resetPaneBoundaries, setTop: setTopPaneHeight, setLeft: setLeftPaneWidth } = useTabPaneBoundaries(activeTabUid);
 
   // Not a recommended pattern here to have the child component
   // make a callback to set state, but treating this as an exception
@@ -97,22 +91,6 @@ const RequestTabPanel = () => {
     }
   };
 
-  useEffect(() => {
-    // Initialize vertical heights when switching to vertical layout
-    if (mainSectionRef.current) {
-      const mainRect = mainSectionRef.current.getBoundingClientRect();
-      if (isVerticalLayout) {
-        const initialHeight = mainRect.height / 2;
-        setTopPaneHeight(initialHeight);
-        // In vertical mode, set leftPaneWidth to full container width
-        setLeftPaneWidth(mainRect.width);
-      } else {
-        // In horizontal mode, set to roughly half width
-        setLeftPaneWidth((screenWidth - asideWidth) / 2.2);
-      }
-    }
-  }, [isVerticalLayout, screenWidth, asideWidth]);
-
   const handleMouseMove = (e) => {
     if (dragging && mainSectionRef.current) {
       e.preventDefault();
@@ -130,40 +108,22 @@ const RequestTabPanel = () => {
         if (newWidth < MIN_LEFT_PANE_WIDTH || newWidth > mainRect.width - MIN_RIGHT_PANE_WIDTH) {
           return;
         }
+
         setLeftPaneWidth(newWidth);
       }
     }
   };
 
   const handleMouseUp = (e) => {
-    if (dragging && mainSectionRef.current) {
+    if (dragging) {
       e.preventDefault();
       setDragging(false);
-      if (!isVerticalLayout) {
-        const mainRect = mainSectionRef.current.getBoundingClientRect();
-        dispatch(
-          updateRequestPaneTabWidth({
-            uid: activeTabUid,
-            requestPaneWidth: e.clientX - mainRect.left
-          })
-        );
-      }
     }
   };
 
   const handleDragbarMouseDown = (e) => {
     e.preventDefault();
     setDragging(true);
-
-    if (isVerticalLayout) {
-      const dragBar = e.currentTarget;
-      const dragBarRect = dragBar.getBoundingClientRect();
-      dragOffset.current.y = e.clientY - dragBarRect.top;
-    } else {
-      const dragBar = e.currentTarget;
-      const dragBarRect = dragBar.getBoundingClientRect();
-      dragOffset.current.x = e.clientX - dragBarRect.left;
-    }
   };
 
   useEffect(() => {
@@ -177,7 +137,7 @@ const RequestTabPanel = () => {
   }, [dragging]);
 
   if (!activeTabUid) {
-    return <Welcome />;
+    return <WorkspaceHome />;
   }
 
   if (!focusedTab || !focusedTab.uid || !focusedTab.collectionUid) {
@@ -263,11 +223,17 @@ const RequestTabPanel = () => {
       return;
     }
 
-    dispatch(sendRequest(item, collection.uid)).catch((err) =>
-      toast.custom((t) => <NetworkError onClose={() => toast.dismiss(t.id)} />, {
-        duration: 5000
-      })
-    );
+    if (item.response?.stream?.running) {
+      dispatch(cancelRequest(item.cancelTokenUid, item, collection)).catch((err) =>
+        toast.custom((t) => <NetworkError onClose={() => toast.dismiss(t.id)} />, {
+          duration: 5000
+        }));
+    } else if (item.requestState !== 'sending' && item.requestState !== 'queued') {
+      dispatch(sendRequest(item, collection.uid)).catch((err) =>
+        toast.custom((t) => <NetworkError onClose={() => toast.dismiss(t.id)} />, {
+          duration: 5000
+        }));
+    }
   };
 
   // TODO: reaper, improve selection of panes
@@ -323,7 +289,14 @@ const RequestTabPanel = () => {
           </div>
         </section>
 
-        <div className="dragbar-wrapper" onMouseDown={handleDragbarMouseDown}>
+        <div
+          className="dragbar-wrapper"
+          onDoubleClick={(e) => {
+            e.preventDefault();
+            resetPaneBoundaries();
+          }}
+          onMouseDown={handleDragbarMouseDown}
+        >
           <div className="dragbar-handle" />
         </div>
 
diff --git a/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/StyledWrapper.js b/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/StyledWrapper.js
index 39cd89e4c..ec278887d 100644
--- a/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/StyledWrapper.js
@@ -2,4 +2,4 @@ import styled from 'styled-components';
 
 const StyledWrapper = styled.div``;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/index.js b/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/index.js
index ced3da6d5..396b5cbd2 100644
--- a/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/index.js
+++ b/packages/bruno-app/src/components/RequestTabs/CollectionToolBar/index.js
@@ -43,17 +43,17 @@ const CollectionToolBar = ({ collection }) => {
 
   return (
     <StyledWrapper>
-      <div className="flex items-center p-2">
+      <div className="flex items-center py-2 px-4">
         <div className="flex flex-1 items-center cursor-pointer hover:underline" onClick={viewCollectionSettings}>
           <IconFiles size={18} strokeWidth={1.5} />
-          <span className="ml-2 mr-4 font-semibold">{collection?.name}</span>
+          <span className="ml-2 mr-4 font-medium">{collection?.name}</span>
         </div>
         <div className="flex flex-3 items-center justify-end">
           <span className="mr-2">
             <JsSandboxMode collection={collection} />
           </span>
           <span className="mr-3">
-            <ToolHint text="Runner" toolhintId="RunnnerToolhintId" place='bottom'>
+            <ToolHint text="Runner" toolhintId="RunnnerToolhintId" place="bottom">
               <IconRun className="cursor-pointer" size={18} strokeWidth={1.5} onClick={handleRun} />
             </ToolHint>
           </span>
diff --git a/packages/bruno-app/src/components/RequestTabs/RequestTab/CloseTabIcon.js b/packages/bruno-app/src/components/RequestTabs/RequestTab/CloseTabIcon.js
index de2aa845d..377a4fc39 100644
--- a/packages/bruno-app/src/components/RequestTabs/RequestTab/CloseTabIcon.js
+++ b/packages/bruno-app/src/components/RequestTabs/RequestTab/CloseTabIcon.js
@@ -3,7 +3,8 @@ const CloseTabIcon = () => (
     <path
       fill="currentColor"
       d="M207.6 256l107.72-107.72c6.23-6.23 6.23-16.34 0-22.58l-25.03-25.03c-6.23-6.23-16.34-6.23-22.58 0L160 208.4 52.28 100.68c-6.23-6.23-16.34-6.23-22.58 0L4.68 125.7c-6.23 6.23-6.23 16.34 0 22.58L112.4 256 4.68 363.72c-6.23 6.23-6.23 16.34 0 22.58l25.03 25.03c6.23 6.23 16.34 6.23 22.58 0L160 303.6l107.72 107.72c6.23 6.23 16.34 6.23 22.58 0l25.03-25.03c6.23-6.23 6.23-16.34 0-22.58L207.6 256z"
-    ></path>
+    >
+    </path>
   </svg>
 );
 
diff --git a/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmCollectionClose/index.js b/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmCollectionClose/index.js
index 729e10c52..ad951e8be 100644
--- a/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmCollectionClose/index.js
+++ b/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmCollectionClose/index.js
@@ -21,10 +21,10 @@ const ConfirmCollectionClose = ({ collection, onCancel, onCloseWithoutSave, onSa
     >
       <div className="flex items-center font-normal">
         <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-        <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+        <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
       </div>
       <div className="font-normal mt-4">
-        You have unsaved changes in <span className="font-semibold">{collection.name}</span> collection settings.
+        You have unsaved changes in <span className="font-medium">{collection.name}</span> collection settings.
       </div>
 
       <div className="flex justify-between mt-6">
diff --git a/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmFolderClose/index.js b/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmFolderClose/index.js
index 42e4cad23..bc9ec9c6d 100644
--- a/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmFolderClose/index.js
+++ b/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmFolderClose/index.js
@@ -21,10 +21,10 @@ const ConfirmFolderClose = ({ folder, onCancel, onCloseWithoutSave, onSaveAndClo
     >
       <div className="flex items-center font-normal">
         <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-        <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+        <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
       </div>
       <div className="font-normal mt-4">
-        You have unsaved changes in <span className="font-semibold">{folder.name}</span> folder settings.
+        You have unsaved changes in <span className="font-medium">{folder.name}</span> folder settings.
       </div>
 
       <div className="flex justify-between mt-6">
diff --git a/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmRequestClose/index.js b/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmRequestClose/index.js
index 293ebb3a6..6cf02bcd7 100644
--- a/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmRequestClose/index.js
+++ b/packages/bruno-app/src/components/RequestTabs/RequestTab/ConfirmRequestClose/index.js
@@ -25,10 +25,10 @@ const ConfirmRequestClose = ({ item, example, onCancel, onCloseWithoutSave, onSa
     >
       <div className="flex items-center font-normal">
         <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-        <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+        <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
       </div>
       <div className="font-normal mt-4">
-        You have unsaved changes in {itemType} <span className="font-semibold">{itemName}</span>.
+        You have unsaved changes in {itemType} <span className="font-medium">{itemName}</span>.
       </div>
 
       <div className="flex justify-between mt-6">
diff --git a/packages/bruno-app/src/components/RequestTabs/RequestTab/SpecialTab.js b/packages/bruno-app/src/components/RequestTabs/RequestTab/SpecialTab.js
index 12e919802..df5bda2a0 100644
--- a/packages/bruno-app/src/components/RequestTabs/RequestTab/SpecialTab.js
+++ b/packages/bruno-app/src/components/RequestTabs/RequestTab/SpecialTab.js
@@ -28,7 +28,7 @@ const SpecialTab = ({ handleCloseClick, type, tabName, handleDoubleClick, hasDra
             <IconShieldLock size={18} strokeWidth={1.5} className="text-yellow-600" />
             <span className="ml-1">Security</span>
           </>
-        )
+        );
       }
       case 'folder-settings': {
         return (
diff --git a/packages/bruno-app/src/components/RequestTabs/RequestTab/StyledWrapper.js b/packages/bruno-app/src/components/RequestTabs/RequestTab/StyledWrapper.js
index 49d37f001..16f67cecf 100644
--- a/packages/bruno-app/src/components/RequestTabs/RequestTab/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestTabs/RequestTab/StyledWrapper.js
@@ -34,6 +34,10 @@ const StyledWrapper = styled.div`
     .has-changes-icon {
       height: 24px;
     }
+
+    .tab-method {
+      font-size: ${(props) => props.theme.font.size.sm};
+    }
   }
 `;
 
diff --git a/packages/bruno-app/src/components/RequestTabs/RequestTab/index.js b/packages/bruno-app/src/components/RequestTabs/RequestTab/index.js
index 446cb2b98..f0820badc 100644
--- a/packages/bruno-app/src/components/RequestTabs/RequestTab/index.js
+++ b/packages/bruno-app/src/components/RequestTabs/RequestTab/index.js
@@ -108,7 +108,7 @@ const RequestTab = ({ tab, collection, tabIndex, collectionRequestTabs, folderUi
   if (['collection-settings', 'collection-overview', 'folder-settings', 'variables', 'collection-runner', 'security-settings'].includes(tab.type)) {
     return (
       <StyledWrapper
-        className={`flex items-center justify-between tab-container px-1 ${tab.preview ? "italic" : ""}`}
+        className={`flex items-center justify-between tab-container px-1 ${tab.preview ? 'italic' : ''}`}
         onMouseUp={handleMouseUp} // Add middle-click behavior here
       >
         {showConfirmCollectionClose && tab.type === 'collection-settings' && (
@@ -192,7 +192,6 @@ const RequestTab = ({ tab, collection, tabIndex, collectionRequestTabs, folderUi
     );
   }
 
-
   const getMethodText = useCallback((item) => {
     if (!item) return;
 
@@ -269,7 +268,7 @@ const RequestTab = ({ tab, collection, tabIndex, collectionRequestTabs, folderUi
         />
       )}
       <div
-        className={`flex items-baseline tab-label pl-2 ${tab.preview ? "italic" : ""}`}
+        className={`flex items-baseline tab-label pl-2 ${tab.preview ? 'italic' : ''}`}
         onContextMenu={handleRightClick}
         onDoubleClick={() => dispatch(makeTabPermanent({ uid: tab.uid }))}
         onMouseUp={(e) => {
@@ -282,7 +281,7 @@ const RequestTab = ({ tab, collection, tabIndex, collectionRequestTabs, folderUi
           }
         }}
       >
-        <span className="tab-method uppercase" style={{ color: getMethodColor(method), fontSize: 12 }}>
+        <span className="tab-method uppercase" style={{ color: getMethodColor(method) }}>
           {method}
         </span>
         <span className="ml-1 tab-name" title={item.name}>
diff --git a/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js b/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js
index 93829cca9..f555615da 100644
--- a/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestTabs/StyledWrapper.js
@@ -25,7 +25,7 @@ const Wrapper = styled.div`
       padding-left: 0;
       padding-right: 0;
       cursor: pointer;
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       height: 38px;
 
       margin-right: 6px;
@@ -39,7 +39,6 @@ const Wrapper = styled.div`
 
       &.active {
         background: ${(props) => props.theme.requestTabs.active.bg};
-        font-weight: 500;
       }
 
       &.active {
diff --git a/packages/bruno-app/src/components/RequestTabs/index.js b/packages/bruno-app/src/components/RequestTabs/index.js
index 724707b4f..c9fbb74aa 100644
--- a/packages/bruno-app/src/components/RequestTabs/index.js
+++ b/packages/bruno-app/src/components/RequestTabs/index.js
@@ -24,7 +24,7 @@ const RequestTabs = () => {
 
   const getTabClassname = (tab, index) => {
     return classnames('request-tab select-none', {
-      active: tab.uid === activeTabUid,
+      'active': tab.uid === activeTabUid,
       'last-tab': tabs && tabs.length && index === tabs.length - 1
     });
   };
diff --git a/packages/bruno-app/src/components/ResponseExample/CreateExampleModal/index.js b/packages/bruno-app/src/components/ResponseExample/CreateExampleModal/index.js
index 636d61b4a..aaa28551a 100644
--- a/packages/bruno-app/src/components/ResponseExample/CreateExampleModal/index.js
+++ b/packages/bruno-app/src/components/ResponseExample/CreateExampleModal/index.js
@@ -60,7 +60,7 @@ const CreateExampleModal = ({ isOpen, onClose, onSave, title = 'Create Response
       >
         <div className="space-y-4">
           <div>
-            <label htmlFor="exampleName" className="block font-semibold">
+            <label htmlFor="exampleName" className="block font-medium">
               Example Name<span className="text-red-600">*</span>
             </label>
             <input
@@ -74,14 +74,14 @@ const CreateExampleModal = ({ isOpen, onClose, onSave, title = 'Create Response
               data-testid="create-example-name-input"
             />
             {nameError && (
-              <div className="text-red-500 text-sm mt-1" data-testid="name-error">
+              <div className="text-red-500 mt-1" data-testid="name-error">
                 {nameError}
               </div>
             )}
           </div>
 
           <div>
-            <label htmlFor="exampleDescription" className="block font-semibold">
+            <label htmlFor="exampleDescription" className="block font-medium">
               Description
             </label>
             <textarea
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleBody/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleBody/StyledWrapper.js
index 4ab2ce15e..95804cba2 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleBody/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleBody/StyledWrapper.js
@@ -10,7 +10,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.text};
   }
 
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
 
   .body-mode-selector {
     background: transparent;
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleBodyRenderer/index.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleBodyRenderer/index.js
index cac4c5239..64fdc12ef 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleBodyRenderer/index.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleBodyRenderer/index.js
@@ -51,7 +51,7 @@ const ResponseExampleBodyRenderer = ({
     switch (bodyMode) {
       case 'none':
         return (
-          <div className="text-sm no-body-text">
+          <div className="no-body-text">
             No Body
           </div>
         );
@@ -91,7 +91,7 @@ const ResponseExampleBodyRenderer = ({
 
       default:
         return (
-          <div className="text-sm no-body-text">
+          <div className="no-body-text">
             No Body
           </div>
         );
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleDescription/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleDescription/StyledWrapper.js
index 9d2bc703c..adc907b78 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleDescription/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleDescription/StyledWrapper.js
@@ -5,7 +5,7 @@ const StyledWrapper = styled.div`
     background-color: transparent;
     color: ${(props) => props.theme.text};
     font-family: inherit;
-    font-size: 14px;
+    font-size: ${(props) => props.theme.font.size.base};
     line-height: 1.5;
     border: 1px solid transparent;
     padding: 0;
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleFileBody/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleFileBody/StyledWrapper.js
index a1a444d6b..8a93b6c77 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleFileBody/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleFileBody/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -23,7 +23,7 @@ const Wrapper = styled.div`
     }
 
   .btn-add-param {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
@@ -49,7 +49,7 @@ const Wrapper = styled.div`
     background: none;
     border: none;
     cursor: pointer;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     color: ${(props) => props.theme.colors.text.muted};
     
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleFormUrlEncodedParams/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleFormUrlEncodedParams/StyledWrapper.js
index b85d411f5..ac4e4f7de 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleFormUrlEncodedParams/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleFormUrlEncodedParams/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -23,7 +23,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-param {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleHeaders/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleHeaders/StyledWrapper.js
index e56183dab..d12ef342b 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleHeaders/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleHeaders/StyledWrapper.js
@@ -9,7 +9,7 @@ const StyledWrapper = styled.div`
     background: none;
     border: none;
     cursor: pointer;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     transition: opacity 0.2s ease;
     color: ${(props) => props.theme.colors.text.muted};
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleMultipartFormParams/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleMultipartFormParams/StyledWrapper.js
index 4e44a60cb..793cc04e6 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleMultipartFormParams/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleMultipartFormParams/StyledWrapper.js
@@ -4,7 +4,7 @@ const Wrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -14,7 +14,7 @@ const Wrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
@@ -23,7 +23,7 @@ const Wrapper = styled.div`
   }
 
   .btn-add-param {
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   input[type='text'] {
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleParams/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleParams/StyledWrapper.js
index 67f57387e..e566a1390 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleParams/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleParams/StyledWrapper.js
@@ -10,7 +10,7 @@ const StyledWrapper = styled.div`
     background: none;
     border: none;
     cursor: pointer;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     transition: opacity 0.2s ease;
     color: ${(props) => props.theme.colors.text.muted};
@@ -31,8 +31,8 @@ const StyledWrapper = styled.div`
     
     thead {
       td {
-        font-weight: 600;
-        font-size: 12px;
+        font-weight: 500;
+        font-size: ${(props) => props.theme.font.size.sm};
         text-transform: uppercase;
         letter-spacing: 0.5px;
         padding: 8px 0;
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleUrlBar/index.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleUrlBar/index.js
index 50553123d..7346fb148 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleUrlBar/index.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/ResponseExampleUrlBar/index.js
@@ -55,7 +55,7 @@ const ResponseExampleUrlBar = ({ item, collection, editMode, onSave, exampleUid
   return (
     <StyledWrapper className="flex items-center">
       <div className="url-bar-container w-full flex p-2 text-xs rounded-md items-center justify-between" data-testid="url-bar-container">
-        <div className={`method flex text-xs items-center justify-center px-2 rounded h-6 flex-shrink-0 mr-2 overflow-hidden whitespace-nowrap font-semibold uppercase ${getMethodClass()}`}>
+        <div className={`method flex text-xs items-center justify-center px-2 rounded h-6 flex-shrink-0 mr-2 overflow-hidden whitespace-nowrap font-medium uppercase ${getMethodClass()}`}>
           {method || 'GET'}
         </div>
 
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/StyledWrapper.js
index 0d164d615..cf5a4d068 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleRequestPane/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
   height: 300px;
 
   .body-mode-selector {
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleResponsePane/ResponseExampleResponseHeaders/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleResponsePane/ResponseExampleResponseHeaders/StyledWrapper.js
index f271a3a4a..b46ab83c0 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleResponsePane/ResponseExampleResponseHeaders/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleResponsePane/ResponseExampleResponseHeaders/StyledWrapper.js
@@ -6,7 +6,7 @@ const StyledWrapper = styled.div`
     color: ${(props) => props.theme.colors.text.muted};
     border: none;
     cursor: pointer;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     transition: opacity 0.2s ease;
     
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleResponsePane/ResponseExampleStatusInput/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleResponsePane/ResponseExampleStatusInput/StyledWrapper.js
index 50aeb8e8f..46a0b9a78 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleResponsePane/ResponseExampleStatusInput/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleResponsePane/ResponseExampleStatusInput/StyledWrapper.js
@@ -9,7 +9,7 @@ const StyledWrapper = styled.div`
     border: 1px solid ${(props) => props.theme.modal.input.border};
     border-radius: 3px;
     padding: 0.35rem 0.6rem;
-    font-size: 0.8125rem;
+    font-size: ${(props) => props.theme.font.size.base};
     font-weight: 500;
     color: ${(props) => props.theme.text.primary};
     min-width: 120px;
@@ -60,7 +60,7 @@ const StyledWrapper = styled.div`
       margin: 0;
       cursor: pointer;
       transition: background-color 0.15s ease;
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       color: ${(props) => props.theme.dropdown.primaryText};
       width: 100%;
       box-sizing: border-box;
@@ -70,7 +70,7 @@ const StyledWrapper = styled.div`
       }
 
       .status {
-        font-weight: 600;
+        font-weight: 500;
         color: inherit;
         margin-right: 0.5rem;
         min-width: 40px;
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleTopBar/StyledWrapper.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleTopBar/StyledWrapper.js
index 7a9e2f73a..83bab2dd5 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleTopBar/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleTopBar/StyledWrapper.js
@@ -34,7 +34,7 @@ const StyledWrapper = styled.div`
 
   .example-input-label {
     display: block;
-    font-size: 14px;
+    font-size: ${(props) => props.theme.font.size.base};
     font-weight: 500;
     color: ${(props) => props.theme.text};
     margin-bottom: 4px;
@@ -48,7 +48,7 @@ const StyledWrapper = styled.div`
     background-color: transparent;
     color: ${(props) => props.theme.text};
     font-family: inherit;
-    font-size: 14px;
+    font-size: ${(props) => props.theme.font.size.base};
     line-height: 1.5;
     transition: all 0.2s ease;
     outline: none;
@@ -74,7 +74,7 @@ const StyledWrapper = styled.div`
   }
 
   .example-input-description {
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
     line-height: 1.6;
     resize: none;
     min-height: 80px;
diff --git a/packages/bruno-app/src/components/ResponseExample/ResponseExampleTopBar/index.js b/packages/bruno-app/src/components/ResponseExample/ResponseExampleTopBar/index.js
index 9bf2ef3f0..5140ff42d 100644
--- a/packages/bruno-app/src/components/ResponseExample/ResponseExampleTopBar/index.js
+++ b/packages/bruno-app/src/components/ResponseExample/ResponseExampleTopBar/index.js
@@ -156,9 +156,9 @@ const ResponseExampleTopBar = ({
   return (
     <StyledWrapper className="p-4">
       <div className="max-w-full">
-        <div className="flex items-start justify-between gap-6 md:flex-row flex-col">
+        <div className="flex items-center justify-between gap-6 md:flex-row flex-col">
           <div className="flex-1 min-w-0">
-            <h2 className="response-example-title font-semibold mb-2 leading-tight" data-testid="response-example-title">
+            <h2 className="response-example-title font-medium leading-tight" data-testid="response-example-title">
               <span className="opacity-60">{item.name}</span>
               {' / '}
               <span>{example.name}</span>
@@ -168,7 +168,7 @@ const ResponseExampleTopBar = ({
                 text={example.description}
                 maxLines={2}
                 className="response-example-description-container"
-                textClassName="response-example-description text-sm leading-relaxed max-w-fit"
+                textClassName="response-example-description leading-relaxed max-w-fit"
                 buttonClassName="text-blue-600 hover:text-blue-800 font-medium"
                 viewMoreText="View More"
                 viewLessText="View Less"
diff --git a/packages/bruno-app/src/components/ResponsePane/ClearTimeline/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ClearTimeline/StyledWrapper.js
index 8c32a8bab..73c1ba290 100644
--- a/packages/bruno-app/src/components/ResponsePane/ClearTimeline/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/ClearTimeline/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
   color: ${(props) => props.theme.requestTabPanel.responseStatus};
 `;
 
diff --git a/packages/bruno-app/src/components/ResponsePane/ClearTimeline/index.js b/packages/bruno-app/src/components/ResponsePane/ClearTimeline/index.js
index 18704cc41..200cb0488 100644
--- a/packages/bruno-app/src/components/ResponsePane/ClearTimeline/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/ClearTimeline/index.js
@@ -16,7 +16,7 @@ const ClearTimeline = ({ collection, item }) => {
 
   return (
     <StyledWrapper className="ml-2 flex items-center">
-      <button onClick={clearResponse} className='text-link hover:underline' title="Clear Timeline">
+      <button onClick={clearResponse} className="text-link hover:underline" title="Clear Timeline">
         Clear Timeline
       </button>
     </StyledWrapper>
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcError/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcError/StyledWrapper.js
index f302b86dd..a6942c2df 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcError/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcError/StyledWrapper.js
@@ -26,14 +26,14 @@ const StyledWrapper = styled.div`
   }
 
   .error-title {
-    font-weight: 600;
+    font-weight: 500;
     margin-bottom: 0.375rem;
     color: ${(props) => props.theme.colors.text.danger};
   }
 
   .error-message {
     font-family: monospace;
-    font-size: 0.6875rem;
+    font-size: ${(props) => props.theme.font.size.xs};
     line-height: 1.25rem;
     white-space: pre-wrap;
     word-break: break-all;
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcQueryResult/index.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcQueryResult/index.js
index c6ceeff61..6d6c646e3 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcQueryResult/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcQueryResult/index.js
@@ -61,13 +61,13 @@ const GrpcQueryResult = ({ item, collection }) => {
   }
 
   return (
-    <StyledWrapper className="w-full h-full relative flex flex-col mt-2">
+    <StyledWrapper className="w-full h-full relative flex flex-col mt-2" data-testid="grpc-response-content">
       {hasError && showErrorMessage && <GrpcError error={errorMessage} onClose={() => setShowErrorMessage(false)} />}
       {hasResponses && (
-        <div className={`overflow-y-auto ${responsesList.length === 1 ? 'flex-1' : ''}`}>
+        <div className={`overflow-y-auto ${responsesList.length === 1 ? 'flex-1' : ''}`} data-testid="grpc-responses-container">
           {responsesList.length === 1 ? (
             // Single message - render directly without accordion
-            <div className="h-full">
+            <div className="h-full" data-testid="grpc-single-response">
               <CodeEditor
                 collection={collection}
                 font={get(preferences, 'font.codeFont', 'default')}
@@ -80,13 +80,13 @@ const GrpcQueryResult = ({ item, collection }) => {
             </div>
           ) : (
             // Multiple messages - use accordion
-            <Accordion defaultIndex={0}>
+            <Accordion defaultIndex={0} dataTestId="grpc-responses-accordion">
               {reversedResponsesList.map((response, index) => {
                 // Calculate the original response number (for display purposes)
                 const originalIndex = responsesList.length - index - 1;
 
                 return (
-                  <Accordion.Item key={originalIndex} index={index}>
+                  <Accordion.Item key={originalIndex} index={index} data-testid={`grpc-response-item-${originalIndex}`}>
                     <Accordion.Header index={index} style={{ padding: '8px 12px', minHeight: '40px' }}>
                       <div className="flex justify-between w-full">
                         <div className="font-medium">
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcResponseHeaders/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcResponseHeaders/StyledWrapper.js
index d42e77f7f..141057784 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcResponseHeaders/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcResponseHeaders/StyledWrapper.js
@@ -7,8 +7,8 @@ const StyledWrapper = styled.div`
 
     thead {
       color: #777777;
-      font-size: 0.75rem;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.sm};
+      font-weight: 500;
       text-transform: uppercase;
     }
 
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/StyledWrapper.js
index bed367559..7c8ffe964 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/StyledWrapper.js
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.75rem;
-  font-weight: 600;
+  font-size: ${(props) => props.theme.font.size.sm};
+  font-weight: 500;
   display: flex;
   align-items: center;
 
@@ -19,4 +19,4 @@ const Wrapper = styled.div`
   }
 `;
 
-export default Wrapper; 
\ No newline at end of file
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/get-grpc-status-code-phrase.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/get-grpc-status-code-phrase.js
index a8c96e645..2f2d09b1b 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/get-grpc-status-code-phrase.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/get-grpc-status-code-phrase.js
@@ -19,4 +19,4 @@ const grpcStatusCodePhraseMap = {
   16: 'Unauthenticated'
 };
 
-export default grpcStatusCodePhraseMap; 
\ No newline at end of file
+export default grpcStatusCodePhraseMap;
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/index.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/index.js
index da2bcb001..b9a982d7c 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcStatusCode/index.js
@@ -14,7 +14,7 @@ const GrpcStatusCode = ({ status, text }) => {
     });
   };
 
-  const statusText = text || grpcStatusCodePhraseMap[status]
+  const statusText = text || grpcStatusCodePhraseMap[status];
 
   return (
     <StyledWrapper className={getTabClassname(status)}>
@@ -24,4 +24,4 @@ const GrpcStatusCode = ({ status, text }) => {
   );
 };
 
-export default GrpcStatusCode; 
\ No newline at end of file
+export default GrpcStatusCode;
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/ResponseTrailers/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/ResponseTrailers/StyledWrapper.js
index d42e77f7f..141057784 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/ResponseTrailers/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/ResponseTrailers/StyledWrapper.js
@@ -7,8 +7,8 @@ const StyledWrapper = styled.div`
 
     thead {
       color: #777777;
-      font-size: 0.75rem;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.sm};
+      font-weight: 500;
       text-transform: uppercase;
     }
 
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/index.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/index.js
index 81ab5bc1e..b0dd18c09 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/index.js
@@ -108,7 +108,7 @@ const GrpcResponsePane = ({ item, collection }) => {
 
   return (
     <StyledWrapper className="flex flex-col h-full relative">
-      <div className="flex flex-wrap items-center pl-3 pr-4 tabs" role="tablist">
+      <div className="flex flex-wrap items-center pl-3 pr-4 tabs" role="tablist" data-testid="grpc-response-tabs">
         {tabConfig.map((tab) => (
           <Tab
             key={tab.name}
diff --git a/packages/bruno-app/src/components/ResponsePane/LargeResponseWarning/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/LargeResponseWarning/StyledWrapper.js
index 0a5339df8..aeb696381 100644
--- a/packages/bruno-app/src/components/ResponsePane/LargeResponseWarning/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/LargeResponseWarning/StyledWrapper.js
@@ -21,7 +21,7 @@ const StyledWrapper = styled.div`
   }
 
   .warning-title {
-    font-weight: 600;
+    font-weight: 500;
     color: ${(props) => props.theme.text};
     margin-bottom: 1rem;
   }
diff --git a/packages/bruno-app/src/components/ResponsePane/LargeResponseWarning/index.js b/packages/bruno-app/src/components/ResponsePane/LargeResponseWarning/index.js
index 1686b4a38..57972f63c 100644
--- a/packages/bruno-app/src/components/ResponsePane/LargeResponseWarning/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/LargeResponseWarning/index.js
@@ -52,7 +52,7 @@ const LargeResponseWarning = ({ item, responseSize, onRevealResponse }) => {
           </div>
           <div className="warning-description">
             Handling responses over <span className="size-highlight supported-size">{formatSize(10 * 1024 * 1024)}</span> could degrade performance.
-          <br />
+            <br />
             Size of current response: <span className="size-highlight current-size">{formatSize(responseSize)}</span>
           </div>
         </div>
@@ -89,4 +89,4 @@ const LargeResponseWarning = ({ item, responseSize, onRevealResponse }) => {
   );
 };
 
-export default LargeResponseWarning;
\ No newline at end of file
+export default LargeResponseWarning;
diff --git a/packages/bruno-app/src/components/ResponsePane/NetworkError/index.js b/packages/bruno-app/src/components/ResponsePane/NetworkError/index.js
index 2969e8dcf..3184736ee 100644
--- a/packages/bruno-app/src/components/ResponsePane/NetworkError/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/NetworkError/index.js
@@ -6,14 +6,14 @@ const NetworkError = ({ onClose }) => {
       <div className="flex-1 w-0 p-4">
         <div className="flex items-start">
           <div className="ml-3 flex-1">
-            <p className="text-sm font-medium text-red-800">Network Error</p>
+            <p className="font-medium text-red-800">Network Error</p>
           </div>
         </div>
       </div>
       <div className="flex">
         <button
           onClick={onClose}
-          className="w-full border border-transparent rounded-none rounded-r-lg p-4 flex items-center justify-center text-sm font-medium focus:outline-none"
+          className="w-full border border-transparent rounded-none rounded-r-lg p-4 flex items-center justify-center font-medium focus:outline-none"
         >
           Close
         </button>
diff --git a/packages/bruno-app/src/components/ResponsePane/QueryResult/QueryResultFilter/index.js b/packages/bruno-app/src/components/ResponsePane/QueryResult/QueryResultFilter/index.js
index bd52c410a..5320b4195 100644
--- a/packages/bruno-app/src/components/ResponsePane/QueryResult/QueryResultFilter/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/QueryResult/QueryResultFilter/index.js
@@ -45,11 +45,9 @@ const QueryResultFilter = ({ filter, onChange, mode }) => {
 
   return (
     <div
-      className={
-        'response-filter absolute bottom-2 w-full justify-end right-0 flex flex-row items-center gap-2 py-4 px-2 pointer-events-none'
-      }
+      className="response-filter absolute bottom-2 w-full justify-end right-0 flex flex-row items-center gap-2 py-4 px-2 pointer-events-none"
     >
-      {infotipText && !isExpanded && <ReactInfotip anchorId={'request-filter-icon'} html={infotipText} />}
+      {infotipText && !isExpanded && <ReactInfotip anchorId="request-filter-icon" html={infotipText} />}
       <input
         ref={inputRef}
         type="text"
@@ -60,12 +58,12 @@ const QueryResultFilter = ({ filter, onChange, mode }) => {
         autoCorrect="off"
         autoCapitalize="off"
         spellCheck="false"
-        className={`block ml-14 p-2 py-1 sm:text-sm transition-all duration-200 ease-in-out border border-gray-300 rounded-md ${
+        className={`block ml-14 p-2 py-1 transition-all duration-200 ease-in-out border border-gray-300 rounded-md ${
           isExpanded ? 'w-full opacity-100 pointer-events-auto' : 'w-[0] opacity-0'
         }`}
         onChange={onChange}
       />
-      <div className="text-gray-500 sm:text-sm cursor-pointer pointer-events-auto" id="request-filter-icon" onClick={handleFilterClick}>
+      <div className="text-gray-500 cursor-pointer pointer-events-auto" id="request-filter-icon" onClick={handleFilterClick}>
         {isExpanded ? <IconX size={20} strokeWidth={1.5} /> : <IconFilter size={20} strokeWidth={1.5} />}
       </div>
     </div>
diff --git a/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js b/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js
index d21fff164..0917d7b86 100644
--- a/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js
@@ -14,8 +14,8 @@ import LargeResponseWarning from '../LargeResponseWarning';
 const formatErrorMessage = (error) => {
   if (!error) return 'Something went wrong';
 
-  const remoteMethodError = "Error invoking remote method 'send-http-request':";
-  
+  const remoteMethodError = 'Error invoking remote method \'send-http-request\':';
+
   if (error?.includes(remoteMethodError)) {
     const parts = error.split(remoteMethodError);
     return parts[1]?.trim() || error;
@@ -37,7 +37,7 @@ const QueryResult = ({ item, collection, data, dataBuffer, disableRunEventListen
     if (typeof response.size === 'number') {
       return response.size;
     }
-    
+
     if (!dataBuffer) return 0;
 
     try {
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseActions/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseActions/StyledWrapper.js
new file mode 100644
index 000000000..6ba69090e
--- /dev/null
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseActions/StyledWrapper.js
@@ -0,0 +1,29 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  button {
+    color: var(--color-tab-inactive);
+    cursor: pointer;
+
+    &:hover {
+      color: var(--color-tab-active);
+    }
+
+    &:disabled {
+      cursor: not-allowed;
+      opacity: 0.5;
+    }
+  }
+
+  .cursor-pointer {
+    display: flex;
+    align-items: center;
+    color: var(--color-tab-inactive);
+
+    &:hover {
+      color: var(--color-tab-active);
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseActions/index.js b/packages/bruno-app/src/components/ResponsePane/ResponseActions/index.js
new file mode 100644
index 000000000..a430153a0
--- /dev/null
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseActions/index.js
@@ -0,0 +1,35 @@
+import React, { useRef, forwardRef } from 'react';
+import { IconDots } from '@tabler/icons';
+import Dropdown from 'components/Dropdown';
+import StyledWrapper from './StyledWrapper';
+import ResponseClear from 'src/components/ResponsePane/ResponseClear';
+import ResponseSave from 'src/components/ResponsePane/ResponseSave';
+
+const ResponseActions = ({ collection, item }) => {
+  const menuDropdownTippyRef = useRef();
+
+  const onMenuDropdownCreate = (ref) => (menuDropdownTippyRef.current = ref);
+
+  const MenuIcon = forwardRef((_props, ref) => {
+    return (
+      <div ref={ref} className="cursor-pointer">
+        <IconDots size={18} strokeWidth={1.5} />
+      </div>
+    );
+  });
+
+  const handleClose = () => {
+    menuDropdownTippyRef.current.hide();
+  };
+
+  return (
+    <StyledWrapper className="ml-2 flex items-center">
+      <Dropdown onCreate={onMenuDropdownCreate} icon={<MenuIcon />} placement="bottom-end">
+        <ResponseClear item={item} collection={collection} asDropdownItem onClose={handleClose} />
+        <ResponseSave item={item} asDropdownItem onClose={handleClose} />
+      </Dropdown>
+    </StyledWrapper>
+  );
+};
+
+export default ResponseActions;
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseBookmark/index.js b/packages/bruno-app/src/components/ResponsePane/ResponseBookmark/index.js
index b00440c3a..9efe51f2e 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseBookmark/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseBookmark/index.js
@@ -12,12 +12,25 @@ import { getInitialExampleName } from 'utils/collections/index';
 import classnames from 'classnames';
 import StyledWrapper from './StyledWrapper';
 
+const getTitleText = ({ isResponseTooLarge, isStreamingResponse }) => {
+  if (isStreamingResponse) {
+    return 'Response Examples aren\'t supported in streaming responses yet.';
+  }
+
+  if (isResponseTooLarge) {
+    return 'Response size exceeds 5MB limit. Cannot save as example.';
+  }
+
+  return 'Save current response as example';
+};
+
 const ResponseBookmark = ({ item, collection, responseSize }) => {
   const dispatch = useDispatch();
   const [showSaveResponseExampleModal, setShowSaveResponseExampleModal] = useState(false);
   const response = item.response || {};
 
   const isResponseTooLarge = responseSize >= 5 * 1024 * 1024; // 5 MB
+  const isStreamingResponse = response.stream;
 
   // Only show for HTTP requests
   if (item.type !== 'http-request') {
@@ -96,19 +109,22 @@ const ResponseBookmark = ({ item, collection, responseSize }) => {
     toast.success(`Example "${name}" created successfully`);
   };
 
+  const disabledMessage = getTitleText({
+    isResponseTooLarge,
+    isStreamingResponse
+  });
+
   return (
     <>
       <StyledWrapper className="ml-2 flex items-center">
         <button
           onClick={handleSaveClick}
-          disabled={isResponseTooLarge}
+          disabled={isResponseTooLarge || isStreamingResponse}
           title={
-            isResponseTooLarge
-              ? 'Response size exceeds 5MB limit. Cannot save as example.'
-              : 'Save current response as example'
+            disabledMessage
           }
           className={classnames('p-1', {
-            'opacity-50 cursor-not-allowed': isResponseTooLarge
+            'opacity-50 cursor-not-allowed': isResponseTooLarge || isStreamingResponse
           })}
           data-testid="response-bookmark-btn"
         >
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseClear/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseClear/StyledWrapper.js
index 8c32a8bab..73c1ba290 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseClear/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseClear/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
   color: ${(props) => props.theme.requestTabPanel.responseStatus};
 `;
 
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseClear/index.js b/packages/bruno-app/src/components/ResponsePane/ResponseClear/index.js
index 747543347..b18418592 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseClear/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseClear/index.js
@@ -4,10 +4,11 @@ import { useDispatch } from 'react-redux';
 import StyledWrapper from './StyledWrapper';
 import { responseCleared } from 'providers/ReduxStore/slices/collections/index';
 
-const ResponseClear = ({ collection, item }) => {
+const ResponseClear = ({ collection, item, asDropdownItem, onClose }) => {
   const dispatch = useDispatch();
 
-  const clearResponse = () =>
+  const clearResponse = () => {
+    if (onClose) onClose();
     dispatch(
       responseCleared({
         itemUid: item.uid,
@@ -15,6 +16,16 @@ const ResponseClear = ({ collection, item }) => {
         response: null
       })
     );
+  };
+
+  if (asDropdownItem) {
+    return (
+      <div className="dropdown-item" onClick={clearResponse}>
+        <IconEraser size={16} strokeWidth={1.5} className="icon mr-2" />
+        Clear
+      </div>
+    );
+  }
 
   return (
     <StyledWrapper className="ml-2 flex items-center">
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseCopy/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseCopy/StyledWrapper.js
new file mode 100644
index 000000000..8c32a8bab
--- /dev/null
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseCopy/StyledWrapper.js
@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  font-size: 0.8125rem;
+  color: ${(props) => props.theme.requestTabPanel.responseStatus};
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseCopy/index.js b/packages/bruno-app/src/components/ResponsePane/ResponseCopy/index.js
new file mode 100644
index 000000000..7c59301ef
--- /dev/null
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseCopy/index.js
@@ -0,0 +1,46 @@
+import React, { useState, useEffect } from 'react';
+import StyledWrapper from './StyledWrapper';
+import toast from 'react-hot-toast';
+import { IconCopy, IconCheck } from '@tabler/icons';
+
+const ResponseCopy = ({ item }) => {
+  const response = item.response || {};
+  const [copied, setCopied] = useState(false);
+
+  useEffect(() => {
+    if (copied) {
+      const timer = setTimeout(() => {
+        setCopied(false);
+      }, 2000);
+      return () => clearTimeout(timer);
+    }
+  }, [copied]);
+
+  const copyResponse = async () => {
+    try {
+      const textToCopy = typeof response.data === 'string'
+        ? response.data
+        : JSON.stringify(response.data, null, 2);
+
+      await navigator.clipboard.writeText(textToCopy);
+      toast.success('Response copied to clipboard');
+      setCopied(true);
+    } catch (error) {
+      toast.error('Failed to copy response');
+    }
+  };
+
+  return (
+    <StyledWrapper className="ml-2 flex items-center">
+      <button onClick={copyResponse} disabled={!response.data} title="Copy response to clipboard">
+        {copied ? (
+          <IconCheck size={16} strokeWidth={1.5} />
+        ) : (
+          <IconCopy size={16} strokeWidth={1.5} />
+        )}
+      </button>
+    </StyledWrapper>
+  );
+};
+
+export default ResponseCopy;
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseHeaders/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseHeaders/StyledWrapper.js
index e136256ba..ced0f0904 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseHeaders/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseHeaders/StyledWrapper.js
@@ -7,8 +7,8 @@ const Wrapper = styled.div`
 
     thead {
       color: #777777;
-      font-size: 0.75rem;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.sm};
+      font-weight: 500;
       text-transform: uppercase;
     }
 
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/StyledWrapper.js
index 8cb5d4b43..8e77b37d3 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/StyledWrapper.js
@@ -12,4 +12,4 @@ const Wrapper = styled.div`
   }
 `;
 
-export default Wrapper;
\ No newline at end of file
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/index.js b/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/index.js
index 49299422b..709666765 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/index.js
@@ -44,7 +44,7 @@ const IconDockToRight = () => {
         stroke="currentColor"
         d="m 19.111502,18.486486 c -0.115516,0.259266 -0.354643,0.491338 -0.639512,0.620643 -0.221702,0.100633 -0.393081,0.114019 -1.474447,0.115163 l -1.223586,0.0013 V 12 4.7764125 h 1.22675 c 1.194609,0 1.234605,0.0039 1.526503,0.14937 0.187285,0.09333 0.363095,0.2407725 0.46858,0.3929775 l 0.168829,0.243606 0.0129,6.373606 c 0.0105,5.212942 -0.0015,6.405822 -0.06597,6.550511 z"
       />
-    </svg>  
+    </svg>
   );
 };
 
@@ -67,8 +67,8 @@ const ResponseLayoutToggle = () => {
 
   return (
     <StyledWrapper className="ml-2 flex items-center">
-      <button 
-        onClick={toggleOrientation} 
+      <button
+        onClick={toggleOrientation}
         title={orientation === 'horizontal' ? 'Switch to vertical layout' : 'Switch to horizontal layout'}
       >
         {orientation === 'horizontal' ? (
@@ -81,4 +81,4 @@ const ResponseLayoutToggle = () => {
   );
 };
 
-export default ResponseLayoutToggle;
\ No newline at end of file
+export default ResponseLayoutToggle;
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/index.spec.js b/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/index.spec.js
index 0dd1c7b1a..3131c3247 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/index.spec.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseLayoutToggle/index.spec.js
@@ -1,6 +1,6 @@
 import '@testing-library/jest-dom';
 import React from 'react';
-import { render, screen, fireEvent} from '@testing-library/react';
+import { render, screen, fireEvent } from '@testing-library/react';
 import { Provider } from 'react-redux';
 import { ThemeProvider } from 'providers/Theme';
 import { configureStore, createSlice } from '@reduxjs/toolkit';
@@ -24,12 +24,12 @@ const mockLocalStorage = {
 beforeAll(() => {
   Object.defineProperty(window, 'matchMedia', {
     writable: true,
-    value: jest.fn().mockImplementation(query => ({
+    value: jest.fn().mockImplementation((query) => ({
       matches: false,
       media: query,
       addEventListener: jest.fn(),
       removeEventListener: jest.fn()
-    })),
+    }))
   });
   Object.defineProperty(window, 'localStorage', {
     value: mockLocalStorage
@@ -110,10 +110,10 @@ describe('ResponseLayoutToggle', () => {
     it('should switch to vertical layout when clicked in horizontal mode', () => {
       const { store } = renderWithProviders(<ResponseLayoutToggle />);
       const button = screen.getByRole('button');
-      
+
       // Initial state check
       expect(button).toHaveAttribute('title', 'Switch to vertical layout');
-      
+
       fireEvent.click(button);
 
       // Check if action was called
@@ -146,10 +146,10 @@ describe('ResponseLayoutToggle', () => {
       };
       const { store } = renderWithProviders(<ResponseLayoutToggle />, customState);
       const button = screen.getByRole('button');
-      
+
       // Initial state check
       expect(button).toHaveAttribute('title', 'Switch to horizontal layout');
-      
+
       fireEvent.click(button);
 
       // Check if action was called
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseSave/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseSave/StyledWrapper.js
index 8c32a8bab..73c1ba290 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseSave/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseSave/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
   color: ${(props) => props.theme.requestTabPanel.responseStatus};
 `;
 
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseSave/index.js b/packages/bruno-app/src/components/ResponsePane/ResponseSave/index.js
index 15eef651b..c791463cd 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseSave/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseSave/index.js
@@ -4,11 +4,13 @@ import toast from 'react-hot-toast';
 import get from 'lodash/get';
 import { IconDownload } from '@tabler/icons';
 
-const ResponseSave = ({ item }) => {
+const ResponseSave = ({ item, asDropdownItem, onClose }) => {
   const { ipcRenderer } = window;
   const response = item.response || {};
 
   const saveResponseToFile = () => {
+    if (!response.dataBuffer) return;
+    if (onClose) onClose();
     return new Promise((resolve, reject) => {
       ipcRenderer
         .invoke('renderer:save-response-to-file', response, item?.requestSent?.url, item.pathname)
@@ -20,6 +22,20 @@ const ResponseSave = ({ item }) => {
     });
   };
 
+  if (asDropdownItem) {
+    return (
+      <div
+        className="dropdown-item"
+        onClick={saveResponseToFile}
+        disabled={!response.dataBuffer}
+        style={!response.dataBuffer ? { opacity: 0.5, cursor: 'not-allowed' } : {}}
+      >
+        <IconDownload size={16} strokeWidth={1.5} className="icon mr-2" />
+        Download
+      </div>
+    );
+  }
+
   return (
     <StyledWrapper className="ml-2 flex items-center">
       <button onClick={saveResponseToFile} disabled={!response.dataBuffer} title="Save response to file">
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseSize/ResponseSize.spec.js b/packages/bruno-app/src/components/ResponsePane/ResponseSize/ResponseSize.spec.js
index 7ef288417..22b0182ee 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseSize/ResponseSize.spec.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseSize/ResponseSize.spec.js
@@ -8,6 +8,11 @@ import ResponseSize from './index';
 const theme = {
   requestTabPanel: {
     responseStatus: '#666'
+  },
+  font: {
+    size: {
+      sm: '0.75rem'
+    }
   }
 };
 
@@ -53,7 +58,7 @@ describe('ResponseSize', () => {
     });
 
     it('should not render when size is an object', () => {
-      const { container } = renderWithTheme(<ResponseSize size={{value: 1024}} />);
+      const { container } = renderWithTheme(<ResponseSize size={{ value: 1024 }} />);
       expect(container).toBeEmptyDOMElement();
     });
   });
@@ -111,4 +116,4 @@ describe('ResponseSize', () => {
       expect(element).toHaveAttribute('title', `${size.toLocaleString()}B`);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseSize/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseSize/StyledWrapper.js
index ea9701178..13bf109f6 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseSize/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseSize/StyledWrapper.js
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.75rem;
-  font-weight: 600;
+  font-size: ${(props) => props.theme.font.size.sm};
+  font-weight: 500;
   color: ${(props) => props.theme.requestTabPanel.responseStatus};
 `;
 
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseSize/index.js b/packages/bruno-app/src/components/ResponsePane/ResponseSize/index.js
index fcdeaaca3..7707669c4 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseSize/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseSize/index.js
@@ -2,7 +2,6 @@ import React from 'react';
 import StyledWrapper from './StyledWrapper';
 
 const ResponseSize = ({ size }) => {
-
   if (!Number.isFinite(size)) {
     return null;
   }
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseStopWatch/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseStopWatch/StyledWrapper.js
new file mode 100644
index 000000000..ba919c56f
--- /dev/null
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseStopWatch/StyledWrapper.js
@@ -0,0 +1,10 @@
+import styled from 'styled-components';
+
+const Wrapper = styled.div`
+  font-size: ${(props) => props.theme.font.size.sm};
+  font-weight: 500;
+  color: ${(props) => props.theme.requestTabPanel.responseStatus};
+  text-align: center;
+`;
+
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseStopWatch/index.js b/packages/bruno-app/src/components/ResponsePane/ResponseStopWatch/index.js
new file mode 100644
index 000000000..f434baccc
--- /dev/null
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseStopWatch/index.js
@@ -0,0 +1,27 @@
+import React, { useState, useEffect } from 'react';
+import StyledWrapper from './StyledWrapper';
+
+const ResponseStopWatch = ({ startMillis }) => {
+  const [milliseconds, setMilliseconds] = useState(startMillis);
+
+  const tickInterval = 100;
+  const tick = () => {
+    setMilliseconds((_milliseconds) => _milliseconds + tickInterval);
+  };
+
+  useEffect(() => {
+    let timerID = setInterval(() => {
+      tick();
+    }, tickInterval);
+    return () => {
+      clearInterval(timerID);
+    };
+  }, []);
+
+  let seconds = milliseconds / 1000;
+  let secondsFormatted = `${seconds.toFixed(1)}s`;
+  let width = secondsFormatted.length * 0.4; // Calculate width manually to stop parent layout from "flickering" by changing width too fast
+  return <StyledWrapper className="ml-4" style={{ width: `${width}rem` }}>{secondsFormatted}</StyledWrapper>;
+};
+
+export default React.memo(ResponseStopWatch);
diff --git a/packages/bruno-app/src/components/ResponsePane/ResponseTime/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ResponseTime/StyledWrapper.js
index ea9701178..13bf109f6 100644
--- a/packages/bruno-app/src/components/ResponsePane/ResponseTime/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/ResponseTime/StyledWrapper.js
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.75rem;
-  font-weight: 600;
+  font-size: ${(props) => props.theme.font.size.sm};
+  font-weight: 500;
   color: ${(props) => props.theme.requestTabPanel.responseStatus};
 `;
 
diff --git a/packages/bruno-app/src/components/ResponsePane/RunnerTimeline/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/RunnerTimeline/StyledWrapper.js
index 4b7cb28a7..ed248cc11 100644
--- a/packages/bruno-app/src/components/ResponsePane/RunnerTimeline/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/RunnerTimeline/StyledWrapper.js
@@ -17,27 +17,27 @@ const StyledWrapper = styled.div`
   }
 
   .method-label {
-    font-weight: 600;
+    font-weight: 500;
   }
 
   .status-code {
-    font-weight: 600;
+    font-weight: 500;
   }
 
   .url-text {
     color: ${(props) => props.theme.colors.text.muted};
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
     margin-top: 0.25rem;
   }
 
   .timestamp {
     color: ${(props) => props.theme.colors.text.muted};
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .meta-info {
     color: ${(props) => props.theme.colors.text.muted};
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .oauth-section {
@@ -45,7 +45,7 @@ const StyledWrapper = styled.div`
       display: flex;
       align-items: center;
       color: ${(props) => props.theme.text};
-      font-weight: 600;
+      font-weight: 500;
 
       span {
         margin-left: 0.5rem;
@@ -119,7 +119,7 @@ const StyledWrapper = styled.div`
   }
     
   .request-label {
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.base};
     padding: 2px 6px;
     border-radius: 3px;
     margin-left: 8px;
@@ -129,7 +129,7 @@ const StyledWrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -139,7 +139,7 @@ const StyledWrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
diff --git a/packages/bruno-app/src/components/ResponsePane/RunnerTimeline/index.js b/packages/bruno-app/src/components/ResponsePane/RunnerTimeline/index.js
index 4fac7ed6d..8c3e839aa 100644
--- a/packages/bruno-app/src/components/ResponsePane/RunnerTimeline/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/RunnerTimeline/index.js
@@ -31,7 +31,7 @@ const RunnerTimeline = ({ request = {}, response = {}, item, collection }) => {
         collection={collection}
         hideTimestamp={true}
       />
-      
+
       {oauth2Events.map((event, index) => {
         const { data, timestamp } = event;
         const { debugInfo } = data;
@@ -45,7 +45,7 @@ const RunnerTimeline = ({ request = {}, response = {}, item, collection }) => {
             <div className="mt-2">
               {debugInfo && debugInfo.length > 0 ? (
                 debugInfo.map((data, idx) => (
-                  <div key={idx} className='ml-4'>
+                  <div key={idx} className="ml-4">
                     <TimelineItem
                       timestamp={timestamp}
                       request={data?.request}
diff --git a/packages/bruno-app/src/components/ResponsePane/ScriptError/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/ScriptError/StyledWrapper.js
index c4a38e80f..79a4668df 100644
--- a/packages/bruno-app/src/components/ResponsePane/ScriptError/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/ScriptError/StyledWrapper.js
@@ -37,14 +37,14 @@ const StyledWrapper = styled.div`
   }
   
   .error-title {
-    font-weight: 600;
+    font-weight: 500;
     margin-bottom: 0.375rem;
     color: ${(props) => props.theme.colors.text.danger};
   }
   
   .error-message {
     font-family: monospace;
-    font-size: 0.6875rem;
+    font-size: ${(props) => props.theme.font.size.xs};
     line-height: 1.25rem;
     white-space: pre-wrap;
     word-break: break-all;
@@ -52,4 +52,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/ResponsePane/ScriptError/index.js b/packages/bruno-app/src/components/ResponsePane/ScriptError/index.js
index 1db032d2e..72b717512 100644
--- a/packages/bruno-app/src/components/ResponsePane/ScriptError/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/ScriptError/index.js
@@ -2,37 +2,36 @@ import React from 'react';
 import { IconX } from '@tabler/icons';
 import StyledWrapper from './StyledWrapper';
 
-
 const ScriptError = ({ item, onClose }) => {
   const preRequestError = item?.preRequestScriptErrorMessage;
   const postResponseError = item?.postResponseScriptErrorMessage;
   const testScriptError = item?.testScriptErrorMessage;
-  
+
   if (!preRequestError && !postResponseError && !testScriptError) return null;
-  
+
   const errors = [];
-  
+
   if (preRequestError) {
     errors.push({
       title: 'Pre-Request Script Error',
       message: preRequestError
     });
   }
-  
+
   if (postResponseError) {
     errors.push({
-      title: 'Post-Response Script Error', 
+      title: 'Post-Response Script Error',
       message: postResponseError
     });
   }
-  
+
   if (testScriptError) {
     errors.push({
       title: 'Test Script Error',
       message: testScriptError
     });
   }
-  
+
   return (
     <StyledWrapper className="mt-4 mb-2">
       <div className="flex items-start gap-3 px-4 py-3">
@@ -49,7 +48,7 @@ const ScriptError = ({ item, onClose }) => {
             </div>
           ))}
         </div>
-        <div 
+        <div
           className="close-button flex-shrink-0 cursor-pointer"
           onClick={onClose}
         >
@@ -60,4 +59,4 @@ const ScriptError = ({ item, onClose }) => {
   );
 };
 
-export default ScriptError; 
\ No newline at end of file
+export default ScriptError;
diff --git a/packages/bruno-app/src/components/ResponsePane/ScriptErrorIcon/index.js b/packages/bruno-app/src/components/ResponsePane/ScriptErrorIcon/index.js
index 208a49ffd..41420eeb0 100644
--- a/packages/bruno-app/src/components/ResponsePane/ScriptErrorIcon/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/ScriptErrorIcon/index.js
@@ -4,10 +4,10 @@ import ToolHint from 'components/ToolHint';
 
 const ScriptErrorIcon = ({ itemUid, onClick }) => {
   const toolhintId = `script-error-icon-${itemUid}`;
-  
+
   return (
     <>
-      <div 
+      <div
         id={toolhintId}
         className="cursor-pointer ml-2"
         onClick={onClick}
@@ -25,4 +25,4 @@ const ScriptErrorIcon = ({ itemUid, onClick }) => {
   );
 };
 
-export default ScriptErrorIcon; 
\ No newline at end of file
+export default ScriptErrorIcon;
diff --git a/packages/bruno-app/src/components/ResponsePane/SkippedRequest/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/SkippedRequest/StyledWrapper.js
index a7049ad6b..922798c17 100644
--- a/packages/bruno-app/src/components/ResponsePane/SkippedRequest/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/SkippedRequest/StyledWrapper.js
@@ -8,4 +8,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/ResponsePane/SkippedRequest/index.js b/packages/bruno-app/src/components/ResponsePane/SkippedRequest/index.js
index 684dc3c37..64d9d76fd 100644
--- a/packages/bruno-app/src/components/ResponsePane/SkippedRequest/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/SkippedRequest/index.js
@@ -15,4 +15,4 @@ const SkippedRequest = () => {
   );
 };
 
-export default SkippedRequest;
\ No newline at end of file
+export default SkippedRequest;
diff --git a/packages/bruno-app/src/components/ResponsePane/StatusCode/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/StatusCode/StyledWrapper.js
index 0633fac1e..a4a03f82d 100644
--- a/packages/bruno-app/src/components/ResponsePane/StatusCode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/StatusCode/StyledWrapper.js
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.75rem;
-  font-weight: 600;
+  font-size: ${(props) => props.theme.font.size.sm};
+  font-weight: 500;
 
   &.text-ok {
     color: ${(props) => props.theme.requestTabPanel.responseOk};
diff --git a/packages/bruno-app/src/components/ResponsePane/StatusCode/get-status-code-phrase.js b/packages/bruno-app/src/components/ResponsePane/StatusCode/get-status-code-phrase.js
index c90ff7cc7..e5c7659fb 100644
--- a/packages/bruno-app/src/components/ResponsePane/StatusCode/get-status-code-phrase.js
+++ b/packages/bruno-app/src/components/ResponsePane/StatusCode/get-status-code-phrase.js
@@ -41,7 +41,7 @@ const statusCodePhraseMap = {
   415: 'Unsupported Media Type',
   416: 'Range Not Satisfiable',
   417: 'Expectation Failed',
-  418: "I'm a teapot",
+  418: 'I\'m a teapot',
   421: 'Misdirected Request',
   422: 'Unprocessable Entity',
   423: 'Locked',
diff --git a/packages/bruno-app/src/components/ResponsePane/StatusCode/index.js b/packages/bruno-app/src/components/ResponsePane/StatusCode/index.js
index 222aad9e8..302b9a5e2 100644
--- a/packages/bruno-app/src/components/ResponsePane/StatusCode/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/StatusCode/index.js
@@ -4,7 +4,7 @@ import statusCodePhraseMap from './get-status-code-phrase';
 import StyledWrapper from './StyledWrapper';
 
 // Todo: text-error class is not getting pulled in for 500 errors
-const StatusCode = ({ status, statusText }) => {
+const StatusCode = ({ status, statusText, isStreaming }) => {
   const getTabClassname = (status) => {
     return classnames('ml-2', {
       'text-ok': status >= 100 && status < 200,
@@ -17,7 +17,7 @@ const StatusCode = ({ status, statusText }) => {
 
   return (
     <StyledWrapper className={`response-status-code ${getTabClassname(status)}`} data-testid="response-status-code">
-      {status} {statusText || statusCodePhraseMap[status]}
+      {status} {statusText || statusCodePhraseMap[status]} {isStreaming ? ' - STREAMING' : null}
     </StyledWrapper>
   );
 };
diff --git a/packages/bruno-app/src/components/ResponsePane/TestResults/index.js b/packages/bruno-app/src/components/ResponsePane/TestResults/index.js
index 624de837d..08770e6f9 100644
--- a/packages/bruno-app/src/components/ResponsePane/TestResults/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/TestResults/index.js
@@ -32,8 +32,7 @@ const ResultItem = ({ result, type }) => (
     <span className={result.status === 'pass' ? 'test-success' : 'test-failure'}>
       {type === 'assertion'
         ? `${result.lhsExpr}: ${result.rhsExpr}`
-        : result.description
-      }
+        : result.description}
     </span>
     <ErrorMessage error={result.error} />
   </div>
@@ -52,16 +51,15 @@ const TestSection = ({
   if (results.length === 0) return null;
 
   return (
-    <div className='mb-4'>
+    <div className="mb-4">
       <div
         className="font-medium test-summary flex items-center cursor-pointer hover:bg-opacity-10 hover:bg-gray-500 rounded py-2"
         onClick={onToggle}
       >
         <span className="dropdown-icon mr-2 flex items-center">
-          {isExpanded ?
-            <IconChevronDown size={18} stroke={1.5} /> :
-            <IconChevronRight size={18} stroke={1.5} />
-          }
+          {isExpanded
+            ? <IconChevronDown size={18} stroke={1.5} />
+            : <IconChevronRight size={18} stroke={1.5} />}
         </span>
         <span className="flex-grow">
           {title} ({results.length}), Passed: {passedResults.length}, Failed: {failedResults.length}
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/GrpcTimelineItem/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/GrpcTimelineItem/index.js
index 0f5c848f5..a42930777 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/GrpcTimelineItem/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/GrpcTimelineItem/index.js
@@ -1,13 +1,13 @@
-import { useState } from "react";
-import { RelativeTime } from "../TimelineItem/Common/Time/index";
-import Status from "../TimelineItem/Common/Status/index";
-import { 
-  IconChevronDown, 
-  IconChevronRight, 
-  IconServer, 
-  IconDatabase, 
-  IconAlertCircle, 
-  IconCircleCheck, 
+import { useState } from 'react';
+import { RelativeTime } from '../TimelineItem/Common/Time/index';
+import Status from '../TimelineItem/Common/Status/index';
+import {
+  IconChevronDown,
+  IconChevronRight,
+  IconServer,
+  IconDatabase,
+  IconAlertCircle,
+  IconCircleCheck,
   IconCircleX,
   IconX,
   IconSend
@@ -27,55 +27,53 @@ const EventTypeIcons = {
 
 // Event type display names
 const EventTypeNames = {
-  metadata: "Metadata",
-  response: "Response Message",
-  request: "Request",
-  message: "Message",
-  status: "Status",
-  error: "Error",
-  end: "Stream Ended",
-  cancel: "Cancelled"
+  metadata: 'Metadata',
+  response: 'Response Message',
+  request: 'Request',
+  message: 'Message',
+  status: 'Status',
+  error: 'Error',
+  end: 'Stream Ended',
+  cancel: 'Cancelled'
 };
 
 // Colors for different event types
 const EventTypeColors = {
-  metadata: "border-blue-500/20",
-  response: "border-green-500/20",
-  request: "border-orange-500/20",
-  message: "border-orange-500/20",
-  status: "border-purple-500/20", 
-  error: "border-red-500/20",
-  end: "border-gray-500/20",
-  cancel: "border-amber-500/20"
+  metadata: 'border-blue-500/20',
+  response: 'border-green-500/20',
+  request: 'border-orange-500/20',
+  message: 'border-orange-500/20',
+  status: 'border-purple-500/20',
+  error: 'border-red-500/20',
+  end: 'border-gray-500/20',
+  cancel: 'border-amber-500/20'
 };
 
 const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData, item }) => {
   const [isCollapsed, setIsCollapsed] = useState(true);
-  const toggleCollapse = () => setIsCollapsed(prev => !prev);
-  
+  const toggleCollapse = () => setIsCollapsed((prev) => !prev);
+
   // Use requestSent if available, otherwise fall back to request
   const effectiveRequest = item.requestSent || request || item.request || {};
-  
+
   // Extract relevant data from request and response
   const { method, url = '' } = effectiveRequest;
   const { statusCode, statusText, duration } = response || {};
-  
+
   // Get event-specific icon and color
   const eventIcon = EventTypeIcons[eventType] || <IconDatabase size={16} strokeWidth={1.5} />;
-  const eventColor = EventTypeColors[eventType] || "border-gray-500/50";
-  const eventName = EventTypeNames[eventType] || "Event";
+  const eventColor = EventTypeColors[eventType] || 'border-gray-500/50';
+  const eventName = EventTypeNames[eventType] || 'Event';
 
-  
   // Render appropriate content based on event type
   const renderEventContent = () => {
-  
     const isClientStreaming = effectiveRequest.methodType === 'client-streaming' || effectiveRequest.methodType === 'bidi-streaming';
 
-    switch(eventType) {
+    switch (eventType) {
       case 'request':
         return (
           <div className="mt-2 bg-orange-50 dark:bg-orange-900/10 rounded p-2">
-                        
+
             {effectiveRequest.headers && Object.keys(effectiveRequest.headers).length > 0 && (
               <div className="mb-3">
                 <div className="text-xs font-medium mb-1 text-orange-700 dark:text-orange-400">Metadata</div>
@@ -89,7 +87,7 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
                 </div>
               </div>
             )}
-            
+
             {/* gRPC Messages section */}
             {!isClientStreaming && effectiveRequest.body?.mode === 'grpc' && effectiveRequest.body?.grpc?.length > 0 && (
               <div>
@@ -100,8 +98,8 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
                   {effectiveRequest.body.grpc.filter((_, index) => index === 0).map((message, idx) => (
                     <div key={idx} className="bg-white dark:bg-gray-800 p-2 rounded">
                       <pre className="text-xs overflow-auto max-h-[150px]">
-                        {typeof message.content === 'string' 
-                          ? message.content 
+                        {typeof message.content === 'string'
+                          ? message.content
                           : JSON.stringify(message.content, null, 2)}
                       </pre>
                     </div>
@@ -115,19 +113,19 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
       case 'message':
         return (
           <div className="mt-2 bg-orange-50 dark:bg-orange-900/10 rounded p-2">
-            <div className="font-semibold mb-1 text-orange-700 dark:text-orange-400">Message</div>
+            <div className="font-medium mb-1 text-orange-700 dark:text-orange-400">Message</div>
             <pre className="text-xs bg-white dark:bg-gray-800 p-2 rounded overflow-auto max-h-[200px]">
-                {typeof eventData === 'string' 
-                  ? eventData 
-                  : JSON.stringify(eventData, null, 2)}
-              </pre> 
+              {typeof eventData === 'string'
+                ? eventData
+                : JSON.stringify(eventData, null, 2)}
+            </pre>
           </div>
         );
 
       case 'metadata':
         return (
           <div className="mt-2 bg-blue-50 dark:bg-blue-900/10 rounded p-2">
-            <div className="font-semibold mb-1 text-blue-700 dark:text-blue-400">Metadata Headers</div>
+            <div className="font-medium mb-1 text-blue-700 dark:text-blue-400">Metadata Headers</div>
             {response.metadata && response.metadata.length > 0 ? (
               <div className="grid grid-cols-2 gap-1">
                 {response.metadata.map((header, idx) => (
@@ -138,16 +136,16 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
                 ))}
               </div>
             ) : (
-              <div className="text-sm italic text-gray-500">No metadata headers</div>
+              <div className="italic text-gray-500">No metadata headers</div>
             )}
           </div>
         );
-        
+
       case 'response':
         // For message responses, show the response data
         return (
           <div className="mt-2 bg-green-50 dark:bg-green-900/10 rounded p-2">
-            <div className="font-semibold mb-1 text-green-700 dark:text-green-400">
+            <div className="font-medium mb-1 text-green-700 dark:text-green-400">
               Response Message #{(response?.responses?.length) || 0}
             </div>
             {response?.responses && response.responses.length > 0 ? (
@@ -155,11 +153,11 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
                 {JSON.stringify(response.responses[response.responses.length - 1], null, 2)}
               </pre>
             ) : (
-              <div className="text-sm italic text-gray-500">Empty message</div>
+              <div className="italic text-gray-500">Empty message</div>
             )}
           </div>
         );
-        
+
       case 'status':
         // For status events, show status and trailers
         return (
@@ -167,14 +165,14 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
             <div className="flex items-center gap-2 mb-1">
               <Status statusCode={statusCode} statusText={statusText} />
             </div>
-            
+
             {response.statusDescription && (
-              <div className="text-sm mb-2">{response.statusDescription}</div>
+              <div className="mb-2">{response.statusDescription}</div>
             )}
-            
+
             {response.trailers && response.trailers.length > 0 && (
               <>
-                <div className="font-semibold text-sm mt-2 mb-1 text-purple-700 dark:text-purple-400">Trailers</div>
+                <div className="font-medium mt-2 mb-1 text-purple-700 dark:text-purple-400">Trailers</div>
                 <div className="grid grid-cols-2 gap-1">
                   {response.trailers.map((trailer, idx) => (
                     <div key={idx} className="contents">
@@ -187,21 +185,21 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
             )}
           </div>
         );
-        
+
       case 'error':
         // For error events, show error details
         return (
           <div className="mt-2 bg-red-50 dark:bg-red-900/10 rounded p-2">
-            <div className="font-semibold mb-1 text-red-700 dark:text-red-400">Error</div>
-            <div className="text-sm mb-2">{response.error || "Unknown error"}</div>
-            
+            <div className="font-medium mb-1 text-red-700 dark:text-red-400">Error</div>
+            <div className="mb-2">{response.error || 'Unknown error'}</div>
+
             <div className="flex items-center gap-2">
               <Status statusCode={statusCode} statusText={statusText} />
             </div>
-            
+
             {response.trailers && response.trailers.length > 0 && (
               <>
-                <div className="font-semibold text-sm mt-2 mb-1 text-red-700 dark:text-red-400">Error Metadata</div>
+                <div className="font-medium mt-2 mb-1 text-red-700 dark:text-red-400">Error Metadata</div>
                 <div className="grid grid-cols-2 gap-1">
                   {response.trailers.map((trailer, idx) => (
                     <div key={idx} className="contents">
@@ -214,27 +212,27 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
             )}
           </div>
         );
-        
+
       case 'end':
         // For end events, show summary
         return (
           <div className="mt-2 bg-gray-50 dark:bg-gray-700/30 rounded p-2">
-            <div className="font-semibold mb-1">Stream Ended</div>
-            <div className="text-sm">
+            <div className="font-medium mb-1">Stream Ended</div>
+            <div>
               Total messages: {(response?.responses?.length) || 0}
             </div>
           </div>
         );
-        
+
       case 'cancel':
         // For cancel events, show cancellation info
         return (
           <div className="mt-2 bg-amber-50 dark:bg-amber-900/10 rounded p-2">
-            <div className="font-semibold mb-1 text-amber-700 dark:text-amber-400">Stream Cancelled</div>
-            <div className="text-sm">{response.statusDescription || "The gRPC stream was cancelled"}</div>
+            <div className="font-medium mb-1 text-amber-700 dark:text-amber-400">Stream Cancelled</div>
+            <div>{response.statusDescription || 'The gRPC stream was cancelled'}</div>
           </div>
         );
-        
+
       default:
         return null;
     }
@@ -242,10 +240,10 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
 
   return (
     <div className={`border-l-4 ${eventColor} pl-3 py-2 mb-3`}>
-      <div className={`flex items-center gap-2 cursor-pointer`} onClick={toggleCollapse}>
+      <div className="flex items-center gap-2 cursor-pointer" onClick={toggleCollapse}>
         {isCollapsed ? <IconChevronRight size={16} strokeWidth={1.5} /> : <IconChevronDown size={16} strokeWidth={1.5} />}
         {eventIcon}
-        <span className="font-medium text-sm">{eventName}</span>
+        <span className="font-medium">{eventName}</span>
         {eventType === 'request' && effectiveRequest.methodType && (
           <span className="px-2 py-0.5 text-xs rounded bg-orange-100 dark:bg-orange-800/30 text-orange-700 dark:text-orange-300">
             {effectiveRequest.methodType}
@@ -261,14 +259,14 @@ const GrpcTimelineItem = ({ timestamp, request, response, eventType, eventData,
           <RelativeTime timestamp={timestamp} />
         </span>
       </div>
-      
+
       {/* Always show the URL */}
       <div className="text-xs text-gray-500 mt-1 ml-6">{url}</div>
-      
+
       {/* Expanded content - only show for non-status items */}
       {!isCollapsed && renderEventContent()}
     </div>
   );
 };
 
-export default GrpcTimelineItem; 
\ No newline at end of file
+export default GrpcTimelineItem;
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/Timeline/StyledWrapper.js
index 263d45245..1c4ed9a82 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/StyledWrapper.js
@@ -26,27 +26,27 @@ const StyledWrapper = styled.div`
   }
 
   .method-label {
-    font-weight: 600;
+    font-weight: 500;
   }
 
   .status-code {
-    font-weight: 600;
+    font-weight: 500;
   }
 
   .url-text {
     color: ${(props) => props.theme.colors.text.muted};
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
     margin-top: 0.25rem;
   }
 
   .timestamp {
     color: ${(props) => props.theme.colors.text.muted};
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .meta-info {
     color: ${(props) => props.theme.colors.text.muted};
-    font-size: 0.875rem;
+    font-size: ${(props) => props.theme.font.size.base};
   }
 
   .oauth-section {
@@ -54,7 +54,7 @@ const StyledWrapper = styled.div`
       display: flex;
       align-items: center;
       color: ${(props) => props.theme.text};
-      font-weight: 600;
+      font-weight: 500;
 
       span {
         margin-left: 0.5rem;
@@ -128,7 +128,7 @@ const StyledWrapper = styled.div`
   }
     
   .request-label {
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.base};
     padding: 2px 6px;
     border-radius: 3px;
     margin-left: 8px;
@@ -138,7 +138,7 @@ const StyledWrapper = styled.div`
   table {
     width: 100%;
     border-collapse: collapse;
-    font-weight: 600;
+    font-weight: 500;
     table-layout: fixed;
 
     thead,
@@ -148,7 +148,7 @@ const StyledWrapper = styled.div`
 
     thead {
       color: ${(props) => props.theme.table.thead.color};
-      font-size: 0.8125rem;
+      font-size: ${(props) => props.theme.font.size.base};
       user-select: none;
     }
     td {
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Body/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Body/index.js
index 683c82bba..111ec6bb7 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Body/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Body/index.js
@@ -1,36 +1,36 @@
-import QueryResult from "components/ResponsePane/QueryResult/index";
-import { useState } from "react";
+import QueryResult from 'components/ResponsePane/QueryResult/index';
+import { useState } from 'react';
 
 const BodyBlock = ({ collection, data, dataBuffer, headers, error, item }) => {
   const [isBodyCollapsed, toggleBody] = useState(true);
   return (
     <div className="collapsible-section">
-    <div className="section-header" onClick={() => toggleBody(!isBodyCollapsed)}>
-      <pre className="flex flex-row items-center text-indigo-500/80 dark:text-indigo-500/80">
-        <div className="opacity-70">{isBodyCollapsed ? '▼' : '▶'}</div> Body
-      </pre>
-    </div>
-    {isBodyCollapsed && (
-      <div className="mt-2">
-        {data || dataBuffer ? (
-          <div className="h-96 overflow-auto">
-            <QueryResult
-              item={item}
-              collection={collection}
-              data={data}
-              dataBuffer={dataBuffer}
-              headers={headers}
-              error={error}
-              key={item?.uid}
-            />
-          </div>
-        ) : (
-          <div className="text-gray-500">No Body found</div>
-        )}
+      <div className="section-header" onClick={() => toggleBody(!isBodyCollapsed)}>
+        <pre className="flex flex-row items-center text-indigo-500/80 dark:text-indigo-500/80">
+          <div className="opacity-70">{isBodyCollapsed ? '▼' : '▶'}</div> Body
+        </pre>
       </div>
-    )}
-  </div>
-  )
-}
+      {isBodyCollapsed && (
+        <div className="mt-2">
+          {data || dataBuffer ? (
+            <div className="h-96 overflow-auto">
+              <QueryResult
+                item={item}
+                collection={collection}
+                data={data}
+                dataBuffer={dataBuffer}
+                headers={headers}
+                error={error}
+                key={item?.uid}
+              />
+            </div>
+          ) : (
+            <div className="text-gray-500">No Body found</div>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
 
-export default BodyBlock;
\ No newline at end of file
+export default BodyBlock;
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Headers/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Headers/index.js
index bb8448f70..4f28cf6e8 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Headers/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Headers/index.js
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState } from 'react';
 
 const HeadersBlock = ({ headers, type }) => {
   const [areHeadersCollapsed, toggleHeaders] = useState(true);
@@ -8,27 +8,25 @@ const HeadersBlock = ({ headers, type }) => {
       <div className="section-header" onClick={() => toggleHeaders(!areHeadersCollapsed)}>
         <pre className="flex flex-row items-center text-indigo-500/80 dark:text-indigo-500/80">
           <div className="opacity-70">{areHeadersCollapsed ? '▼' : '▶'}</div> Headers
-          {headers && Object.keys(headers).length > 0 && 
-            <div className="ml-1">({Object.keys(headers).length})</div>
-          }
+          {headers && Object.keys(headers).length > 0
+            && <div className="ml-1">({Object.keys(headers).length})</div>}
         </pre>
       </div>
       {areHeadersCollapsed && (
         <div className="mt-1">
-          {headers && Object.keys(headers).length > 0 
+          {headers && Object.keys(headers).length > 0
             ? <Headers headers={headers} type={type} />
-            : <div className="text-gray-500">No Headers found</div>
-          }
+            : <div className="text-gray-500">No Headers found</div>}
         </div>
       )}
     </div>
-  )
+  );
 };
 
 const Headers = ({ headers, type }) => {
   if (Array.isArray(headers)) {
     return (
-      <div className="mt-1 text-sm">
+      <div className="mt-1">
         {headers.map((header, index) => (
           <pre key={index} className="mb-1 whitespace-pre-wrap">
             {type === 'request' ? '>' : '<'}&nbsp;<span className="opacity-60">{header?.name}:</span>
@@ -39,7 +37,7 @@ const Headers = ({ headers, type }) => {
     );
   } else {
     return (
-      <div className="mt-1 text-sm">
+      <div className="mt-1">
         {Object.entries(headers).map(([key, value], index) => (
           <pre key={index} className="mb-1 whitespace-pre-wrap">
             {type === 'request' ? '>' : '<'}&nbsp;<span className="opacity-60">{key}:</span>
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Method/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Method/index.js
index 1e0b22d3a..3f3cf7d36 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Method/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Method/index.js
@@ -3,8 +3,8 @@ const Method = ({ method }) => {
     <span className={`${methodColors[method?.toUpperCase()] || 'text-white'} font-bold`}>
       {method?.toUpperCase()}
     </span>
-  )  
-}
+  );
+};
 
 const methodColors = {
   GET: 'text-green-500',
@@ -13,7 +13,7 @@ const methodColors = {
   DELETE: 'text-red-500',
   PATCH: 'text-purple-500',
   OPTIONS: 'text-gray-500',
-  HEAD: 'text-gray-500',
+  HEAD: 'text-gray-500'
 };
 
-export default Method;
\ No newline at end of file
+export default Method;
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Status/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Status/index.js
index 8c0094120..0d96a8e4c 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Status/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Status/index.js
@@ -8,8 +8,8 @@ const Status = ({ statusCode, statusText }) => {
       {statusCode}{' '}
       {statusText || ''}
     </span>
-  )
-}
+  );
+};
 
 const statusColor = (statusCode) => {
   if (statusCode >= 200 && statusCode < 300) {
@@ -23,4 +23,4 @@ const statusColor = (statusCode) => {
   }
 };
 
-export default Status;
\ No newline at end of file
+export default Status;
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Time/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Time/index.js
index d4fd0ec07..3f882ba39 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Time/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Common/Time/index.js
@@ -1,36 +1,36 @@
-import { useState, useEffect } from "react";
+import { useState, useEffect } from 'react';
 
 const getRelativeTime = (date) => {
-    const rtf = new Intl.RelativeTimeFormat('en', { numeric: 'auto' });
-    const diff = (date - new Date()) / 1000;
+  const rtf = new Intl.RelativeTimeFormat('en', { numeric: 'auto' });
+  const diff = (date - new Date()) / 1000;
 
-    const timeUnits = [
-        { unit: 'year', seconds: 31536000 },
-        { unit: 'month', seconds: 2592000 },
-        { unit: 'week', seconds: 604800 },
-        { unit: 'day', seconds: 86400 },
-        { unit: 'hour', seconds: 3600 },
-        { unit: 'minute', seconds: 60 },
-        { unit: 'second', seconds: 1 }
-    ];
+  const timeUnits = [
+    { unit: 'year', seconds: 31536000 },
+    { unit: 'month', seconds: 2592000 },
+    { unit: 'week', seconds: 604800 },
+    { unit: 'day', seconds: 86400 },
+    { unit: 'hour', seconds: 3600 },
+    { unit: 'minute', seconds: 60 },
+    { unit: 'second', seconds: 1 }
+  ];
 
-    for (const { unit, seconds } of timeUnits) {
-        if (Math.abs(diff) >= seconds || unit === 'second') {
-            return rtf.format(Math.round(diff / seconds), unit);
-        }
+  for (const { unit, seconds } of timeUnits) {
+    if (Math.abs(diff) >= seconds || unit === 'second') {
+      return rtf.format(Math.round(diff / seconds), unit);
     }
+  }
 };
 
 export const RelativeTime = ({ timestamp }) => {
-    const [relativeTime, setRelativeTime] = useState(getRelativeTime(new Date(timestamp)));
+  const [relativeTime, setRelativeTime] = useState(getRelativeTime(new Date(timestamp)));
 
-    useEffect(() => {
-        const interval = setInterval(() => {
-            setRelativeTime(getRelativeTime(new Date(timestamp)));
-        }, 1000);
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setRelativeTime(getRelativeTime(new Date(timestamp)));
+    }, 1000);
 
-        return () => clearInterval(interval);
-    }, [timestamp]);
+    return () => clearInterval(interval);
+  }, [timestamp]);
 
-    return <pre className="text-xs">{relativeTime}</pre>;
+  return <pre className="text-xs">{relativeTime}</pre>;
 };
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Network/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Network/index.js
index 25d704e63..d9d0e71a4 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Network/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Network/index.js
@@ -8,15 +8,17 @@ const Network = ({ logs }) => {
           }
           const nextLog = logs[index + 1];
           const isSameLogType = nextLog?.type === currentLog?.type;
-          return <>
-            <NetworkLogsEntry key={index} entry={currentLog} />
-              {!isSameLogType && <div className="mt-4"/>}
-            </>;
+          return (
+            <>
+              <NetworkLogsEntry key={index} entry={currentLog} />
+              {!isSameLogType && <div className="mt-4" />}
+            </>
+          );
         })}
       </pre>
     </div>
-  )
-}
+  );
+};
 
 const NetworkLogsEntry = ({ entry }) => {
   const { type, message } = entry;
@@ -50,5 +52,4 @@ const NetworkLogsEntry = ({ entry }) => {
   );
 };
 
-
-export default Network;
\ No newline at end of file
+export default Network;
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Request/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Request/index.js
index 053be2916..51ce28bf0 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Request/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Request/index.js
@@ -1,5 +1,5 @@
-import Headers from "../Common/Headers/index";
-import BodyBlock from "../Common/Body/index";
+import Headers from '../Common/Headers/index';
+import BodyBlock from '../Common/Body/index';
 
 const safeStringifyJSONIfNotString = (obj) => {
   if (obj === null || obj === undefined) return '';
@@ -15,9 +15,8 @@ const safeStringifyJSONIfNotString = (obj) => {
   }
 };
 
-
 const Request = ({ collection, request, item }) => {
-  let { url, headers, data, dataBuffer, error } = request || {};  
+  let { url, headers, data, dataBuffer, error } = request || {};
   if (!dataBuffer) {
     dataBuffer = Buffer.from(safeStringifyJSONIfNotString(data))?.toString('base64');
   }
@@ -30,12 +29,12 @@ const Request = ({ collection, request, item }) => {
       </div>
 
       {/* Headers */}
-      <Headers headers={headers} type={'request'} />
+      <Headers headers={headers} type="request" />
 
       {/* Body */}
       <BodyBlock collection={collection} data={data} dataBuffer={dataBuffer} error={error} headers={headers} item={item} />
-  </div>
-  )
-}
+    </div>
+  );
+};
 
-export default Request;
\ No newline at end of file
+export default Request;
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Response/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Response/index.js
index 9a72c8856..4c595f29c 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Response/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/Response/index.js
@@ -1,6 +1,6 @@
-import BodyBlock from "../Common/Body/index";
-import Headers from "../Common/Headers/index";
-import Status from "../Common/Status/index";
+import BodyBlock from '../Common/Body/index';
+import Headers from '../Common/Headers/index';
+import Status from '../Common/Status/index';
 
 const safeStringifyJSONIfNotString = (obj) => {
   if (obj === null || obj === undefined) return '';
@@ -24,20 +24,20 @@ const Response = ({ collection, response, item }) => {
 
   return (
     <div>
-    {/* Status */}
-    <div className="mb-1">
-      <Status statusCode={status || statusCode} statusText={statusText} />
-      {response.duration && <span className="text-sm text-gray-400 ml-2">{response.duration}ms</span>}
-      {response.size && <span className="text-sm text-gray-400 ml-2">{response.size}B</span>}
+      {/* Status */}
+      <div className="mb-1">
+        <Status statusCode={status || statusCode} statusText={statusText} />
+        {response.duration && <span className="text-gray-400 ml-2">{response.duration}ms</span>}
+        {response.size && <span className="text-gray-400 ml-2">{response.size}B</span>}
+      </div>
+
+      {/* Headers */}
+      <Headers headers={headers} type="response" />
+
+      {/* Body */}
+      <BodyBlock collection={collection} data={data} dataBuffer={dataBuffer} error={error} headers={headers} item={item} />
     </div>
+  );
+};
 
-    {/* Headers */}
-    <Headers headers={headers} type={'response'} />
-
-    {/* Body */}
-    <BodyBlock collection={collection} data={data} dataBuffer={dataBuffer} error={error} headers={headers} item={item} />
-  </div>
-  )
-}
-
-export default Response;
\ No newline at end of file
+export default Response;
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js
index c5fc91295..b680c73ca 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js
@@ -1,21 +1,21 @@
-import { useState } from "react";
-import Network from "./Network/index";
-import Request from "./Request/index";
-import Response from "./Response/index";
-import Method from "./Common/Method/index";
-import Status from "./Common/Status/index";
-import { RelativeTime } from "./Common/Time/index";
+import { useState } from 'react';
+import Network from './Network/index';
+import Request from './Request/index';
+import Response from './Response/index';
+import Method from './Common/Method/index';
+import Status from './Common/Status/index';
+import { RelativeTime } from './Common/Time/index';
 
 const TimelineItem = ({ timestamp, request, response, item, collection, isOauth2, hideTimestamp = false }) => {
   const [isCollapsed, _toggleCollapse] = useState(false);
   const [activeTab, setActiveTab] = useState('request');
-  const toggleCollapse = () => _toggleCollapse(prev => !prev);
+  const toggleCollapse = () => _toggleCollapse((prev) => !prev);
   const { method, status, statusCode, statusText, url = '' } = request || {};
   const { status: responseStatus, statusCode: responseStatusCode, statusText: responseStatusText } = response || {};
   const showNetworkLogs = response.timeline && response.timeline.length > 0;
 
   return (
-    <div className={`border-b-2 ${isOauth2 ? 'border-indigo-700/50' : 'border-amber-700/50' } py-2`}>
+    <div className={`border-b-2 ${isOauth2 ? 'border-indigo-700/50' : 'border-amber-700/50'} py-2`}>
       <div className="oauth-request-item-header relative cursor-pointer" onClick={toggleCollapse}>
         <div className="flex justify-between items-center min-w-0">
           <div className="flex items-center space-x-2 min-w-0">
@@ -26,60 +26,62 @@ const TimelineItem = ({ timestamp, request, response, item, collection, isOauth2
             {!hideTimestamp && (
               <>
                 <pre className="opacity-70">[{new Date(timestamp).toISOString()}]</pre>
-                <span className="text-sm text-gray-400 flex-shrink-0 overflow-hidden text-ellipsis whitespace-nowrap">
+                <span className="text-gray-400 flex-shrink-0 overflow-hidden text-ellipsis whitespace-nowrap">
                   <RelativeTime timestamp={timestamp} />
                 </span>
               </>
             )}
           </div>
         </div>
-        <div className="truncate text-sm mt-1">{url}</div>
+        <div className="truncate mt-1">{url}</div>
       </div>
-      {isCollapsed && (<div className="text-sm overflow-hidden">
-        {/* Tabs */}
-        <div className="tabs-switcher flex mb-4">
-          <button
-            className={`mr-4 ${activeTab === 'request' ? 'active' : 'text-gray-400'}`}
-            onClick={() => setActiveTab('request')}
-          >
-            Request
-          </button>
-          <button
-            className={`mr-4 ${activeTab === 'response' ? 'active' : 'text-gray-400'}`}
-            onClick={() => setActiveTab('response')}
-          >
-            Response
-          </button>
-          {showNetworkLogs && (
+      {isCollapsed && (
+        <div className="overflow-hidden">
+          {/* Tabs */}
+          <div className="tabs-switcher flex mb-4">
             <button
-              className={`${activeTab === 'networkLogs' ? 'active' : 'text-gray-400'}`}
-              onClick={() => setActiveTab('networkLogs')}
+              className={`mr-4 ${activeTab === 'request' ? 'active' : 'text-gray-400'}`}
+              onClick={() => setActiveTab('request')}
             >
-              Network Logs
+              Request
             </button>
-          )}
+            <button
+              className={`mr-4 ${activeTab === 'response' ? 'active' : 'text-gray-400'}`}
+              onClick={() => setActiveTab('response')}
+            >
+              Response
+            </button>
+            {showNetworkLogs && (
+              <button
+                className={`${activeTab === 'networkLogs' ? 'active' : 'text-gray-400'}`}
+                onClick={() => setActiveTab('networkLogs')}
+              >
+                Network Logs
+              </button>
+            )}
+          </div>
+
+          {/* Tab Content */}
+          <div className="tab-content break-all">
+            {/* Request Tab */}
+            {activeTab === 'request' && (
+              <Request request={request} item={item} collection={collection} />
+            )}
+
+            {/* Response Tab */}
+            {activeTab === 'response' && (
+              <Response response={response} item={item} collection={collection} />
+            )}
+
+            {/* Network Logs Tab */}
+            {activeTab === 'networkLogs' && showNetworkLogs && (
+              <Network logs={response?.timeline} />
+            )}
+          </div>
         </div>
-
-        {/* Tab Content */}
-        <div className="tab-content break-all">
-          {/* Request Tab */}
-          {activeTab === 'request' && (
-            <Request request={request} item={item} collection={collection} />
-          )}
-
-          {/* Response Tab */}
-          {activeTab === 'response' && (
-            <Response response={response} item={item} collection={collection} />
-          )}
-
-          {/* Network Logs Tab */}
-          {activeTab === 'networkLogs' && showNetworkLogs && (
-            <Network logs={response?.timeline} />
-          )}
-        </div>
-      </div>)}
+      )}
     </div>
   );
 };
 
-export default TimelineItem;
\ No newline at end of file
+export default TimelineItem;
diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/index.js
index 693f26438..3b5ea4531 100644
--- a/packages/bruno-app/src/components/ResponsePane/Timeline/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/Timeline/index.js
@@ -47,9 +47,9 @@ const Timeline = ({ collection, item }) => {
   // Get the effective auth source if auth mode is inherit
   const authSource = getEffectiveAuthSource(collection, item);
   const isGrpcRequest = item.type === 'grpc-request' || item.type === 'ws-request';
-  
+
   // Filter timeline entries based on new rules
-  const  combinedTimeline = ([...(collection?.timeline || [])]).filter(obj => {
+  const combinedTimeline = ([...(collection?.timeline || [])]).filter((obj) => {
     // Always show entries for this item
     if (obj.itemUid === item.uid) return true;
 
@@ -60,28 +60,27 @@ const Timeline = ({ collection, item }) => {
     }
 
     return false;
-  }).sort((a, b) => b.timestamp - a.timestamp)
+  }).sort((a, b) => b.timestamp - a.timestamp);
 
   return (
     <StyledWrapper
       className="pb-4 w-full flex flex-grow flex-col"
     >
       {/* Timeline container with scrollbar */}
-      <div 
+      <div
         className="timeline-container"
       >
         {combinedTimeline.map((event, index) => {
           // Handle regular requests
           if (event.type === 'request') {
-
             const { data, timestamp, eventType } = event;
-            const { request, response,  eventData = {}, timestamp: eventTimestamp = timestamp } = data;
-            
+            const { request, response, eventData = {}, timestamp: eventTimestamp = timestamp } = data;
+
             if (isGrpcRequest) {
               return (
                 <div key={index} className="timeline-event mb-2">
                   <GrpcTimelineItem
-                    timestamp={eventTimestamp} 
+                    timestamp={eventTimestamp}
                     request={request}
                     response={response}
                     eventType={eventType}
@@ -92,7 +91,7 @@ const Timeline = ({ collection, item }) => {
                 </div>
               );
             }
-            
+
             // Regular HTTP request
             return (
               <div key={index} className="timeline-event mb-2">
@@ -105,9 +104,7 @@ const Timeline = ({ collection, item }) => {
                 />
               </div>
             );
-          }
-          // Handle OAuth2 events
-          else if (event.type === 'oauth2') {
+          } else if (event.type === 'oauth2') { // Handle OAuth2 events
             const { data, timestamp } = event;
             const { debugInfo } = data;
             return (
@@ -120,7 +117,7 @@ const Timeline = ({ collection, item }) => {
                 <div className="mt-2">
                   {debugInfo && debugInfo.length > 0 ? (
                     debugInfo.map((data, idx) => (
-                      <div className='ml-4' key={idx}>
+                      <div className="ml-4" key={idx}>
                         <TimelineItem
                           timestamp={timestamp}
                           request={data?.request}
@@ -138,7 +135,7 @@ const Timeline = ({ collection, item }) => {
               </div>
             );
           }
-          
+
           return null;
         })}
       </div>
@@ -146,4 +143,4 @@ const Timeline = ({ collection, item }) => {
   );
 };
 
-export default Timeline;
\ No newline at end of file
+export default Timeline;
diff --git a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSMessagesList/index.js b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSMessagesList/index.js
index 8762863db..ca560189f 100644
--- a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSMessagesList/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSMessagesList/index.js
@@ -117,7 +117,7 @@ const WSMessageItem = ({ message, inFocus }) => {
       >
         <div className="flex min-w-0 shrink">
           <span
-            className={classnames('font-semibold flex items-center gap-1',
+            className={classnames('font-medium flex items-center gap-1',
               {
                 'text-green-700': isIncoming,
                 'text-yellow-700': isOutgoing,
@@ -195,7 +195,7 @@ const WSMessagesList = ({ order = -1, messages = [] }) => {
     <StyledWrapper className="ws-messages-list mt-1 flex flex-col">
       {ordered.map((msg, idx, src) => {
         const inFocus = order === -1 ? src.length - 1 === idx : idx === 0;
-        return <WSMessageItem inFocus={inFocus} id={idx} message={msg} />;
+        return <WSMessageItem key={msg.timestamp} inFocus={inFocus} id={idx} message={msg} />;
       })}
     </StyledWrapper>
   );
diff --git a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseHeaders/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseHeaders/StyledWrapper.js
index d42e77f7f..141057784 100644
--- a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseHeaders/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseHeaders/StyledWrapper.js
@@ -7,8 +7,8 @@ const StyledWrapper = styled.div`
 
     thead {
       color: #777777;
-      font-size: 0.75rem;
-      font-weight: 600;
+      font-size: ${(props) => props.theme.font.size.sm};
+      font-weight: 500;
       text-transform: uppercase;
     }
 
diff --git a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseSortOrder/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseSortOrder/StyledWrapper.js
index 8c32a8bab..73c1ba290 100644
--- a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseSortOrder/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSResponseSortOrder/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
-  font-size: 0.8125rem;
+  font-size: ${(props) => props.theme.font.size.base};
   color: ${(props) => props.theme.requestTabPanel.responseStatus};
 `;
 
diff --git a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSStatusCode/StyledWrapper.js b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSStatusCode/StyledWrapper.js
index 510a40f01..7c8ffe964 100644
--- a/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSStatusCode/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ResponsePane/WsResponsePane/WSStatusCode/StyledWrapper.js
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.75rem;
-  font-weight: 600;
+  font-size: ${(props) => props.theme.font.size.sm};
+  font-weight: 500;
   display: flex;
   align-items: center;
 
diff --git a/packages/bruno-app/src/components/ResponsePane/index.js b/packages/bruno-app/src/components/ResponsePane/index.js
index 6feb98bdb..3ce781915 100644
--- a/packages/bruno-app/src/components/ResponsePane/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/index.js
@@ -16,13 +16,15 @@ import TestResultsLabel from './TestResultsLabel';
 import ScriptError from './ScriptError';
 import ScriptErrorIcon from './ScriptErrorIcon';
 import StyledWrapper from './StyledWrapper';
-import ResponseSave from 'src/components/ResponsePane/ResponseSave';
-import ResponseClear from 'src/components/ResponsePane/ResponseClear';
+import ResponseActions from 'src/components/ResponsePane/ResponseActions';
 import ResponseBookmark from 'src/components/ResponsePane/ResponseBookmark';
+import ResponseCopy from 'src/components/ResponsePane/ResponseCopy';
 import SkippedRequest from './SkippedRequest';
 import ClearTimeline from './ClearTimeline/index';
 import ResponseLayoutToggle from './ResponseLayoutToggle';
 import HeightBoundContainer from 'ui/HeightBoundContainer';
+import ResponseStopWatch from 'components/ResponsePane/ResponseStopWatch';
+import WSMessagesList from './WsResponsePane/WSMessagesList';
 
 const ResponsePane = ({ item, collection }) => {
   const dispatch = useDispatch();
@@ -31,7 +33,7 @@ const ResponsePane = ({ item, collection }) => {
   const isLoading = ['queued', 'sending'].includes(item.requestState);
   const [showScriptErrorCard, setShowScriptErrorCard] = useState(false);
 
-  const requestTimeline = ([...(collection.timeline || [])]).filter(obj => {
+  const requestTimeline = ([...(collection.timeline || [])]).filter((obj) => {
     if (obj.itemUid === item.uid) return true;
   });
 
@@ -71,6 +73,10 @@ const ResponsePane = ({ item, collection }) => {
   const getTabPanel = (tab) => {
     switch (tab) {
       case 'response': {
+        const isStream = item.response?.stream ?? false;
+        if (isStream) {
+          return <WSMessagesList order={-1} messages={item.response.data} />;
+        }
         return (
           <QueryResult
             item={item}
@@ -87,15 +93,17 @@ const ResponsePane = ({ item, collection }) => {
         return <ResponseHeaders headers={response.headers} />;
       }
       case 'timeline': {
-        return <Timeline collection={collection} item={item}  />;
+        return <Timeline collection={collection} item={item} />;
       }
       case 'tests': {
-        return <TestResults
-          results={item.testResults}
-          assertionResults={item.assertionResults}
-          preRequestTestResults={item.preRequestTestResults}
-          postResponseTestResults={item.postResponseTestResults}
-        />;
+        return (
+          <TestResults
+            results={item.testResults}
+            assertionResults={item.assertionResults}
+            preRequestTestResults={item.preRequestTestResults}
+            postResponseTestResults={item.postResponseTestResults}
+          />
+        );
       }
 
       default: {
@@ -177,15 +185,17 @@ const ResponsePane = ({ item, collection }) => {
               />
             )}
             <ResponseLayoutToggle />
-            {focusedTab?.responsePaneTab === "timeline" ? (
+            {focusedTab?.responsePaneTab === 'timeline' ? (
               <ClearTimeline item={item} collection={collection} />
             ) : (item?.response && !item?.response?.error) ? (
               <>
-                <ResponseClear item={item} collection={collection} />
-                <ResponseSave item={item} />
                 <ResponseBookmark item={item} collection={collection} responseSize={responseSize} />
-                <StatusCode status={response.status} />
-                <ResponseTime duration={response.duration} />
+                <ResponseCopy item={item} />
+                <ResponseActions item={item} collection={collection} />
+                <StatusCode status={response.status} isStreaming={item.response?.stream?.running} />
+                {item.response?.stream?.running
+                  ? <ResponseStopWatch startMillis={response.duration} />
+                  : <ResponseTime duration={response.duration} />}
                 <ResponseSize size={responseSize} />
               </>
             ) : null}
@@ -193,7 +203,7 @@ const ResponsePane = ({ item, collection }) => {
         ) : null}
       </div>
       <section
-        className={`flex flex-col min-h-0 relative px-4 auto overflow-auto`}
+        className="flex flex-col min-h-0 relative px-4 auto overflow-auto"
         style={{
           flex: '1 1 0',
           height: hasScriptError && showScriptErrorCard ? 'auto' : '100%'
@@ -206,9 +216,9 @@ const ResponsePane = ({ item, collection }) => {
             onClose={() => setShowScriptErrorCard(false)}
           />
         )}
-        <div className='flex-1 overflow-y-auto'>
+        <div className="flex-1 overflow-y-auto">
           {!item?.response ? (
-            focusedTab?.responsePaneTab === "timeline" && requestTimeline?.length ? (
+            focusedTab?.responsePaneTab === 'timeline' && requestTimeline?.length ? (
               <Timeline
                 collection={collection}
                 item={item}
diff --git a/packages/bruno-app/src/components/RunnerResults/ResponsePane/index.js b/packages/bruno-app/src/components/RunnerResults/ResponsePane/index.js
index 609515c8c..08e549215 100644
--- a/packages/bruno-app/src/components/RunnerResults/ResponsePane/index.js
+++ b/packages/bruno-app/src/components/RunnerResults/ResponsePane/index.js
@@ -66,12 +66,14 @@ const ResponsePane = ({ rightPaneWidth, item, collection }) => {
         );
       }
       case 'tests': {
-        return <TestResults
-          results={testResults}
-          assertionResults={assertionResults}
-          preRequestTestResults={preRequestTestResults}
-          postResponseTestResults={postResponseTestResults}
-        />;
+        return (
+          <TestResults
+            results={testResults}
+            assertionResults={assertionResults}
+            preRequestTestResults={preRequestTestResults}
+            postResponseTestResults={postResponseTestResults}
+          />
+        );
       }
 
       default: {
@@ -134,7 +136,7 @@ const ResponsePane = ({ rightPaneWidth, item, collection }) => {
             onClose={() => setShowScriptErrorCard(false)}
           />
         )}
-        <div className='flex-1'>
+        <div className="flex-1">
           {getTabPanel(selectedTab)}
         </div>
       </section>
diff --git a/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/StyledWrapper.jsx b/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/StyledWrapper.jsx
index 0a6dbeea2..a6d2315a4 100644
--- a/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/StyledWrapper.jsx
+++ b/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/StyledWrapper.jsx
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
-  background-color: ${props => props.theme.sidebar.bg};
+  background-color: ${(props) => props.theme.sidebar.bg};
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -13,11 +13,11 @@ const StyledWrapper = styled.div`
     align-items: center;
     justify-content: space-between;
     padding: 1rem;
-    border-bottom: 1px solid ${props => props.theme.sidebar.dragbar};
+    border-bottom: 1px solid ${(props) => props.theme.sidebar.dragbar};
     margin-bottom: 0.5rem;
 
     .counter {
-      font-size: 0.875rem;
+      font-size: ${(props) => props.theme.font.size.base};
       font-weight: 500;
     }
 
@@ -32,8 +32,8 @@ const StyledWrapper = styled.div`
       display: flex;
       align-items: center;
       gap: 0.25rem;
-      font-size: 0.75rem;
-      color: ${props => props.theme.textLink};
+      font-size: ${(props) => props.theme.font.size.base};
+      color: ${(props) => props.theme.textLink};
       background: none;
       border: none;
       padding: 0.25rem 0.5rem;
@@ -58,15 +58,15 @@ const StyledWrapper = styled.div`
     }
     
     &::-webkit-scrollbar-thumb {
-      background-color: ${props => props.theme.console.scrollbarThumb};
+      background-color: ${(props) => props.theme.console.scrollbarThumb};
       border-radius: 3px;
     }
 
     .loading-message, 
     .empty-message {
       padding: 0.75rem;
-      color: ${props => props.theme.colors.text.muted};
-      font-size: 0.875rem;
+      color: ${(props) => props.theme.colors.text.muted};
+      font-size: ${(props) => props.theme.font.size.base};
     }
     
     .requests-container {
@@ -84,17 +84,17 @@ const StyledWrapper = styled.div`
     position: relative;
     height: 2.5rem;
     border: 1px solid transparent;
-    background-color: ${props => props.theme.sidebar.bg};
+    background-color: ${(props) => props.theme.sidebar.bg};
     transition: transform 0.15s ease, background-color 0.15s ease, box-shadow 0.15s ease;
     
     &.is-selected {
-      background-color: ${props => props.theme.requestTabs.active.bg};
+      background-color: ${(props) => props.theme.requestTabs.active.bg};
     }
     
     &.is-dragging {
       opacity: 0.5;
-      background-color: ${props => props.theme.sidebar.bg};
-      border: 1px dashed ${props => props.theme.sidebar.dragbar};
+      background-color: ${(props) => props.theme.sidebar.bg};
+      border: 1px dashed ${(props) => props.theme.sidebar.dragbar};
       transform: scale(0.98);
       box-shadow: 0 3px 8px rgba(0, 0, 0, 0.12);
       z-index: 5;
@@ -107,7 +107,7 @@ const StyledWrapper = styled.div`
       left: 0;
       right: 0;
       height: 2px;
-      background: ${props => props.theme.dragAndDrop?.border || props.theme.textLink};
+      background: ${(props) => props.theme.dragAndDrop?.border || props.theme.textLink};
       opacity: 0;
       pointer-events: none;
       transition: opacity 0.2s ease;
@@ -125,7 +125,7 @@ const StyledWrapper = styled.div`
       &::before {
         opacity: 1;
         height: 2px;
-        background: ${props => props.theme.dragAndDrop?.border || props.theme.textLink};
+        background: ${(props) => props.theme.dragAndDrop?.border || props.theme.textLink};
       }
     }
 
@@ -133,25 +133,25 @@ const StyledWrapper = styled.div`
       &::after {
         opacity: 1;
         height: 2px;
-        background: ${props => props.theme.dragAndDrop?.border || props.theme.textLink};
+        background: ${(props) => props.theme.dragAndDrop?.border || props.theme.textLink};
       }
     }
 
     .drag-handle {
       cursor: grab;
       margin-right: 0.25rem;
-      color: ${props => props.theme.sidebar.muted};
+      color: ${(props) => props.theme.sidebar.muted};
       display: flex;
       align-items: center;
       transition: color 0.15s ease;
       
       &:hover {
-        color: ${props => props.theme.text};
+        color: ${(props) => props.theme.text};
       }
       
       &:active {
         cursor: grabbing;
-        color: ${props => props.theme.textLink};
+        color: ${(props) => props.theme.textLink};
       }
     }
     
@@ -162,7 +162,7 @@ const StyledWrapper = styled.div`
       .checkbox {
         width: 1rem;
         height: 1rem;
-        border: 1px solid ${props => props.theme.sidebar.dragbar};
+        border: 1px solid ${(props) => props.theme.sidebar.dragbar};
         border-radius: 3px;
         display: flex;
         align-items: center;
@@ -170,62 +170,62 @@ const StyledWrapper = styled.div`
         transition: all 0.1s ease;
         
         &:hover {
-          border-color: ${props => props.theme.textLink};
+          border-color: ${(props) => props.theme.textLink};
         }
       }
     }
     
     .method {
       font-family: monospace;
-      font-size: 0.75rem;
+      font-size: ${(props) => props.theme.font.size.base};
       font-weight: 500;
       margin-right: 0.5rem;
       min-width: 3rem;
-      color: ${props => props.theme.sidebar.muted}; // Default color for unknown methods
+      color: ${(props) => props.theme.sidebar.muted}; // Default color for unknown methods
       
       &.method-get {
-        color: ${props => props.theme.request.methods.get};
+        color: ${(props) => props.theme.request.methods.get};
       }
       
       &.method-post {
-        color: ${props => props.theme.request.methods.post};
+        color: ${(props) => props.theme.request.methods.post};
       }
       
       &.method-put {
-        color: ${props => props.theme.request.methods.put};
+        color: ${(props) => props.theme.request.methods.put};
       }
       
       &.method-delete {
-        color: ${props => props.theme.request.methods.delete};
+        color: ${(props) => props.theme.request.methods.delete};
       }
       
       &.method-patch {
-        color: ${props => props.theme.request.methods.patch};
+        color: ${(props) => props.theme.request.methods.patch};
       }
       
       &.method-options {
-        color: ${props => props.theme.request.methods.options};
+        color: ${(props) => props.theme.request.methods.options};
       }
       
       &.method-head {
-        color: ${props => props.theme.request.methods.head};
+        color: ${(props) => props.theme.request.methods.head};
       }
     }
     
     .request-name {
       flex: 1;
-      font-size: 0.875rem;
+      font-size: ${(props) => props.theme.font.size.base};
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
       
       .folder-path {
         margin-left: 0.5rem;
-        font-size: 0.75rem;
-        color: ${props => props.theme.sidebar.muted};
+        font-size: ${(props) => props.theme.font.size.base};
+        color: ${(props) => props.theme.sidebar.muted};
       }
     }
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/index.jsx b/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/index.jsx
index aa3a3c9f0..bc4ed9fe6 100644
--- a/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/index.jsx
+++ b/packages/bruno-app/src/components/RunnerResults/RunConfigurationPanel/index.jsx
@@ -33,13 +33,13 @@ const RequestItem = ({ item, index, moveItem, isSelected, onSelect, onDrop }) =>
     item: { uid: item.uid, name: item.name, request: item.request, index },
     collect: (monitor) => ({ isDragging: monitor.isDragging() }),
     options: {
-      dropEffect: "move"
+      dropEffect: 'move'
     },
     end: (draggedItem, monitor) => {
       if (monitor.didDrop()) {
         onDrop();
       }
-    },
+    }
   });
 
   const [{ isOver, canDrop }, drop] = useDrop({
@@ -49,24 +49,24 @@ const RequestItem = ({ item, index, moveItem, isSelected, onSelect, onDrop }) =>
         setDropType(null);
         return;
       }
-      
+
       const dropType = determineDropType(monitor);
       setDropType(dropType);
     },
     drop: (draggedItem, monitor) => {
       if (draggedItem.uid === item.uid) return;
-      
+
       const dropType = determineDropType(monitor);
       let targetIndex = index;
-      
+
       if (dropType === 'below') {
         targetIndex = index + 1;
       }
-      
+
       if (draggedItem.index < targetIndex) {
         targetIndex = targetIndex - 1;
       }
-      
+
       moveItem(draggedItem.uid, targetIndex);
       setDropType(null);
       return { item: draggedItem };
@@ -74,7 +74,7 @@ const RequestItem = ({ item, index, moveItem, isSelected, onSelect, onDrop }) =>
     collect: (monitor) => ({
       isOver: monitor.isOver(),
       canDrop: monitor.canDrop()
-    }),
+    })
   });
 
   useEffect(() => {
@@ -136,7 +136,7 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
     const processItems = (items) => {
       if (!items?.length) return;
 
-      items.forEach(item => {
+      items.forEach((item) => {
         if (isItemARequest(item) && !item.partial) {
           const relativePath = path.relative(collection.pathname, path.dirname(item.pathname));
           const folderPath = relativePath !== '.' ? relativePath : '';
@@ -167,9 +167,9 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
       const savedConfiguration = get(collection, 'runnerConfiguration', null);
       if (savedConfiguration?.requestItemsOrder?.length > 0) {
         const orderedRequests = [];
-        const requestMap = new Map(requests.map(req => [req.uid, req]));
+        const requestMap = new Map(requests.map((req) => [req.uid, req]));
 
-        savedConfiguration.requestItemsOrder.forEach(uid => {
+        savedConfiguration.requestItemsOrder.forEach((uid) => {
           const request = requestMap.get(uid);
           if (request) {
             orderedRequests.push(request);
@@ -177,7 +177,7 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
           }
         });
 
-        requestMap.forEach(request => {
+        requestMap.forEach((request) => {
           orderedRequests.push(request);
         });
 
@@ -188,7 +188,7 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
 
       setOriginalRequests(cloneDeep(requests));
     } catch (error) {
-      console.error("Error loading collection structure:", error);
+      console.error('Error loading collection structure:', error);
     } finally {
       setIsLoading(false);
     }
@@ -196,7 +196,7 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
 
   const moveItem = useCallback((draggedItemUid, hoverIndex) => {
     setFlattenedRequests((prevRequests) => {
-      const dragIndex = prevRequests.findIndex(item => item.uid === draggedItemUid);
+      const dragIndex = prevRequests.findIndex((item) => item.uid === draggedItemUid);
 
       if (dragIndex === -1 || dragIndex === hoverIndex) {
         return prevRequests;
@@ -213,12 +213,12 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
   const handleDrop = useCallback(() => {
     const selectedUids = new Set(selectedItems);
 
-    setFlattenedRequests(currentRequests => {
+    setFlattenedRequests((currentRequests) => {
       const newOrderedSelectedUids = currentRequests
-        .filter(item => selectedUids.has(item.uid))
-        .map(item => item.uid);
+        .filter((item) => selectedUids.has(item.uid))
+        .map((item) => item.uid);
 
-      const allRequestUidsOrder = currentRequests.map(item => item.uid);
+      const allRequestUidsOrder = currentRequests.map((item) => item.uid);
 
       setSelectedItems(newOrderedSelectedUids);
       dispatch(updateRunnerConfiguration(collection.uid, newOrderedSelectedUids, allRequestUidsOrder));
@@ -230,32 +230,32 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
   const handleRequestSelect = useCallback((item) => {
     try {
       if (selectedItems.includes(item.uid)) {
-        const newSelectedUids = selectedItems.filter(uid => uid !== item.uid);
+        const newSelectedUids = selectedItems.filter((uid) => uid !== item.uid);
         setSelectedItems(newSelectedUids);
-        
-        const allRequestUidsOrder = flattenedRequests.map(item => item.uid);
+
+        const allRequestUidsOrder = flattenedRequests.map((item) => item.uid);
         dispatch(updateRunnerConfiguration(collection.uid, newSelectedUids, allRequestUidsOrder));
       } else {
         const newSelectedUids = [...selectedItems, item.uid];
 
         const orderedSelectedUids = flattenedRequests
-          .filter(req => newSelectedUids.includes(req.uid))
-          .map(req => req.uid);
+          .filter((req) => newSelectedUids.includes(req.uid))
+          .map((req) => req.uid);
 
         setSelectedItems(orderedSelectedUids);
 
-        const allRequestUidsOrder = flattenedRequests.map(item => item.uid);
+        const allRequestUidsOrder = flattenedRequests.map((item) => item.uid);
         dispatch(updateRunnerConfiguration(collection.uid, orderedSelectedUids, allRequestUidsOrder));
       }
     } catch (error) {
-      console.error("Error selecting item:", error);
+      console.error('Error selecting item:', error);
     }
   }, [selectedItems, setSelectedItems, flattenedRequests, dispatch, collection.uid]);
 
   const handleSelectAll = useCallback(() => {
     try {
-      const allRequestUidsOrder = flattenedRequests.map(item => item.uid);
-      
+      const allRequestUidsOrder = flattenedRequests.map((item) => item.uid);
+
       if (selectedItems.length === flattenedRequests.length) {
         setSelectedItems([]);
         dispatch(updateRunnerConfiguration(collection.uid, [], allRequestUidsOrder));
@@ -264,7 +264,7 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
         dispatch(updateRunnerConfiguration(collection.uid, allRequestUidsOrder, allRequestUidsOrder));
       }
     } catch (error) {
-      console.error("Error selecting/deselecting all items:", error);
+      console.error('Error selecting/deselecting all items:', error);
     }
   }, [flattenedRequests, selectedItems, setSelectedItems, dispatch, collection.uid]);
 
@@ -274,7 +274,7 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
       setSelectedItems([]);
       dispatch(updateRunnerConfiguration(collection.uid, [], []));
     } catch (error) {
-      console.error("Error resetting configuration:", error);
+      console.error('Error resetting configuration:', error);
     }
   }, [originalRequests, setSelectedItems, collection.uid, dispatch]);
 
@@ -286,7 +286,7 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
         </div>
         <div className="actions">
           <button className="btn-select-all" onClick={handleSelectAll}>
-            {selectedItems.length === flattenedRequests.length ? "Deselect All" : "Select All"}
+            {selectedItems.length === flattenedRequests.length ? 'Deselect All' : 'Select All'}
           </button>
           <button className="btn-reset" onClick={handleReset} title="Reset selection and order">
             <IconAdjustmentsAlt size={16} strokeWidth={1.5} />
@@ -324,4 +324,4 @@ const RunConfigurationPanel = ({ collection, selectedItems, setSelectedItems })
   );
 };
 
-export default RunConfigurationPanel;
\ No newline at end of file
+export default RunConfigurationPanel;
diff --git a/packages/bruno-app/src/components/RunnerResults/RunnerTags/index.jsx b/packages/bruno-app/src/components/RunnerResults/RunnerTags/index.jsx
index b61b5b9f6..959169d4f 100644
--- a/packages/bruno-app/src/components/RunnerResults/RunnerTags/index.jsx
+++ b/packages/bruno-app/src/components/RunnerResults/RunnerTags/index.jsx
@@ -8,7 +8,7 @@ const RunnerTags = ({ collectionUid, className = '' }) => {
   const dispatch = useDispatch();
   const collections = useSelector((state) => state.collections.collections);
   const collection = cloneDeep(find(collections, (c) => c.uid === collectionUid));
-  
+
   // tags for the collection run
   const tags = get(collection, 'runnerTags', { include: [], exclude: [] });
 
@@ -17,7 +17,7 @@ const RunnerTags = ({ collectionUid, className = '' }) => {
 
   // all available tags in the collection that can be used for filtering
   const availableTags = get(collection, 'allTags', []);
-  const tagsHintList = availableTags.filter(t => !tags.exclude.includes(t) && !tags.include.includes(t));
+  const tagsHintList = availableTags.filter((t) => !tags.exclude.includes(t) && !tags.include.includes(t));
 
   useEffect(() => {
     dispatch(updateCollectionTagsList({ collectionUid }));
@@ -34,7 +34,7 @@ const RunnerTags = ({ collectionUid, className = '' }) => {
     if (tags.exclude.includes(trimmedTag)) {
       return 'tag is present in the exclude list!';
     }
-  }
+  };
 
   const handleAddTag = ({ tag, to }) => {
     const trimmedTag = tag.trim();
@@ -105,8 +105,8 @@ const RunnerTags = ({ collectionUid, className = '' }) => {
             <span>Included tags:</span>
             <TagList
               tags={tags.include}
-              handleAddTag={tag => handleAddTag({ tag, to: 'include' })}
-              handleRemoveTag={tag => handleRemoveTag({ tag, from: 'include' })}
+              handleAddTag={(tag) => handleAddTag({ tag, to: 'include' })}
+              handleRemoveTag={(tag) => handleRemoveTag({ tag, from: 'include' })}
               tagsHintList={tagsHintList}
               handleValidation={handleValidation}
             />
@@ -115,8 +115,8 @@ const RunnerTags = ({ collectionUid, className = '' }) => {
             <span>Excluded tags:</span>
             <TagList
               tags={tags.exclude}
-              handleAddTag={tag => handleAddTag({ tag, to: 'exclude' })}
-              handleRemoveTag={tag => handleRemoveTag({ tag, from: 'exclude' })}
+              handleAddTag={(tag) => handleAddTag({ tag, to: 'exclude' })}
+              handleRemoveTag={(tag) => handleRemoveTag({ tag, from: 'exclude' })}
               tagsHintList={tagsHintList}
               handleValidation={handleValidation}
             />
@@ -124,7 +124,7 @@ const RunnerTags = ({ collectionUid, className = '' }) => {
         </div>
       )}
     </div>
-  )
-}
+  );
+};
 
-export default RunnerTags;
\ No newline at end of file
+export default RunnerTags;
diff --git a/packages/bruno-app/src/components/RunnerResults/StyledWrapper.js b/packages/bruno-app/src/components/RunnerResults/StyledWrapper.js
index b3fbaaebd..3473126f2 100644
--- a/packages/bruno-app/src/components/RunnerResults/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RunnerResults/StyledWrapper.js
@@ -43,6 +43,10 @@ const Wrapper = styled.div`
   .skipped-request {
     color: ${(props) => props.theme.colors.text.muted};
   }
+
+  .button-sm {
+    font-size: ${(props) => props.theme.font.size.sm};
+  }
 `;
 
 export default Wrapper;
diff --git a/packages/bruno-app/src/components/RunnerResults/index.jsx b/packages/bruno-app/src/components/RunnerResults/index.jsx
index 7956eb1ad..171c4bd98 100644
--- a/packages/bruno-app/src/components/RunnerResults/index.jsx
+++ b/packages/bruno-app/src/components/RunnerResults/index.jsx
@@ -3,16 +3,13 @@ import path from 'utils/common/path';
 import { useDispatch } from 'react-redux';
 import { get, cloneDeep } from 'lodash';
 import { runCollectionFolder, cancelRunnerExecution, mountCollection, updateRunnerConfiguration } from 'providers/ReduxStore/slices/collections/actions';
-import { resetCollectionRunner } from 'providers/ReduxStore/slices/collections';
-import { findItemInCollection, getTotalRequestCountInCollection } from 'utils/collections';
-import { IconRefresh, IconCircleCheck, IconCircleX, IconCircleOff, IconCheck, IconX, IconRun, IconLoader2 } from '@tabler/icons';
+import { resetCollectionRunner, updateRunnerTagsDetails } from 'providers/ReduxStore/slices/collections';
+import { findItemInCollection, getTotalRequestCountInCollection, areItemsLoading, getRequestItemsForCollectionRun } from 'utils/collections';
+import { IconRefresh, IconCircleCheck, IconCircleX, IconCircleOff, IconCheck, IconX, IconRun, IconExternalLink } from '@tabler/icons';
 import ResponsePane from './ResponsePane';
 import StyledWrapper from './StyledWrapper';
-import { areItemsLoading } from 'utils/collections';
 import RunnerTags from './RunnerTags/index';
 import RunConfigurationPanel from './RunConfigurationPanel';
-import { getRequestItemsForCollectionRun } from 'utils/collections/index';
-import { updateRunnerTagsDetails } from 'providers/ReduxStore/slices/collections/index';
 
 const getDisplayName = (fullPath, pathname, name = '') => {
   let relativePath = path.relative(fullPath, pathname);
@@ -27,64 +24,76 @@ const getTestStatus = (results) => {
 };
 
 const allTestsPassed = (item) => {
-  return item.status !== 'error' &&
-    item.testStatus === 'pass' &&
-    item.assertionStatus === 'pass' &&
-    item.preRequestTestStatus === 'pass' &&
-    item.postResponseTestStatus === 'pass';
+  return item.status !== 'error'
+    && item.testStatus === 'pass'
+    && item.assertionStatus === 'pass'
+    && item.preRequestTestStatus === 'pass'
+    && item.postResponseTestStatus === 'pass';
 };
 
 const anyTestFailed = (item) => {
-  return item.status === 'error' ||
-    item.testStatus === 'fail' ||
-    item.assertionStatus === 'fail' ||
-    item.preRequestTestStatus === 'fail' ||
-    item.postResponseTestStatus === 'fail';
+  return item.status === 'error'
+    || item.testStatus === 'fail'
+    || item.assertionStatus === 'fail'
+    || item.preRequestTestStatus === 'fail'
+    || item.postResponseTestStatus === 'fail';
 };
 
+// === Centralized filters definition ===
+const FILTERS = {
+  all: {
+    label: 'All',
+    predicate: () => true,
+    resultFilter: (results) => results
+  },
+  passed: {
+    label: 'Passed',
+    predicate: (item) => allTestsPassed(item),
+    resultFilter: (results) => results?.filter((r) => r.status === 'pass')
+  },
+  failed: {
+    label: 'Failed',
+    predicate: (item) => anyTestFailed(item),
+    resultFilter: (results) => results?.filter((r) => ['fail', 'error'].includes(r.status))
+  },
+  skipped: {
+    label: 'Skipped',
+    predicate: (item) => item.status === 'skipped',
+    resultFilter: (results) => results
+  }
+};
+
+// === Reusable filter button ===
+const FilterButton = ({ label, count, active, onClick }) => (
+  <button
+    onClick={onClick}
+    className={`font-medium transition-colors cursor-pointer flex items-center gap-1.5 border-b-2 pb-2 ${
+      active
+        ? 'text-[#343434] dark:text-[#CCCCCC] border-[#F59E0B]'
+        : 'text-[#989898] dark:text-[#CCCCCC80] border-transparent'
+    }`}
+    style={{ fontFamily: 'Inter', fontWeight: 500, lineHeight: '100%', letterSpacing: '0%' }}
+  >
+    {label}
+    <span
+      className="px-[4.5px] py-[2px] rounded-[2px] bg-[#F7F7F7] dark:bg-[#242424] border border-[#EFEFEF] dark:border-[#92929233] text-[#989898] dark:text-inherit"
+      style={{ borderWidth: '1px', fontFamily: 'Inter', fontSize: '10px', fontWeight: 500, lineHeight: '100%', letterSpacing: '0%' }}
+    >
+      {count}
+    </span>
+  </button>
+);
+
 export default function RunnerResults({ collection }) {
   const dispatch = useDispatch();
   const [selectedItem, setSelectedItem] = useState(null);
   const [delay, setDelay] = useState(null);
+  const [activeFilter, setActiveFilter] = useState('all');
   const [selectedRequestItems, setSelectedRequestItems] = useState([]);
   const [configureMode, setConfigureMode] = useState(false);
-
   // ref for the runner output body
   const runnerBodyRef = useRef();
 
-  const autoScrollRunnerBody = () => {
-    if (runnerBodyRef?.current) {
-      // mimics the native terminal scroll style
-      runnerBodyRef.current.scrollTo(0, 100000);
-    }
-  };
-
-  useEffect(() => {
-    if (!collection.runnerResult) {
-      setSelectedItem(null);
-    }
-    autoScrollRunnerBody();
-  }, [collection, setSelectedItem]);
-
-  useEffect(() => {
-    const runnerInfo = get(collection, 'runnerResult.info', {});
-    if (runnerInfo.status === 'running') {
-      setConfigureMode(false);
-    }
-  }, [collection.runnerResult]);
-
-  useEffect(() => {
-    const savedConfiguration = get(collection, 'runnerConfiguration', null);
-    if (savedConfiguration) {
-      if (savedConfiguration.selectedRequestItems && configureMode) {
-        setSelectedRequestItems(savedConfiguration.selectedRequestItems);
-      }
-      if (savedConfiguration.delay !== undefined && delay === null) {
-        setDelay(savedConfiguration.delay);
-      }
-    }
-  }, [collection.runnerConfiguration, configureMode, delay]);
-
   const collectionCopy = cloneDeep(collection);
   const runnerInfo = get(collection, 'runnerResult.info', {});
 
@@ -114,7 +123,7 @@ export default function RunnerResults({ collection }) {
         filename: info.filename,
         pathname: info.pathname,
         displayName: getDisplayName(collection.pathname, info.pathname, info.name),
-        tags: [...(info.request?.tags || [])].sort(),
+        tags: [...(info.request?.tags || [])].sort()
       };
       if (newItem.status !== 'error' && newItem.status !== 'skipped' && newItem.status !== 'running') {
         newItem.testStatus = getTestStatus(newItem.testResults);
@@ -126,8 +135,65 @@ export default function RunnerResults({ collection }) {
     })
     .filter(Boolean);
 
+  const activeFilterConfig = FILTERS[activeFilter];
+  const filteredItems = items.filter(activeFilterConfig.predicate);
+
+  const filterTestResults = (results) => {
+    if (!results || !Array.isArray(results)) return [];
+    return activeFilterConfig.resultFilter(results);
+  };
+
+  const autoScrollRunnerBody = () => {
+    if (runnerBodyRef?.current) {
+      const element = runnerBodyRef.current;
+      const scrollThreshold = 100; // pixels from bottom to consider "at bottom"
+      const isNearBottom
+        = element.scrollHeight - element.scrollTop - element.clientHeight < scrollThreshold;
+
+      // Only auto-scroll if user is already near the bottom
+      if (isNearBottom) {
+        // mimics the native terminal scroll style
+        element.scrollTo(0, 100000);
+      }
+    }
+  };
+
+  useEffect(() => {
+    if (!collection.runnerResult) {
+      setSelectedItem(null);
+    }
+    autoScrollRunnerBody();
+  }, [collection, setSelectedItem]);
+
+  useEffect(() => {
+    // Auto-scroll when items are added or updated during execution
+    // Only scrolls if user is already at/near the bottom
+    if (filteredItems.length > 0) {
+      autoScrollRunnerBody();
+    }
+  }, [filteredItems]);
+
+  useEffect(() => {
+    const runnerInfo = get(collection, 'runnerResult.info', {});
+    if (runnerInfo.status === 'running') {
+      setConfigureMode(false);
+    }
+  }, [collection.runnerResult]);
+
+  useEffect(() => {
+    const savedConfiguration = get(collection, 'runnerConfiguration', null);
+    if (savedConfiguration) {
+      if (savedConfiguration.selectedRequestItems && configureMode) {
+        setSelectedRequestItems(savedConfiguration.selectedRequestItems);
+      }
+      if (savedConfiguration.delay !== undefined && delay === null) {
+        setDelay(savedConfiguration.delay);
+      }
+    }
+  }, [collection.runnerConfiguration, configureMode, delay]);
+
   const ensureCollectionIsMounted = () => {
-    if(collection.mountStatus === 'mounted'){
+    if (collection.mountStatus === 'mounted') {
       return;
     }
     dispatch(mountCollection({
@@ -186,20 +252,20 @@ export default function RunnerResults({ collection }) {
   };
 
   useEffect(() => {
-    if(tagsEnabled) {
+    if (tagsEnabled) {
       setConfigureMode(false);
     }
   }, [tagsEnabled]);
 
   const totalRequestsInCollection = getTotalRequestCountInCollection(collectionCopy);
-  const passedRequests = items.filter(allTestsPassed);
-  const failedRequests = items.filter(anyTestFailed);
+  const filterCounts = {
+    all: items.length,
+    passed: items.filter(allTestsPassed).length,
+    failed: items.filter(anyTestFailed).length,
+    skipped: items.filter((i) => i.status === 'skipped').length
+  };
 
-  const skippedRequests = items.filter((item) => {
-    return item.status === 'skipped';
-  });
   let isCollectionLoading = areItemsLoading(collection);
-
   if (!items || !items.length) {
     return (
       <StyledWrapper className="pl-4 overflow-hidden h-full">
@@ -212,12 +278,12 @@ export default function RunnerResults({ collection }) {
             <div className="mt-6">
               You have <span className="font-medium">{totalRequestsInCollection}</span> requests in this collection.
               {isCollectionLoading && (
-                <span className="ml-2 text-sm text-gray-500">
+                <span className="ml-2 text-gray-500">
                   (Loading...)
                 </span>
               )}
             </div>
-            {isCollectionLoading ? <div className='my-1 danger'>Requests in this collection are still loading.</div> : null}
+            {isCollectionLoading ? <div className="my-1 danger">Requests in this collection are still loading.</div> : null}
             <div className="mt-6">
               <label>Delay (in ms)</label>
               <input
@@ -233,7 +299,7 @@ export default function RunnerResults({ collection }) {
             </div>
 
             {/* Tags for the collection run */}
-            <RunnerTags collectionUid={collection.uid} className='mb-6' />
+            <RunnerTags collectionUid={collection.uid} className="mb-6" />
 
             {/* Configure requests option */}
             <div className="flex flex-col border-b pb-6 mb-6 border-gray-200 dark:border-gray-700">
@@ -250,7 +316,7 @@ export default function RunnerResults({ collection }) {
               </div>
             </div>
 
-            <div className='flex flex-row gap-2'>
+            <div className="flex flex-row gap-2">
               <button
                 type="submit"
                 className="submit btn btn-sm btn-secondary"
@@ -259,8 +325,7 @@ export default function RunnerResults({ collection }) {
               >
                 {configureMode && selectedRequestItems.length > 0
                   ? `Run ${selectedRequestItems.length} Selected Request${selectedRequestItems.length > 1 ? 's' : ''}`
-                  : "Run Collection"
-                }
+                  : 'Run Collection'}
               </button>
 
               <button className="submit btn btn-sm btn-close" onClick={resetRunner}>
@@ -285,31 +350,61 @@ export default function RunnerResults({ collection }) {
 
   return (
     <StyledWrapper className="px-4 pb-4 flex flex-grow flex-col relative overflow-auto">
-      <div className="flex items-center my-6 flex-row">
-        <div className="font-medium title flex items-center">
-          Runner
-          <IconRun size={20} strokeWidth={1.5} className="ml-2" />
+      {/* Filter Bar and Actions */}
+      <div className="flex items-center justify-between mb-4 pt-[14px] gap-4">
+        <div className="flex items-stretch rounded-lg border border-[#EFEFEF] dark:border-[#92929233] max-h-[35px] flex-shrink-0" style={{ borderWidth: '1px' }}>
+          <div className="flex items-center px-3 py-2 rounded-l-lg bg-[#F3F3F3] dark:bg-[#2B2D2F]">
+            <span className="text-gray-600 dark:text-gray-400" style={{ fontFamily: 'Inter', fontWeight: 400 }}>
+              Filter by:
+            </span>
+          </div>
+          <div className="flex items-center gap-5 px-3 pt-2 pb-0 rounded-r-lg bg-transparent dark:bg-transparent">
+            {Object.entries(FILTERS).map(([key, { label }]) => (
+              <FilterButton
+                key={key}
+                label={label}
+                count={filterCounts[key]}
+                active={activeFilter === key}
+                onClick={() => setActiveFilter(key)}
+              />
+            ))}
+          </div>
         </div>
-        {runnerInfo.status !== 'ended' && runnerInfo.cancelTokenUid && (
-          <button className="btn btn-sm btn-danger" onClick={cancelExecution}>
-            Cancel Execution
-          </button>
-        )}
+
+        {runnerInfo.status !== 'ended' && runnerInfo.cancelTokenUid ? (
+          <div className="flex items-center flex-shrink-0">
+            <button className="btn btn-sm btn-danger" onClick={cancelExecution}>Cancel Execution</button>
+          </div>
+        ) : runnerInfo.status === 'ended' ? (
+          <div className="flex items-center gap-3 flex-shrink-0">
+            <button
+              type="button"
+              className="px-3 py-1.5 rounded-md bg-transparent border border-[#989898] dark:border-[#444444] text-[#989898] hover:opacity-80 transition-colors button-sm"
+              style={{ fontFamily: 'Inter', fontWeight: 500 }}
+              onClick={runAgain}
+            >
+              Run Again
+            </button>
+            <button
+              type="button"
+              className="px-3 py-1.5 rounded-md bg-transparent border border-[#989898] dark:border-[#444444] text-[#989898] hover:opacity-80 transition-colors button-sm"
+              style={{ fontFamily: 'Inter', fontWeight: 500 }}
+              onClick={resetRunner}
+            >
+              Reset
+            </button>
+          </div>
+        ) : null}
       </div>
 
       <div className="flex gap-4 h-[calc(100vh_-_10rem)] overflow-hidden">
         <div
-          className={`flex flex-col overflow-y-auto ${selectedItem || (configureMode && !selectedItem && !runnerInfo.status === 'running') ? 'w-1/2' : 'w-full'}`}
-          ref={runnerBodyRef}
+          className="flex flex-col w-1/2"
         >
-          <div className="pb-2 font-medium test-summary">
-            Total Requests: {items.length}, Passed: {passedRequests.length}, Failed: {failedRequests.length}, Skipped:{' '}
-            {skippedRequests.length}
-          </div>
           {tagsEnabled && areTagsAdded && (
             <div className="pb-2 text-xs flex flex-row gap-1">
               Tags:
-              <div className='flex flex-row items-center gap-x-2'>
+              <div className="flex flex-row items-center gap-x-2">
                 <div className="text-green-500">
                   {tags.include.join(', ')}
                 </div>
@@ -319,28 +414,30 @@ export default function RunnerResults({ collection }) {
               </div>
             </div>
           )}
-          {runnerInfo?.statusText ?
-            <div className="pb-2 font-medium danger">
-              {runnerInfo?.statusText}
-            </div>
+          {runnerInfo?.statusText
+            ? (
+                <div className="pb-2 font-medium danger">
+                  {runnerInfo?.statusText}
+                </div>
+              )
             : null}
 
           {/* Items list */}
-          <div className="overflow-y-auto flex-1">
-            {items.map((item) => {
+          <div className="overflow-y-auto flex-1 " ref={runnerBodyRef}>
+            {filteredItems.map((item) => {
               return (
                 <div key={item.uid}>
                   <div className="item-path mt-2">
                     <div className="flex items-center">
                       <span>
-                        {allTestsPassed(item) ?
-                          <IconCircleCheck className="test-success" size={20} strokeWidth={1.5} />
+                        {allTestsPassed(item)
+                          ? <IconCircleCheck className="test-success" size={20} strokeWidth={1.5} />
                           : null}
-                        {item.status === 'skipped' ?
-                          <IconCircleOff className="skipped-request" size={20} strokeWidth={1.5} />
+                        {item.status === 'skipped'
+                          ? <IconCircleOff className="skipped-request" size={20} strokeWidth={1.5} />
                           : null}
-                        {anyTestFailed(item) ?
-                          <IconCircleX className="test-failure" size={20} strokeWidth={1.5} />
+                        {anyTestFailed(item)
+                          ? <IconCircleX className="test-failure" size={20} strokeWidth={1.5} />
                           : null}
                       </span>
                       <span
@@ -364,73 +461,73 @@ export default function RunnerResults({ collection }) {
                     </div>
                     {tagsEnabled && areTagsAdded && item?.tags?.length > 0 && (
                       <div className="pl-7 text-xs text-gray-500">
-                        Tags: {item.tags.filter(t => tags.include.includes(t)).join(', ')}
+                        Tags: {item.tags.filter((t) => tags.include.includes(t)).join(', ')}
                       </div>
                     )}
                     {item.status == 'error' ? <div className="error-message pl-8 pt-2 text-xs">{item.error}</div> : null}
 
                     <ul className="pl-8">
                       {item.preRequestTestResults
-                        ? item.preRequestTestResults.map((result) => (
-                          <li key={result.uid}>
-                            {result.status === 'pass' ? (
-                              <span className="test-success flex items-center">
-                                <IconCheck size={18} strokeWidth={2} className="mr-2" />
-                                {result.description}
-                              </span>
-                            ) : (
-                              <>
-                                <span className="test-failure flex items-center">
-                                  <IconX size={18} strokeWidth={2} className="mr-2" />
+                        ? filterTestResults(item.preRequestTestResults).map((result) => (
+                            <li key={result.uid}>
+                              {result.status === 'pass' ? (
+                                <span className="test-success flex items-center">
+                                  <IconCheck size={18} strokeWidth={2} className="mr-2" />
                                   {result.description}
                                 </span>
-                                <span className="error-message pl-8 text-xs">{result.error}</span>
-                              </>
-                            )}
-                          </li>
-                        ))
+                              ) : (
+                                <>
+                                  <span className="test-failure flex items-center">
+                                    <IconX size={18} strokeWidth={2} className="mr-2" />
+                                    {result.description}
+                                  </span>
+                                  <span className="error-message pl-8 text-xs">{result.error}</span>
+                                </>
+                              )}
+                            </li>
+                          ))
                         : null}
                       {item.postResponseTestResults
-                        ? item.postResponseTestResults.map((result) => (
-                          <li key={result.uid}>
-                            {result.status === 'pass' ? (
-                              <span className="test-success flex items-center">
-                                <IconCheck size={18} strokeWidth={2} className="mr-2" />
-                                {result.description}
-                              </span>
-                            ) : (
-                              <>
-                                <span className="test-failure flex items-center">
-                                  <IconX size={18} strokeWidth={2} className="mr-2" />
+                        ? filterTestResults(item.postResponseTestResults).map((result) => (
+                            <li key={result.uid}>
+                              {result.status === 'pass' ? (
+                                <span className="test-success flex items-center">
+                                  <IconCheck size={18} strokeWidth={2} className="mr-2" />
                                   {result.description}
                                 </span>
-                                <span className="error-message pl-8 text-xs">{result.error}</span>
-                              </>
-                            )}
-                          </li>
-                        ))
+                              ) : (
+                                <>
+                                  <span className="test-failure flex items-center">
+                                    <IconX size={18} strokeWidth={2} className="mr-2" />
+                                    {result.description}
+                                  </span>
+                                  <span className="error-message pl-8 text-xs">{result.error}</span>
+                                </>
+                              )}
+                            </li>
+                          ))
                         : null}
                       {item.testResults
-                        ? item.testResults.map((result) => (
-                          <li key={result.uid}>
-                            {result.status === 'pass' ? (
-                              <span className="test-success flex items-center">
-                                <IconCheck size={18} strokeWidth={2} className="mr-2" />
-                                {result.description}
-                              </span>
-                            ) : (
-                              <>
-                                <span className="test-failure flex items-center">
-                                  <IconX size={18} strokeWidth={2} className="mr-2" />
+                        ? filterTestResults(item.testResults).map((result) => (
+                            <li key={result.uid}>
+                              {result.status === 'pass' ? (
+                                <span className="test-success flex items-center">
+                                  <IconCheck size={18} strokeWidth={2} className="mr-2" />
                                   {result.description}
                                 </span>
-                                <span className="error-message pl-8 text-xs">{result.error}</span>
-                              </>
-                            )}
-                          </li>
-                        ))
+                              ) : (
+                                <>
+                                  <span className="test-failure flex items-center">
+                                    <IconX size={18} strokeWidth={2} className="mr-2" />
+                                    {result.description}
+                                  </span>
+                                  <span className="error-message pl-8 text-xs">{result.error}</span>
+                                </>
+                              )}
+                            </li>
+                          ))
                         : null}
-                      {item.assertionResults?.map((result) => (
+                      {filterTestResults(item.assertionResults).map((result) => (
                         <li key={result.uid}>
                           {result.status === 'pass' ? (
                             <span className="test-success flex items-center">
@@ -454,42 +551,50 @@ export default function RunnerResults({ collection }) {
               );
             })}
           </div>
-
-          {runnerInfo.status === 'ended' ? (
-            <div className="mt-2 mb-4">
-              <button type="submit" className="submit btn btn-sm btn-secondary mt-6" onClick={runAgain}>
-                Run Again
-              </button>
-              <button type="submit" className="submit btn btn-sm btn-secondary mt-6 ml-3" disabled={shouldDisableCollectionRun} onClick={runCollection}>
-                Run Collection
-              </button>
-              <button className="btn btn-sm btn-close mt-6 ml-3" onClick={resetRunner}>
-                Reset
-              </button>
-            </div>
-          ) : null}
         </div>
+
         {selectedItem ? (
           <div className="flex flex-1 w-[50%] overflow-y-auto">
             <div className="flex flex-col w-full overflow-hidden">
-              <div className="flex items-center mb-4 font-medium">
-                <span className="mr-2">{selectedItem.displayName}</span>
-                <span>
-                  {allTestsPassed(selectedItem) ?
-                    <IconCircleCheck className="test-success" size={20} strokeWidth={1.5} />
-                    : null}
-                  {anyTestFailed(selectedItem) ?
-                    <IconCircleX className="test-failure" size={20} strokeWidth={1.5} />
-                    : null}
-                  {selectedItem.status === 'skipped' ?
-                    <IconCircleOff className="skipped-request" size={20} strokeWidth={1.5} />
-                    : null}
-                </span>
+              <div className="flex items-center justify-between mb-4 font-medium">
+                <div className="flex items-center">
+                  <span className="mr-2">{selectedItem.displayName}</span>
+                  <span>
+                    {allTestsPassed(selectedItem)
+                      ? <IconCircleCheck className="test-success" size={20} strokeWidth={1.5} />
+                      : null}
+                    {anyTestFailed(selectedItem)
+                      ? <IconCircleX className="test-failure" size={20} strokeWidth={1.5} />
+                      : null}
+                    {selectedItem.status === 'skipped'
+                      ? <IconCircleOff className="skipped-request" size={20} strokeWidth={1.5} />
+                      : null}
+                  </span>
+                </div>
+                <button
+                  onClick={() => setSelectedItem(null)}
+                  className="p-1 rounded hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors cursor-pointer flex items-center justify-center"
+                  title="Close"
+                  aria-label="Close response view"
+                >
+                  <IconX size={16} strokeWidth={1.5} />
+                </button>
               </div>
               <ResponsePane item={selectedItem} collection={collection} />
             </div>
           </div>
-        ) : null}
+        ) : (
+          <div className="flex flex-1 w-[50%] overflow-y-auto">
+            <div className="flex flex-col w-full h-full items-center justify-center text-center">
+              <div className="mb-4 text-gray-400 dark:text-gray-500">
+                <IconExternalLink size={64} strokeWidth={1.5} />
+              </div>
+              <p className="text-gray-600 dark:text-gray-400">
+                Click on the status code to view the response
+              </p>
+            </div>
+          </div>
+        )}
       </div>
     </StyledWrapper>
   );
diff --git a/packages/bruno-app/src/components/SearchInput/index.js b/packages/bruno-app/src/components/SearchInput/index.js
index 9b3bab639..dd8a3d227 100644
--- a/packages/bruno-app/src/components/SearchInput/index.js
+++ b/packages/bruno-app/src/components/SearchInput/index.js
@@ -19,7 +19,7 @@ const SearchInput = ({
   return (
     <div className={`relative px-2 ${className}`}>
       <div className="absolute inset-y-0 left-0 pl-4 flex items-center pointer-events-none">
-        <span className="text-gray-500 sm:text-sm">
+        <span className="text-gray-500">
           <IconSearch size={16} strokeWidth={1.5} />
         </span>
       </div>
@@ -32,7 +32,7 @@ const SearchInput = ({
         autoCorrect="off"
         autoCapitalize="off"
         spellCheck="false"
-        className="block w-full pl-7 py-2 sm:text-sm rounded-md"
+        className="block w-full pl-7 py-2 rounded-md"
         value={searchText}
         onChange={handleChange}
         {...props}
diff --git a/packages/bruno-app/src/components/SecuritySettings/JsSandboxMode/index.js b/packages/bruno-app/src/components/SecuritySettings/JsSandboxMode/index.js
index c4ab2dbf2..9c7fb679c 100644
--- a/packages/bruno-app/src/components/SecuritySettings/JsSandboxMode/index.js
+++ b/packages/bruno-app/src/components/SecuritySettings/JsSandboxMode/index.js
@@ -20,7 +20,7 @@ const JsSandboxMode = ({ collection }) => {
   };
 
   return (
-    <StyledWrapper className='flex'>
+    <StyledWrapper className="flex">
       {jsSandboxMode === 'safe' && (
         <div
           className="flex items-center border rounded-md text-xs cursor-pointer safe-mode"
diff --git a/packages/bruno-app/src/components/SecuritySettings/JsSandboxModeModal/index.js b/packages/bruno-app/src/components/SecuritySettings/JsSandboxModeModal/index.js
index 4cbbc80ea..d4df4f53c 100644
--- a/packages/bruno-app/src/components/SecuritySettings/JsSandboxModeModal/index.js
+++ b/packages/bruno-app/src/components/SecuritySettings/JsSandboxModeModal/index.js
@@ -30,7 +30,7 @@ const JsSandboxModeModal = ({ collection }) => {
     <Portal>
       <Modal
         size="sm"
-        title={'JavaScript Sandbox'}
+        title="JavaScript Sandbox"
         confirmText="Save"
         handleConfirm={handleSave}
         hideCancel={true}
@@ -43,7 +43,7 @@ const JsSandboxModeModal = ({ collection }) => {
             The collection might include JavaScript code in Variables, Scripts, Tests, and Assertions.
           </div>
 
-          <div className='text-muted mt-6'>
+          <div className="text-muted mt-6">
             Please choose the security level for the JavaScript code execution.
           </div>
 
@@ -62,7 +62,7 @@ const JsSandboxModeModal = ({ collection }) => {
                 Safe Mode
               </span>
             </label>
-            <p className='text-sm text-muted mt-1'>
+            <p className="text-muted mt-1">
               JavaScript code is executed in a secure sandbox and cannot access your filesystem or execute system commands.
             </p>
 
@@ -78,10 +78,10 @@ const JsSandboxModeModal = ({ collection }) => {
               />
               <span className={jsSandboxMode === 'developer' ? 'font-medium' : 'font-normal'}>
                 Developer Mode
-                <span className='ml-1 developer-mode-warning'>(use only if you trust the authors of the collection)</span>
+                <span className="ml-1 developer-mode-warning">(use only if you trust the authors of the collection)</span>
               </span>
             </label>
-            <p className='text-sm text-muted mt-1'>
+            <p className="text-muted mt-1">
               JavaScript code has access to the filesystem, can execute system commands and access sensitive information.
             </p>
           </div>
diff --git a/packages/bruno-app/src/components/SecuritySettings/index.js b/packages/bruno-app/src/components/SecuritySettings/index.js
index f7738cfa8..ed518ba77 100644
--- a/packages/bruno-app/src/components/SecuritySettings/index.js
+++ b/packages/bruno-app/src/components/SecuritySettings/index.js
@@ -26,10 +26,10 @@ const SecuritySettings = ({ collection }) => {
 
   return (
     <StyledWrapper className="flex flex-col h-full relative px-4 py-4">
-      <div className='font-semibold mt-2'>JavaScript Sandbox</div>
+      <div className="font-medium mt-2">JavaScript Sandbox</div>
 
-      <div className='mt-4'>
-      The collection might include JavaScript code in Variables, Scripts, Tests, and Assertions.
+      <div className="mt-4">
+        The collection might include JavaScript code in Variables, Scripts, Tests, and Assertions.
       </div>
 
       <div className="flex flex-col mt-4">
@@ -48,7 +48,7 @@ const SecuritySettings = ({ collection }) => {
               Safe Mode
             </span>
           </label>
-          <p className='text-sm text-muted mt-1'>
+          <p className="text-muted mt-1">
             JavaScript code is executed in a secure sandbox and cannot access your filesystem or execute system commands.
           </p>
 
@@ -64,10 +64,10 @@ const SecuritySettings = ({ collection }) => {
             />
             <span className={jsSandboxMode === 'developer' ? 'font-medium' : 'font-normal'}>
               Developer Mode
-              <span className='ml-1 developer-mode-warning'>(use only if you trust the authors of the collection)</span>
+              <span className="ml-1 developer-mode-warning">(use only if you trust the authors of the collection)</span>
             </span>
           </label>
-          <p className='text-sm text-muted mt-1'>
+          <p className="text-muted mt-1">
             JavaScript code has access to the filesystem, can execute system commands and access sensitive information.
           </p>
         </div>
diff --git a/packages/bruno-app/src/components/SensitiveFieldWarning/StyledWrapper.js b/packages/bruno-app/src/components/SensitiveFieldWarning/StyledWrapper.js
index 97a9389d8..4c62b6001 100644
--- a/packages/bruno-app/src/components/SensitiveFieldWarning/StyledWrapper.js
+++ b/packages/bruno-app/src/components/SensitiveFieldWarning/StyledWrapper.js
@@ -2,9 +2,9 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   .tooltip-mod {
-    font-size: 11px !important;
+    font-size: ${(props) => props.theme.font.size.xs} !important;
     width: 150px !important;
   }
 `;
 
-export default Wrapper;
\ No newline at end of file
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/SensitiveFieldWarning/index.js b/packages/bruno-app/src/components/SensitiveFieldWarning/index.js
index 2b2cce326..4e242ea9d 100644
--- a/packages/bruno-app/src/components/SensitiveFieldWarning/index.js
+++ b/packages/bruno-app/src/components/SensitiveFieldWarning/index.js
@@ -13,13 +13,13 @@ const SensitiveFieldWarning = ({ fieldName, warningMessage }) => {
         <Tooltip
           anchorId={tooltipId}
           className="tooltip-mod max-w-lg"
-          content={
+          content={(
             <div>
               <p>
                 <span>{warningMessage}</span>
               </p>
             </div>
-          }
+          )}
         />
       </span>
     </StyledWrapper>
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CloneCollection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CloneCollection/index.js
index 30169bcd2..043217467 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CloneCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CloneCollection/index.js
@@ -10,7 +10,7 @@ import { sanitizeName, validateName, validateNameError } from 'utils/common/rege
 import Help from 'components/Help';
 import PathDisplay from 'components/PathDisplay';
 import { useState } from 'react';
-import { IconArrowBackUp, IconEdit } from "@tabler/icons";
+import { IconArrowBackUp, IconEdit } from '@tabler/icons';
 import { findCollectionByUid } from 'utils/collections/index';
 import get from 'lodash/get';
 
@@ -18,7 +18,7 @@ const CloneCollection = ({ onClose, collectionUid }) => {
   const inputRef = useRef();
   const dispatch = useDispatch();
   const [isEditing, toggleEditing] = useState(false);
-  const collection = useSelector(state => findCollectionByUid(state.collections.collections, collectionUid));
+  const collection = useSelector((state) => findCollectionByUid(state.collections.collections, collectionUid));
   const preferences = useSelector((state) => state.app.preferences);
   const defaultLocation = get(preferences, 'general.defaultCollectionLocation', '');
   const { name } = collection;
@@ -38,7 +38,7 @@ const CloneCollection = ({ onClose, collectionUid }) => {
       collectionFolderName: Yup.string()
         .min(1, 'must be at least 1 character')
         .max(255, 'must be 255 characters or less')
-        .test('is-valid-collection-name', function(value) {
+        .test('is-valid-collection-name', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
@@ -86,9 +86,9 @@ const CloneCollection = ({ onClose, collectionUid }) => {
 
   return (
     <Modal size="sm" title="Clone Collection" confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
-      <form className="bruno-form" onSubmit={e => e.preventDefault()}>
+      <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
         <div>
-          <label htmlFor="collection-name" className="flex items-center font-semibold">
+          <label htmlFor="collection-name" className="flex items-center font-medium">
             Name
           </label>
           <input
@@ -111,7 +111,7 @@ const CloneCollection = ({ onClose, collectionUid }) => {
             <div className="text-red-500">{formik.errors.collectionName}</div>
           ) : null}
 
-          <label htmlFor="collection-location" className="block font-semibold mt-3">
+          <label htmlFor="collection-location" className="block font-medium mt-3">
             Location
           </label>
           <input
@@ -132,10 +132,8 @@ const CloneCollection = ({ onClose, collectionUid }) => {
           ) : null}
           <div className="mt-1">
             <span
-              className="text-link cursor-pointer hover:underline" onClick={browse}
-              style={{
-                fontSize: '0.8125rem'
-              }}
+              className="text-link cursor-pointer hover:underline"
+              onClick={browse}
             >
               Browse
             </span>
@@ -143,7 +141,7 @@ const CloneCollection = ({ onClose, collectionUid }) => {
 
           <div className="mt-4">
             <div className="flex items-center justify-between">
-              <label htmlFor="filename" className="flex items-center font-semibold">
+              <label htmlFor="filename" className="flex items-center font-medium">
                 Folder Name
                 <Help width="300">
                   <p>
@@ -155,18 +153,18 @@ const CloneCollection = ({ onClose, collectionUid }) => {
                 </Help>
               </label>
               {isEditing ? (
-                <IconArrowBackUp 
-                  className="cursor-pointer opacity-50 hover:opacity-80" 
-                  size={16} 
-                  strokeWidth={1.5} 
-                  onClick={() => toggleEditing(false)} 
+                <IconArrowBackUp
+                  className="cursor-pointer opacity-50 hover:opacity-80"
+                  size={16}
+                  strokeWidth={1.5}
+                  onClick={() => toggleEditing(false)}
                 />
               ) : (
                 <IconEdit
-                  className="cursor-pointer opacity-50 hover:opacity-80" 
-                  size={16} 
+                  className="cursor-pointer opacity-50 hover:opacity-80"
+                  size={16}
                   strokeWidth={1.5}
-                  onClick={() => toggleEditing(true)} 
+                  onClick={() => toggleEditing(true)}
                 />
               )}
             </div>
@@ -184,7 +182,7 @@ const CloneCollection = ({ onClose, collectionUid }) => {
                 value={formik.values.collectionFolderName || ''}
               />
             ) : (
-              <div className='relative flex flex-row gap-1 items-center justify-between'>
+              <div className="relative flex flex-row gap-1 items-center justify-between">
                 <PathDisplay
                   baseName={formik.values.collectionFolderName}
                 />
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/StyledWrapper.js
index d46e186d2..4f8bad5d0 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/StyledWrapper.js
@@ -9,4 +9,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js
index 3a4e2e9c8..096e22385 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js
@@ -6,7 +6,7 @@ import Modal from 'components/Modal';
 import { useDispatch } from 'react-redux';
 import { isItemAFolder } from 'utils/tabs';
 import { cloneItem } from 'providers/ReduxStore/slices/collections/actions';
-import { IconArrowBackUp, IconEdit, IconCaretDown } from "@tabler/icons";
+import { IconArrowBackUp, IconEdit, IconCaretDown } from '@tabler/icons';
 import { sanitizeName, validateName, validateNameError } from 'utils/common/regex';
 import Help from 'components/Help';
 import PathDisplay from 'components/PathDisplay/index';
@@ -42,11 +42,11 @@ const CloneCollectionItem = ({ collectionUid, item, onClose }) => {
         .min(1, 'must be at least 1 character')
         .max(255, 'must be 255 characters or less')
         .required('name is required')
-        .test('is-valid-name', function(value) {
+        .test('is-valid-name', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
-        .test('not-reserved', `The file names "collection" and "folder" are reserved in bruno`, value => !['collection', 'folder'].includes(value))
+        .test('not-reserved', `The file names "collection" and "folder" are reserved in bruno`, (value) => !['collection', 'folder'].includes(value))
     }),
     onSubmit: (values) => {
       dispatch(cloneItem(values.name, values.filename, item.uid, collectionUid))
@@ -75,7 +75,7 @@ const CloneCollectionItem = ({ collectionUid, item, onClose }) => {
         >
           Options
         </button>
-        <IconCaretDown className="caret ml-1" size={14} strokeWidth={2}/>
+        <IconCaretDown className="caret ml-1" size={14} strokeWidth={2} />
       </div>
     );
   });
@@ -91,21 +91,21 @@ const CloneCollectionItem = ({ collectionUid, item, onClose }) => {
         >
           <form className="bruno-form" onSubmit={formik.handleSubmit}>
             <div>
-              <label htmlFor="name" className="block font-semibold">
+              <label htmlFor="name" className="block font-medium">
                 {isFolder ? 'Folder' : 'Request'} Name
               </label>
               <input
                 id="collection-item-name"
                 type="text"
                 name="name"
-                placeholder='Enter Item name'
+                placeholder="Enter Item name"
                 ref={inputRef}
                 className="block textbox mt-2 w-full"
                 autoComplete="off"
                 autoCorrect="off"
                 autoCapitalize="off"
                 spellCheck="false"
-                onChange={e => {
+                onChange={(e) => {
                   formik.setFieldValue('name', e.target.value);
                   !isEditing && formik.setFieldValue('filename', sanitizeName(e.target.value));
                 }}
@@ -113,12 +113,12 @@ const CloneCollectionItem = ({ collectionUid, item, onClose }) => {
               />
               {formik.touched.name && formik.errors.name ? <div className="text-red-500">{formik.errors.name}</div> : null}
             </div>
-            
+
             {showFilesystemName && (
               <div className="mt-4">
                 <div className="flex items-center justify-between">
-                  <label htmlFor="filename" className="flex items-center font-semibold">
-                    {isFolder ? 'Folder' : 'File'} Name <small className='font-normal text-muted ml-1'>(on filesystem)</small>
+                  <label htmlFor="filename" className="flex items-center font-medium">
+                    {isFolder ? 'Folder' : 'File'} Name <small className="font-normal text-muted ml-1">(on filesystem)</small>
                     { isFolder ? (
                       <Help width="300">
                         <p>
@@ -137,29 +137,29 @@ const CloneCollectionItem = ({ collectionUid, item, onClose }) => {
                     )}
                   </label>
                   {isEditing ? (
-                    <IconArrowBackUp 
-                      className="cursor-pointer opacity-50 hover:opacity-80" 
-                      size={16} 
-                      strokeWidth={1.5} 
-                      onClick={() => toggleEditing(false)} 
+                    <IconArrowBackUp
+                      className="cursor-pointer opacity-50 hover:opacity-80"
+                      size={16}
+                      strokeWidth={1.5}
+                      onClick={() => toggleEditing(false)}
                     />
                   ) : (
                     <IconEdit
-                        className="cursor-pointer opacity-50 hover:opacity-80" 
-                        size={16} 
-                        strokeWidth={1.5}
-                        onClick={() => toggleEditing(true)} 
-                      />
+                      className="cursor-pointer opacity-50 hover:opacity-80"
+                      size={16}
+                      strokeWidth={1.5}
+                      onClick={() => toggleEditing(true)}
+                    />
                   )}
                 </div>
                 {isEditing ? (
-                  <div className='relative flex flex-row gap-1 items-center justify-between'>
+                  <div className="relative flex flex-row gap-1 items-center justify-between">
                     <input
                       id="file-name"
                       type="text"
                       name="filename"
                       placeholder={isFolder ? 'Folder Name' : 'File Name'}
-                      className={`!pr-10 block textbox mt-2 w-full`}
+                      className="!pr-10 block textbox mt-2 w-full"
                       autoComplete="off"
                       autoCorrect="off"
                       autoCapitalize="off"
@@ -167,10 +167,10 @@ const CloneCollectionItem = ({ collectionUid, item, onClose }) => {
                       onChange={formik.handleChange}
                       value={formik.values.filename || ''}
                     />
-                    {itemType !== 'folder' && <span className='absolute right-2 top-4 flex justify-center items-center file-extension'>.bru</span>}
+                    {itemType !== 'folder' && <span className="absolute right-2 top-4 flex justify-center items-center file-extension">.bru</span>}
                   </div>
                 ) : (
-                  <div className='relative flex flex-row gap-1 items-center justify-between'>
+                  <div className="relative flex flex-row gap-1 items-center justify-between">
                     <PathDisplay
                       baseName={formik.values.filename}
                     />
@@ -183,9 +183,9 @@ const CloneCollectionItem = ({ collectionUid, item, onClose }) => {
             )}
 
             <div className="flex justify-between items-center mt-8 bruno-modal-footer">
-              <div className='flex advanced-options'>
+              <div className="flex advanced-options">
                 <Dropdown onCreate={onDropdownCreate} icon={<AdvancedOptions />} placement="bottom-start">
-                  <div 
+                  <div
                     className="dropdown-item"
                     key="show-filesystem-name"
                     onClick={(e) => {
@@ -197,8 +197,8 @@ const CloneCollectionItem = ({ collectionUid, item, onClose }) => {
                   </div>
                 </Dropdown>
               </div>
-              <div className='flex justify-end'>
-                <span className='mr-2'>
+              <div className="flex justify-end">
+                <span className="mr-2">
                   <button type="button" onClick={onClose} className="btn btn-md btn-close">
                     Cancel
                   </button>
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemDragPreview/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemDragPreview/index.js
index fa1fb960b..987621353 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemDragPreview/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemDragPreview/index.js
@@ -1,7 +1,7 @@
 import { useDragLayer } from 'react-dnd';
 import {
   IconFile,
-  IconFolder,
+  IconFolder
 } from '@tabler/icons';
 import StyledWrapper from './StyledWrapper';
 
@@ -15,7 +15,7 @@ function getItemStyles({ x, y }) {
     top: 0,
     transform,
     WebkitTransform: transform,
-    zIndex: 100,
+    zIndex: 100
   };
 }
 
@@ -27,7 +27,7 @@ export const CollectionItemDragPreview = () => {
   } = useDragLayer((monitor) => ({
     item: monitor.getItem(),
     isDragging: monitor.isDragging(),
-    clientOffset: monitor.getClientOffset(),
+    clientOffset: monitor.getClientOffset()
   }));
   if (!isDragging) return null;
   if (!item.type) return null;
@@ -35,8 +35,8 @@ export const CollectionItemDragPreview = () => {
   const shouldShowFolderIcon = item.type === 'folder';
   return (
     <StyledWrapper>
-      <div style={getItemStyles({ x, y })} className='p-2'>
-        <div className='flex items-center gap-2 border border-gray-500/10 rounded-md px-2 py-1 drag-preview'>
+      <div style={getItemStyles({ x, y })} className="p-2">
+        <div className="flex items-center gap-2 border border-gray-500/10 rounded-md px-2 py-1 drag-preview">
           {shouldShowFolderIcon ? (
             <IconFolder size={16} />
           ) : (
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemIcon/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemIcon/index.js
index 82d87aa7d..30927cfc4 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemIcon/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemIcon/index.js
@@ -1,6 +1,6 @@
-import RequestMethod from "../RequestMethod";
+import RequestMethod from '../RequestMethod';
 import { IconLoader2, IconAlertTriangle, IconAlertCircle } from '@tabler/icons';
-import StyledWrapper from "./StyledWrapper";
+import StyledWrapper from './StyledWrapper';
 
 const CollectionItemIcon = ({ item }) => {
   if (item?.error) {
@@ -18,4 +18,4 @@ const CollectionItemIcon = ({ item }) => {
   return <RequestMethod item={item} />;
 };
 
-export default CollectionItemIcon;
\ No newline at end of file
+export default CollectionItemIcon;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemInfo/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemInfo/index.js
index ca46d0d79..2df7138f8 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemInfo/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CollectionItemInfo/index.js
@@ -8,7 +8,7 @@ const CollectionItemInfo = ({ item, onClose }) => {
   return (
     <Modal
       size="md"
-      title={`Info`}
+      title="Info"
       handleCancel={onClose}
       hideCancel={true}
       hideFooter={true}
@@ -16,37 +16,37 @@ const CollectionItemInfo = ({ item, onClose }) => {
       <div className="w-fit flex flex-col h-full">
         <table className="w-full border-collapse">
           <tbody>
-          <tr className="">
-            <td className="py-2 px-2 text-left text-muted ">
-              {type=='folder' ? 'Folder Name' : 'Request Name'}
-            </td>
-            <td className="py-2 px-2 text-nowrap truncate max-w-[500px]" title={name}>
-              <span className="mr-2">:</span>{name}
-            </td>
-          </tr>
-          <tr className="">
-            <td className="py-2 px-2 text-left text-muted flex items-center">
-              {type == 'folder' ? 'Folder Name' : 'File Name'}
-              <small className='font-normal text-muted ml-1'>(on filesystem)</small>
-              {type == 'folder' ? (
-                <Help width="300">
-                  <p>
-                    The name of the folder on your filesystem.
-                  </p>
-                </Help>
-              ) : (
-                <Help width="300">
-                  <p>
-                    Bruno saves each request as a file in your collection's folder.
-                  </p>
-                </Help>
-              )}
-            </td>
-            <td className="py-2 px-2 break-all text-nowrap truncate max-w-[500px]" title={filename}>
-              <span className="mr-2">:</span>
-              {filename}
-            </td>
-          </tr>
+            <tr className="">
+              <td className="py-2 px-2 text-left text-muted ">
+                {type == 'folder' ? 'Folder Name' : 'Request Name'}
+              </td>
+              <td className="py-2 px-2 text-nowrap truncate max-w-[500px]" title={name}>
+                <span className="mr-2">:</span>{name}
+              </td>
+            </tr>
+            <tr className="">
+              <td className="py-2 px-2 text-left text-muted flex items-center">
+                {type == 'folder' ? 'Folder Name' : 'File Name'}
+                <small className="font-normal text-muted ml-1">(on filesystem)</small>
+                {type == 'folder' ? (
+                  <Help width="300">
+                    <p>
+                      The name of the folder on your filesystem.
+                    </p>
+                  </Help>
+                ) : (
+                  <Help width="300">
+                    <p>
+                      Bruno saves each request as a file in your collection's folder.
+                    </p>
+                  </Help>
+                )}
+              </td>
+              <td className="py-2 px-2 break-all text-nowrap truncate max-w-[500px]" title={filename}>
+                <span className="mr-2">:</span>
+                {filename}
+              </td>
+            </tr>
           </tbody>
         </table>
       </div>
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/DeleteCollectionItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/DeleteCollectionItem/index.js
index 3f397c78c..f79015ee9 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/DeleteCollectionItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/DeleteCollectionItem/index.js
@@ -6,17 +6,17 @@ import { closeTabs } from 'providers/ReduxStore/slices/tabs';
 import { deleteItem } from 'providers/ReduxStore/slices/collections/actions';
 import { recursivelyGetAllItemUids } from 'utils/collections';
 import StyledWrapper from './StyledWrapper';
+import toast from 'react-hot-toast';
 
 const DeleteCollectionItem = ({ onClose, item, collectionUid }) => {
   const dispatch = useDispatch();
   const isFolder = isItemAFolder(item);
   const onConfirm = () => {
     dispatch(deleteItem(item.uid, collectionUid)).then(() => {
-
       if (isFolder) {
         // close all tabs that belong to the folder
         // including the folder itself and its children
-        const tabUids = [...recursivelyGetAllItemUids(item.items), item.uid]
+        const tabUids = [...recursivelyGetAllItemUids(item.items), item.uid];
 
         dispatch(
           closeTabs({
@@ -30,6 +30,9 @@ const DeleteCollectionItem = ({ onClose, item, collectionUid }) => {
           })
         );
       }
+    }).catch((error) => {
+      console.error('Error deleting item', error);
+      toast.error(error?.message || 'Error deleting item');
     });
     onClose();
   };
@@ -43,7 +46,7 @@ const DeleteCollectionItem = ({ onClose, item, collectionUid }) => {
         handleConfirm={onConfirm}
         handleCancel={onClose}
       >
-        Are you sure you want to delete <span className="font-semibold">{item.name}</span> ?
+        Are you sure you want to delete <span className="font-medium">{item.name}</span> ?
       </Modal>
     </StyledWrapper>
   );
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/DeleteResponseExampleModal/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/DeleteResponseExampleModal/index.js
index 1f4eaf104..af54aeb03 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/DeleteResponseExampleModal/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/DeleteResponseExampleModal/index.js
@@ -28,7 +28,7 @@ const DeleteResponseExampleModal = ({ onClose, example, item, collection }) => {
         handleCancel={onClose}
         confirmButtonClass="btn-danger"
       >
-        Are you sure you want to delete the example <span className="font-semibold">{example.name}</span>?
+        Are you sure you want to delete the example <span className="font-medium">{example.name}</span>?
       </Modal>
     </Portal>
   );
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/StyledWrapper.js
index d6b889abb..f45013809 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/StyledWrapper.js
@@ -21,7 +21,7 @@ const StyledWrapper = styled.div`
   }
 
   .collection-item-name {
-    height: 1.875rem;
+    height: 1.75rem;
     cursor: pointer;
     user-select: none;
     position: relative;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/index.js
index b9b96539c..f174e6ed1 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/ExampleItem/index.js
@@ -212,7 +212,7 @@ const ExampleItem = ({ example, item, collection }) => {
           confirmDisabled={!editName.trim()}
         >
           <div>
-            <label htmlFor="renameExampleName" className="block font-semibold">
+            <label htmlFor="renameExampleName" className="block font-medium">
               Example Name
             </label>
             <input
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/StyledWrapper.js
index 181a258ae..f54b8450a 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeView/StyledWrapper.js
@@ -9,18 +9,18 @@ const StyledWrapper = styled.div`
 
     .CodeMirror {
       height: 100%;
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       line-height: 1.5;
       padding: 0;
 
       .CodeMirror-gutters {
-        background: ${props => props.theme.codemirror.gutter.bg};
-        border-right: 1px solid ${props => props.theme.codemirror.border};
+        background: ${(props) => props.theme.codemirror.gutter.bg};
+        border-right: 1px solid ${(props) => props.theme.codemirror.border};
       }
 
       .CodeMirror-linenumber {
-        color: ${props => props.theme.colors.text.muted};
-        font-size: 11px;
+        color: ${(props) => props.theme.colors.text.muted};
+        font-size: ${(props) => props.theme.font.size.xs};
         padding: 0 3px 0 5px;
       }
 
@@ -41,7 +41,7 @@ const StyledWrapper = styled.div`
     z-index: 10;
     background: transparent;
     border: none;
-    color: ${props => props.theme.colors.text.muted};
+    color: ${(props) => props.theme.colors.text.muted};
     cursor: pointer;
     padding: 6px;
     opacity: 0.7;
@@ -49,7 +49,7 @@ const StyledWrapper = styled.div`
 
     &:hover {
       opacity: 1;
-      color: ${props => props.theme.text};
+      color: ${(props) => props.theme.text};
     }
 
     &:active {
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/StyledWrapper.js
index c73d2ae39..617cb5ff2 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/StyledWrapper.js
@@ -6,8 +6,8 @@ const StyledWrapper = styled.div`
     justify-content: space-between;
     align-items: center;
     padding: 8px 12px;
-    background: ${props => props.theme.requestTabPanel.card.bg};
-    border-bottom: 1px solid ${props => props.theme.requestTabPanel.card.border};
+    background: ${(props) => props.theme.requestTabPanel.card.bg};
+    border-bottom: 1px solid ${(props) => props.theme.requestTabPanel.card.border};
     gap: 12px;
     flex-shrink: 0;
   }
@@ -30,15 +30,15 @@ const StyledWrapper = styled.div`
     top: 50%;
     transform: translateY(-50%);
     pointer-events: none;
-    color: ${props => props.theme.colors.text.muted};
+    color: ${(props) => props.theme.colors.text.muted};
   }
 
   .native-select {
-    background: ${props => props.theme.requestTabPanel.url.bg};
-    border: 1px solid ${props => props.theme.input.border};
+    background: ${(props) => props.theme.requestTabPanel.url.bg};
+    border: 1px solid ${(props) => props.theme.input.border};
     border-radius: 3px;
-    color: ${props => props.theme.text};
-    font-size: 12px;
+    color: ${(props) => props.theme.text};
+    font-size: ${(props) => props.theme.font.size.sm};
     padding: 6px 28px 6px 10px;
     min-width: 140px;
     height: 32px;
@@ -47,18 +47,18 @@ const StyledWrapper = styled.div`
     appearance: none;
 
     &:hover {
-      border-color: ${props => props.theme.input.focusBorder};
+      border-color: ${(props) => props.theme.input.focusBorder};
     }
 
     &:focus {
       outline: none;
-      border-color: ${props => props.theme.input.focusBorder};
-      box-shadow: 0 0 0 2px ${props => props.theme.input.focusBoxShadow};
+      border-color: ${(props) => props.theme.input.focusBorder};
+      box-shadow: 0 0 0 2px ${(props) => props.theme.input.focusBoxShadow};
     }
 
     option {
-      background: ${props => props.theme.bg};
-      color: ${props => props.theme.text};
+      background: ${(props) => props.theme.bg};
+      color: ${(props) => props.theme.text};
       padding: 8px 12px;
     }
   }
@@ -71,25 +71,25 @@ const StyledWrapper = styled.div`
   .lib-btn {
     height: 32px;
     padding: 0 12px;
-    background: ${props => props.theme.requestTabPanel.url.bg};
-    border: 1px solid ${props => props.theme.input.border};
+    background: ${(props) => props.theme.requestTabPanel.url.bg};
+    border: 1px solid ${(props) => props.theme.input.border};
     border-radius: 3px;
-    color: ${props => props.theme.text};
-    font-size: 12px;
+    color: ${(props) => props.theme.text};
+    font-size: ${(props) => props.theme.font.size.sm};
     cursor: pointer;
     transition: all 0.15s ease;
     display: flex;
     align-items: center;
 
     &:hover {
-      background: ${props => props.theme.dropdown.hoverBg};
-      border-color: ${props => props.theme.input.focusBorder};
+      background: ${(props) => props.theme.dropdown.hoverBg};
+      border-color: ${(props) => props.theme.input.focusBorder};
     }
 
     &.active {
-      background: ${props => props.theme.button.secondary.bg};
-      border-color: ${props => props.theme.button.secondary.border};
-      color: ${props => props.theme.button.secondary.color};
+      background: ${(props) => props.theme.button.secondary.bg};
+      border-color: ${(props) => props.theme.button.secondary.border};
+      color: ${(props) => props.theme.button.secondary.color};
     }
   }
 
@@ -99,8 +99,8 @@ const StyledWrapper = styled.div`
       align-items: center;
       gap: 8px;
       cursor: pointer;
-      font-size: 13px;
-      color: ${props => props.theme.text};
+      font-size: ${(props) => props.theme.font.size.base};
+      color: ${(props) => props.theme.text};
 
       input[type="checkbox"] {
         cursor: pointer;
@@ -114,4 +114,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/index.js
index 2e63ce384..c01c71f8a 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/CodeViewToolbar/index.js
@@ -103,4 +103,4 @@ const CodeViewToolbar = () => {
   );
 };
 
-export default CodeViewToolbar;
\ No newline at end of file
+export default CodeViewToolbar;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/StyledWrapper.js
index 324e9ec3c..a51b4390d 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/StyledWrapper.js
@@ -17,7 +17,7 @@ const StyledWrapper = styled.div`
     flex: 1;
     overflow: hidden;
     position: relative;
-    background: ${props => props.theme.bg};
+    background: ${(props) => props.theme.bg};
   }
 
   .error-message {
@@ -26,18 +26,18 @@ const StyledWrapper = styled.div`
     align-items: center;
     justify-content: center;
     height: 100%;
-    color: ${props => props.theme.colors.text.muted};
+    color: ${(props) => props.theme.colors.text.muted};
     text-align: center;
     padding: 20px;
 
     h1 {
-      font-size: 14px;
+      font-size: ${(props) => props.theme.font.size.base};
       margin-bottom: 8px;
-      color: ${props => props.theme.text};
+      color: ${(props) => props.theme.text};
     }
 
     p {
-      font-size: 12px;
+      font-size: ${(props) => props.theme.font.size.sm};
       opacity: 0.8;
     }
   }
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js
index ea5939540..d7372784a 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js
@@ -12,7 +12,7 @@ import { interpolateUrl, interpolateUrlPathParams } from 'utils/url/index';
 import { getLanguages } from 'utils/codegenerator/targets';
 import { useSelector } from 'react-redux';
 import { getAllVariables, getGlobalEnvironmentVariables } from 'utils/collections/index';
-import { resolveInheritedAuth } from './utils/auth-utils';
+import { resolveInheritedAuth } from 'utils/auth';
 
 const TEMPLATE_VAR_PATTERN = /\{\{([^}]+)\}\}/;
 
@@ -24,7 +24,7 @@ const validateURLWithVars = (url) => {
 
 const GenerateCodeItem = ({ collectionUid, item, onClose, isExample = false, exampleUid = null }) => {
   const languages = getLanguages();
-  const collection = useSelector(state => state.collections.collections?.find(c => c.uid === collectionUid));
+  const collection = useSelector((state) => state.collections.collections?.find((c) => c.uid === collectionUid));
   const { globalEnvironments, activeGlobalEnvironmentUid } = useSelector((state) => state.globalEnvironments);
   const generateCodePrefs = useSelector((state) => state.app.generateCode);
   const globalEnvironmentVariables = getGlobalEnvironmentVariables({
@@ -104,7 +104,7 @@ const GenerateCodeItem = ({ collectionUid, item, onClose, isExample = false, exa
       ? generateCodePrefs.mainLanguage
       : `${generateCodePrefs.mainLanguage}-${generateCodePrefs.library}`;
 
-    return languages.find(lang => lang.name === fullName) || languages[0];
+    return languages.find((lang) => lang.name === fullName) || languages[0];
   }, [generateCodePrefs.mainLanguage, generateCodePrefs.library, languages]);
 
   // Resolve auth inheritance
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/interpolation.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/interpolation.js
index e7081b268..ea4f35b69 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/interpolation.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/interpolation.js
@@ -43,7 +43,7 @@ export const interpolateBody = (body, variables = {}) => {
       break;
 
     case 'formUrlEncoded':
-      interpolatedBody.formUrlEncoded = Array.isArray(body.formUrlEncoded) 
+      interpolatedBody.formUrlEncoded = Array.isArray(body.formUrlEncoded)
         ? body.formUrlEncoded.map((param) => ({
             ...param,
             value: param.enabled ? interpolate(param.value, variables) : param.value
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/interpolation.spec.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/interpolation.spec.js
index 8c5920b76..b174bf380 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/interpolation.spec.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/interpolation.spec.js
@@ -45,4 +45,4 @@ describe('interpolation utils', () => {
       expect(interpolateBody(null, { a: 1 })).toBeNull();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js
index effc1c158..03c4cd973 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js
@@ -1,47 +1,9 @@
 import { buildHarRequest } from 'utils/codegenerator/har';
 import { getAuthHeaders } from 'utils/codegenerator/auth';
-import { getAllVariables, getTreePathFromCollectionToItem } from 'utils/collections/index';
+import { getAllVariables, getTreePathFromCollectionToItem, mergeHeaders } from 'utils/collections/index';
 import { interpolateHeaders, interpolateBody } from './interpolation';
 import { get } from 'lodash';
 
-// Merge headers from collection, folders, and request
-const mergeHeaders = (collection, request, requestTreePath) => {
-  let headers = new Map();
-
-  // Add collection headers first
-  const collectionHeaders = collection?.draft?.root ? get(collection, 'draft.root.request.headers', []) : get(collection, 'root.request.headers', []);
-  collectionHeaders.forEach((header) => {
-    if (header.enabled) {
-      headers.set(header.name, header);
-    }
-  });
-
-  // Add folder headers next, traversing from root to leaf
-  if (requestTreePath && requestTreePath.length > 0) {
-    for (let i of requestTreePath) {
-      if (i.type === 'folder') {
-        const folderHeaders = i?.draft ? get(i, 'draft.request.headers', []) : get(i, 'root.request.headers', []);
-        folderHeaders.forEach((header) => {
-          if (header.enabled) {
-            headers.set(header.name, header);
-          }
-        });
-      }
-    }
-  }
-
-  // Add request headers last (they take precedence)
-  const requestHeaders = request.headers || [];
-  requestHeaders.forEach((header) => {
-    if (header.enabled) {
-      headers.set(header.name, header);
-    }
-  });
-
-  // Convert Map back to array
-  return Array.from(headers.values());
-};
-
 const generateSnippet = ({ language, item, collection, shouldInterpolate = false }) => {
   try {
     // Get HTTPSnippet dynamically so mocks can be applied in tests
@@ -88,6 +50,5 @@ const generateSnippet = ({ language, item, collection, shouldInterpolate = false
 };
 
 export {
-  generateSnippet,
-  mergeHeaders
-};
\ No newline at end of file
+  generateSnippet
+};
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.spec.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.spec.js
index 43581b2b4..e20f35a22 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.spec.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.spec.js
@@ -45,22 +45,26 @@ jest.mock('utils/codegenerator/auth', () => ({
   getAuthHeaders: jest.fn(() => [])
 }));
 
-jest.mock('utils/collections/index', () => ({
-  getAllVariables: jest.fn((collection) => ({
-    ...collection?.globalEnvironmentVariables,
-    ...collection?.runtimeVariables,
-    ...collection?.processEnvVariables,
-    baseUrl: 'https://api.example.com',
-    apiKey: 'secret-key-123',
-    userId: '12345'
-  })),
-  getTreePathFromCollectionToItem: jest.fn(() => [])
-}));
+jest.mock('utils/collections/index', () => {
+  const actual = jest.requireActual('utils/collections/index');
 
-import { generateSnippet, mergeHeaders } from './snippet-generator';
+  return {
+    ...actual,
+    getAllVariables: jest.fn((collection) => ({
+      ...collection?.globalEnvironmentVariables,
+      ...collection?.runtimeVariables,
+      ...collection?.processEnvVariables,
+      baseUrl: 'https://api.example.com',
+      apiKey: 'secret-key-123',
+      userId: '12345'
+    })),
+    getTreePathFromCollectionToItem: jest.fn(() => [])
+  };
+});
+
+import { generateSnippet } from './snippet-generator';
 
 describe('Snippet Generator - Simple Tests', () => {
-
   // Simple test request - easy to understand
   const testRequest = {
     uid: 'test-request-123',
@@ -424,41 +428,6 @@ describe('Snippet Generator - Simple Tests', () => {
   });
 });
 
-describe('mergeHeaders', () => {
-  it('should include headers from collection, folder and request (with correct precedence)', () => {
-    const collection = {
-      root: {
-        request: {
-          headers: [
-            { name: 'X-Collection', value: 'c', enabled: true }
-          ]
-        }
-      }
-    };
-
-    const folder = {
-      type: 'folder',
-      root: {
-        request: {
-          headers: [
-            { name: 'X-Folder', value: 'f', enabled: true }
-          ]
-        }
-      }
-    };
-
-    const request = {
-      headers: [
-        { name: 'X-Request', value: 'r', enabled: true }
-      ]
-    };
-
-    const headers = mergeHeaders(collection, request, [folder]);
-    const names = headers.map((h) => h.name);
-    expect(names).toEqual(expect.arrayContaining(['X-Collection', 'X-Folder', 'X-Request']));
-  });
-});
-
 // Snippet should include inherited headers
 describe('generateSnippet – header inclusion in output', () => {
   it('should include collection and folder headers in generated snippet', () => {
@@ -584,4 +553,4 @@ describe('generateSnippet with edge-case bodies', () => {
     const result = generateSnippet({ language, item, collection: baseCollection, shouldInterpolate: true });
     expect(result).toMatch(/^curl -X POST/);
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/StyledWrapper.js
index d46e186d2..4f8bad5d0 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/StyledWrapper.js
@@ -9,4 +9,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/index.js
index 6b0cb086a..0852c03d2 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/index.js
@@ -44,11 +44,11 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
         .min(1, 'must be at least 1 character')
         .max(255, 'must be 255 characters or less')
         .required('name is required')
-        .test('is-valid-name', function(value) {
+        .test('is-valid-name', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
-        .test('not-reserved', `The file names "collection" and "folder" are reserved in bruno`, value => !['collection', 'folder'].includes(value))
+        .test('not-reserved', `The file names "collection" and "folder" are reserved in bruno`, (value) => !['collection', 'folder'].includes(value))
     }),
     onSubmit: async (values) => {
       // if there is unsaved changes in the request,
@@ -63,7 +63,7 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
       try {
         let renameConfig = {
           itemUid: item.uid,
-          collectionUid,
+          collectionUid
         };
         renameConfig['newName'] = newName;
         if (itemFilename !== newFilename) {
@@ -95,7 +95,7 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
         >
           Options
         </button>
-        <IconCaretDown className="caret ml-1" size={14} strokeWidth={2}/>
+        <IconCaretDown className="caret ml-1" size={14} strokeWidth={2} />
       </div>
     );
   });
@@ -110,8 +110,8 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
           hideFooter
         >
           <form className="bruno-form" onSubmit={formik.handleSubmit}>
-            <div className='flex flex-col mt-2'>
-              <label htmlFor="name" className="block font-semibold">
+            <div className="flex flex-col mt-2">
+              <label htmlFor="name" className="block font-medium">
                 {isFolder ? 'Folder' : 'Request'} Name
               </label>
               <input
@@ -124,7 +124,7 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
                 autoCorrect="off"
                 autoCapitalize="off"
                 spellCheck="false"
-                onChange={e => {
+                onChange={(e) => {
                   formik.setFieldValue('name', e.target.value);
                   !isEditing && formik.setFieldValue('filename', sanitizeName(e.target.value));
                 }}
@@ -136,8 +136,8 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
             {showFilesystemName && (
               <div className="mt-4">
                 <div className="flex items-center justify-between">
-                  <label htmlFor="filename" className="flex items-center font-semibold">
-                    {isFolder ? 'Folder' : 'File'} Name <small className='font-normal text-muted ml-1'>(on filesystem)</small>
+                  <label htmlFor="filename" className="flex items-center font-medium">
+                    {isFolder ? 'Folder' : 'File'} Name <small className="font-normal text-muted ml-1">(on filesystem)</small>
                     { isFolder ? (
                       <Help width="300">
                         <p>
@@ -156,29 +156,29 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
                     )}
                   </label>
                   {isEditing ? (
-                    <IconArrowBackUp 
+                    <IconArrowBackUp
                       className="cursor-pointer opacity-50 hover:opacity-80"
-                      size={16} 
-                      strokeWidth={1.5} 
-                      onClick={() => toggleEditing(false)} 
+                      size={16}
+                      strokeWidth={1.5}
+                      onClick={() => toggleEditing(false)}
                     />
                   ) : (
                     <IconEdit
-                      className="cursor-pointer opacity-50 hover:opacity-80" 
-                      size={16} 
+                      className="cursor-pointer opacity-50 hover:opacity-80"
+                      size={16}
                       strokeWidth={1.5}
-                      onClick={() => toggleEditing(true)} 
+                      onClick={() => toggleEditing(true)}
                     />
                   )}
                 </div>
                 {isEditing ? (
-                  <div className='relative flex flex-row gap-1 items-center justify-between'>
+                  <div className="relative flex flex-row gap-1 items-center justify-between">
                     <input
                       id="file-name"
                       type="text"
                       name="filename"
                       placeholder={isFolder ? 'Folder Name' : 'File Name'}
-                      className={`!pr-10 block textbox mt-2 w-full`}
+                      className="!pr-10 block textbox mt-2 w-full"
                       autoComplete="off"
                       autoCorrect="off"
                       autoCapitalize="off"
@@ -186,10 +186,10 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
                       onChange={formik.handleChange}
                       value={formik.values.filename || ''}
                     />
-                    {itemType !== 'folder' && <span className='absolute right-2 top-4 flex justify-center items-center file-extension'>.bru</span>}
+                    {itemType !== 'folder' && <span className="absolute right-2 top-4 flex justify-center items-center file-extension">.bru</span>}
                   </div>
                 ) : (
-                  <div className='relative flex flex-row gap-1 items-center justify-between'>
+                  <div className="relative flex flex-row gap-1 items-center justify-between">
                     <PathDisplay
                       baseName={formik.values.filename}
                     />
@@ -201,9 +201,9 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
               </div>
             )}
             <div className="flex justify-between items-center mt-8 bruno-modal-footer">
-              <div className='flex advanced-options'>
+              <div className="flex advanced-options">
                 <Dropdown onCreate={onDropdownCreate} icon={<AdvancedOptions />} placement="bottom-start">
-                  <div 
+                  <div
                     className="dropdown-item"
                     key="show-filesystem-name"
                     onClick={(e) => {
@@ -215,8 +215,8 @@ const RenameCollectionItem = ({ collectionUid, item, onClose }) => {
                   </div>
                 </Dropdown>
               </div>
-              <div className='flex justify-end'>
-                <span className='mr-2'>
+              <div className="flex justify-end">
+                <span className="mr-2">
                   <button type="button" onClick={onClose} className="btn btn-md btn-close">
                     Cancel
                   </button>
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RequestMethod/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RequestMethod/StyledWrapper.js
index 608d3b422..7b2eafd5b 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RequestMethod/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RequestMethod/StyledWrapper.js
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  font-size: 0.6875rem;
+  font-size: ${(props) => props.theme.font.size.xs};
   display: flex;
   align-self: stretch;
   align-items: center;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RunCollectionItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RunCollectionItem/index.js
index a3cbbd0fa..12e0b1ea0 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RunCollectionItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RunCollectionItem/index.js
@@ -14,7 +14,7 @@ import { getRequestItemsForCollectionRun } from 'utils/collections/index';
 const RunCollectionItem = ({ collectionUid, item, onClose }) => {
   const dispatch = useDispatch();
 
-  const collection = useSelector(state => state.collections.collections?.find(c => c.uid === collectionUid));
+  const collection = useSelector((state) => state.collections.collections?.find((c) => c.uid === collectionUid));
   const isCollectionRunInProgress = collection?.runnerResult?.info?.status && (collection?.runnerResult?.info?.status !== 'ended');
 
   // tags for the collection run
@@ -47,7 +47,7 @@ const RunCollectionItem = ({ collectionUid, item, onClose }) => {
       })
     );
     onClose();
-  }
+  };
 
   const isFolderLoading = areItemsLoading(item);
 
@@ -72,12 +72,12 @@ const RunCollectionItem = ({ collectionUid, item, onClose }) => {
             <span className="font-medium">Recursive Run</span>
             <span className="ml-1 text-xs">({totalRequestItemsCountForRecursiveFolderRun} requests)</span>
           </div>
-          <div className={isFolderLoading ? "mb-2" : "mb-8"}>This will run all the requests in this folder and all its subfolders.</div>
-          {isFolderLoading ? <div className='mb-8 warning'>Requests in this folder are still loading.</div> : null}
-          {isCollectionRunInProgress ? <div className='mb-6 warning'>A Collection Run is already in progress.</div> : null}
+          <div className={isFolderLoading ? 'mb-2' : 'mb-8'}>This will run all the requests in this folder and all its subfolders.</div>
+          {isFolderLoading ? <div className="mb-8 warning">Requests in this folder are still loading.</div> : null}
+          {isCollectionRunInProgress ? <div className="mb-6 warning">A Collection Run is already in progress.</div> : null}
 
           {/* Tags for the collection run */}
-          <RunnerTags collectionUid={collection.uid} className='mb-6' />
+          <RunnerTags collectionUid={collection.uid} className="mb-6" />
 
           <div className="flex justify-end bruno-modal-footer">
             <span className="mr-3">
@@ -86,25 +86,28 @@ const RunCollectionItem = ({ collectionUid, item, onClose }) => {
               </button>
             </span>
             {
-              isCollectionRunInProgress ? 
-                <span>
-                  <button type="submit" className="submit btn btn-md btn-secondary mr-3" onClick={handleViewRunner}>
-                    View Run
-                  </button>
-                </span>
-              :
-                <>
-                  <span>
-                    <button type="submit" disabled={shouldDisableRecursiveFolderRun} className="submit btn btn-md btn-secondary mr-3" onClick={() => onSubmit(true)}>
-                      Recursive Run
-                    </button>
-                  </span>
-                  <span>
-                    <button type="submit" disabled={shouldDisableFolderRun} className="submit btn btn-md btn-secondary" onClick={() => onSubmit(false)}>
-                      Run
-                    </button>
-                  </span>
-                </>
+              isCollectionRunInProgress
+                ? (
+                    <span>
+                      <button type="submit" className="submit btn btn-md btn-secondary mr-3" onClick={handleViewRunner}>
+                        View Run
+                      </button>
+                    </span>
+                  )
+                : (
+                    <>
+                      <span>
+                        <button type="submit" disabled={shouldDisableRecursiveFolderRun} className="submit btn btn-md btn-secondary mr-3" onClick={() => onSubmit(true)}>
+                          Recursive Run
+                        </button>
+                      </span>
+                      <span>
+                        <button type="submit" disabled={shouldDisableFolderRun} className="submit btn btn-md btn-secondary" onClick={() => onSubmit(false)}>
+                          Run
+                        </button>
+                      </span>
+                    </>
+                  )
             }
           </div>
         </div>
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/StyledWrapper.js
index 4e3525df9..960520b0f 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/StyledWrapper.js
@@ -20,7 +20,7 @@ const Wrapper = styled.div`
   }
 
   .collection-item-name {
-    height: 1.875rem;
+    height: 1.75rem;
     cursor: pointer;
     user-select: none;
     position: relative;
@@ -131,6 +131,15 @@ const Wrapper = styled.div`
       }
     }
 
+    &.item-keyboard-focused {
+      background: ${(props) => props.theme.sidebar.collection.item.keyboardFocusBg};
+      outline: none;
+
+      &:hover {
+        background: ${(props) => props.theme.sidebar.collection.item.keyboardFocusBg} !important;
+      }
+    }
+
     div.tippy-box {
       position: relative;
       top: -0.625rem;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js
index a41a13024..0c35d5045 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/index.js
@@ -4,7 +4,23 @@ import range from 'lodash/range';
 import filter from 'lodash/filter';
 import classnames from 'classnames';
 import { useDrag, useDrop } from 'react-dnd';
-import { IconChevronRight, IconDots } from '@tabler/icons';
+import {
+  IconChevronRight,
+  IconDots,
+  IconFilePlus,
+  IconFolderPlus,
+  IconPlayerPlay,
+  IconEdit,
+  IconCopy,
+  IconClipboard,
+  IconCode,
+  IconPhoto,
+  IconFolder,
+  IconTrash,
+  IconSettings,
+  IconInfoCircle,
+  IconTerminal2
+} from '@tabler/icons';
 import { useSelector, useDispatch } from 'react-redux';
 import { addTab, focusTab, makeTabPermanent } from 'providers/ReduxStore/slices/tabs';
 import { handleCollectionItemDrop, sendRequest, showInFolder, pasteItem, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
@@ -36,6 +52,7 @@ import { isEqual } from 'lodash';
 import { calculateDraggedItemNewPathname, getInitialExampleName } from 'utils/collections/index';
 import { sortByNameThenSequence } from 'utils/common/index';
 import CreateExampleModal from 'components/ResponseExample/CreateExampleModal';
+import { openDevtoolsAndSwitchToTerminal } from 'utils/terminal';
 
 const CollectionItem = ({ item, collectionUid, collectionPathname, searchText }) => {
   const _isTabForItemActiveSelector = isTabForItemActiveSelector({ itemUid: item.uid });
@@ -43,7 +60,7 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
 
   const _isTabForItemPresentSelector = isTabForItemPresentSelector({ itemUid: item.uid });
   const isTabForItemPresent = useSelector(_isTabForItemPresentSelector, isEqual);
-  
+
   const isSidebarDragging = useSelector((state) => state.app.isDragging);
   const collection = useSelector((state) => state.collections.collections?.find((c) => c.uid === collectionUid));
   const { hasCopiedItems } = useSelector((state) => state.app.clipboard);
@@ -62,6 +79,7 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
   const [runCollectionModalOpen, setRunCollectionModalOpen] = useState(false);
   const [itemInfoModalOpen, setItemInfoModalOpen] = useState(false);
   const [examplesExpanded, setExamplesExpanded] = useState(false);
+  const [isKeyboardFocused, setIsKeyboardFocused] = useState(false);
   const hasSearchText = searchText && searchText?.trim()?.length;
   const itemIsCollapsed = hasSearchText ? false : item.collapsed;
   const isFolder = isItemAFolder(item);
@@ -78,7 +96,7 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
       isDragging: monitor.isDragging()
     }),
     options: {
-      dropEffect: "move"
+      dropEffect: 'move'
     }
   });
 
@@ -128,7 +146,7 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
     if (!newPathname) return false;
 
     if (targetItemPathname?.startsWith(draggedItemPathname)) return false;
-    
+
     return true;
   };
 
@@ -149,19 +167,19 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
     drop: async (draggedItem, monitor) => {
       const { uid: targetItemUid } = item;
       const { uid: draggedItemUid } = draggedItem;
-  
+
       if (draggedItemUid === targetItemUid) return;
-  
+
       const dropType = determineDropType(monitor);
       if (!dropType) return;
 
-      await dispatch(handleCollectionItemDrop({ targetItem: item, draggedItem, dropType, collectionUid }))
+      await dispatch(handleCollectionItemDrop({ targetItem: item, draggedItem, dropType, collectionUid }));
       setDropType(null);
     },
     canDrop: (draggedItem) => draggedItem.uid !== item.uid,
     collect: (monitor) => ({
       isOver: monitor.isOver()
-    }),
+    })
   });
 
   const dropdownTippyRef = useRef();
@@ -182,10 +200,11 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
   });
 
   const itemRowClassName = classnames('flex collection-item-name relative items-center', {
-    'item-focused-in-tab': isTabForItemActive,
+    'item-focused-in-tab': isTabForItemActive && !isKeyboardFocused,
     'item-hovered': isOver && canDrop,
     'drop-target': isOver && dropType === 'inside',
-    'drop-target-above': isOver && dropType === 'adjacent'
+    'drop-target-above': isOver && dropType === 'adjacent',
+    'item-keyboard-focused': isKeyboardFocused
   });
 
   const handleRun = async () => {
@@ -198,7 +217,7 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
 
   const handleClick = (event) => {
     if (event && event.detail != 1) return;
-    //scroll to the active tab
+    // scroll to the active tab
     setTimeout(scrollToTheActiveTab, 50);
     const isRequest = isItemARequest(item);
     if (isRequest) {
@@ -216,7 +235,7 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
           uid: item.uid,
           collectionUid: collectionUid,
           requestPaneTab: getDefaultRequestPaneTab(item),
-          type: 'request',
+          type: 'request'
         })
       );
     } else {
@@ -224,10 +243,10 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
         addTab({
           uid: item.uid,
           collectionUid: collectionUid,
-          type: 'folder-settings',
+          type: 'folder-settings'
         })
       );
-      if(item.collapsed) {
+      if (item.collapsed) {
         dispatch(
           toggleCollectionItem({
             itemUid: item.uid,
@@ -301,7 +320,7 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
     dispatch(makeTabPermanent({ uid: item.uid }));
   };
 
-    // Sort items by their "seq" property.
+  // Sort items by their "seq" property.
   const sortItemsBySequence = (items = []) => {
     return items.sort((a, b) => a.seq - b.seq);
   };
@@ -357,15 +376,15 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
     setCreateExampleModalOpen(false);
   };
 
-  const folderItems = sortByNameThenSequence(filter(item.items, (i) => isItemAFolder(i))); 
+  const folderItems = sortByNameThenSequence(filter(item.items, (i) => isItemAFolder(i)));
   const requestItems = sortItemsBySequence(filter(item.items, (i) => isItemARequest(i)));
- 
+
   const handleGenerateCode = (e) => {
     e.stopPropagation();
     dropdownTippyRef.current.hide();
     if (
-      (item?.request?.url !== '') ||
-      (item?.draft?.request?.url !== undefined && item?.draft?.request?.url !== '')
+      (item?.request?.url !== '')
+      || (item?.draft?.request?.url !== undefined && item?.draft?.request?.url !== '')
     ) {
       setGenerateCodeItemModalOpen(true);
     } else {
@@ -389,23 +408,56 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
     }
   };
 
-  const handleCopyRequest = () => {
+  const handleCopyItem = () => {
     dropdownTippyRef.current.hide();
     dispatch(copyRequest(item));
-    toast.success('Request copied to clipboard');
+    const itemType = isFolder ? 'Folder' : 'Request';
+    toast.success(`${itemType} copied to clipboard`);
   };
 
-  const handlePasteRequest = () => {
+  const handlePasteItem = () => {
     dropdownTippyRef.current.hide();
+
+    // Only allow paste into folders
+    if (!isFolder) {
+      toast.error('Paste is only available for folders');
+      return;
+    }
+
     dispatch(pasteItem(collectionUid, item.uid))
       .then(() => {
-        toast.success('Request pasted successfully');
+        toast.success('Item pasted successfully');
       })
       .catch((err) => {
-        toast.error(err ? err.message : 'An error occurred while pasting the request');
+        toast.error(err ? err.message : 'An error occurred while pasting the item');
       });
   };
 
+  // Keyboard shortcuts handler
+  const handleKeyDown = (e) => {
+    // Detect Mac by checking both metaKey and platform
+    const isMac = navigator.userAgent?.includes('Mac') || navigator.platform?.startsWith('Mac');
+    const isModifierPressed = isMac ? e.metaKey : e.ctrlKey;
+
+    if (isModifierPressed && e.key.toLowerCase() === 'c') {
+      e.preventDefault();
+      e.stopPropagation();
+      handleCopyItem();
+    } else if (isModifierPressed && e.key.toLowerCase() === 'v') {
+      e.preventDefault();
+      e.stopPropagation();
+      handlePasteItem();
+    }
+  };
+
+  const handleFocus = () => {
+    setIsKeyboardFocused(true);
+  };
+
+  const handleBlur = () => {
+    setIsKeyboardFocused(false);
+  };
+
   return (
     <StyledWrapper className={className}>
       {renameItemModalOpen && (
@@ -445,6 +497,10 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
           ref.current = node;
           drag(drop(node));
         }}
+        tabIndex={0}
+        onKeyDown={handleKeyDown}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
       >
         <div className="flex items-center h-full w-full">
           {indents && indents.length
@@ -500,6 +556,18 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
           </div>
           <div className="menu-icon pr-2">
             <Dropdown onCreate={onDropdownCreate} icon={<MenuIcon />} placement="bottom-start">
+              <div
+                className="dropdown-item"
+                onClick={(e) => {
+                  dropdownTippyRef.current.hide();
+                  setItemInfoModalOpen(true);
+                }}
+              >
+                <span className="dropdown-icon">
+                  <IconInfoCircle size={16} strokeWidth={2} />
+                </span>
+                Info
+              </div>
               {isFolder && (
                 <>
                   <div
@@ -509,6 +577,9 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
                       setNewRequestModalOpen(true);
                     }}
                   >
+                    <span className="dropdown-icon">
+                      <IconFilePlus size={16} strokeWidth={2} />
+                    </span>
                     New Request
                   </div>
                   <div
@@ -518,6 +589,9 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
                       setNewFolderModalOpen(true);
                     }}
                   >
+                    <span className="dropdown-icon">
+                      <IconFolderPlus size={16} strokeWidth={2} />
+                    </span>
                     New Folder
                   </div>
                   <div
@@ -527,10 +601,45 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
                       setRunCollectionModalOpen(true);
                     }}
                   >
+                    <span className="dropdown-icon">
+                      <IconPlayerPlay size={16} strokeWidth={2} />
+                    </span>
                     Run
                   </div>
                 </>
               )}
+              <div
+                className="dropdown-item"
+                onClick={(e) => {
+                  dropdownTippyRef.current.hide();
+                  setCloneItemModalOpen(true);
+                }}
+              >
+                <span className="dropdown-icon">
+                  <IconCopy size={16} strokeWidth={2} />
+                </span>
+                Clone
+              </div>
+              <div
+                className="dropdown-item"
+                onClick={handleCopyItem}
+              >
+                <span className="dropdown-icon">
+                  <IconCopy size={16} strokeWidth={2} />
+                </span>
+                Copy
+              </div>
+              {isFolder && hasCopiedItems && (
+                <div
+                  className="dropdown-item"
+                  onClick={handlePasteItem}
+                >
+                  <span className="dropdown-icon">
+                    <IconClipboard size={16} strokeWidth={2} />
+                  </span>
+                  Paste
+                </div>
+              )}
               <div
                 className="dropdown-item"
                 onClick={(e) => {
@@ -538,45 +647,23 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
                   setRenameItemModalOpen(true);
                 }}
               >
+                <span className="dropdown-icon">
+                  <IconEdit size={16} strokeWidth={2} />
+                </span>
                 Rename
               </div>
               <div
                 className="dropdown-item"
                 onClick={(e) => {
                   dropdownTippyRef.current.hide();
-                  setCloneItemModalOpen(true);
+                  handleShowInFolder();
                 }}
               >
-                Clone
+                <span className="dropdown-icon">
+                  <IconFolder size={16} strokeWidth={2} />
+                </span>
+                Show in Folder
               </div>
-              {!isFolder && (
-                <div
-                  className="dropdown-item"
-                  onClick={handleCopyRequest}
-                >
-                  Copy
-                </div>
-              )}
-              {isFolder && hasCopiedItems && (
-                <div
-                  className="dropdown-item"
-                  onClick={handlePasteRequest}
-                >
-                  Paste
-                </div>
-              )}
-              {!isFolder && (
-                <div
-                  className="dropdown-item"
-                  onClick={(e) => {
-                    dropdownTippyRef.current.hide();
-                    handleClick(null);
-                    handleRun();
-                  }}
-                >
-                  Run
-                </div>
-              )}
               {!isFolder && (item.type === 'http-request' || item.type === 'graphql-request') && (
                 <div
                   className="dropdown-item"
@@ -584,6 +671,9 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
                     handleGenerateCode(e);
                   }}
                 >
+                  <span className="dropdown-icon">
+                    <IconCode size={16} strokeWidth={2} />
+                  </span>
                   Generate Code
                 </div>
               )}
@@ -595,27 +685,13 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
                     setCreateExampleModalOpen(true);
                   }}
                 >
+                  <span className="dropdown-icon">
+                    <IconPhoto size={16} strokeWidth={2} />
+                  </span>
                   Create Example
                 </div>
               )}
-              <div
-                className="dropdown-item"
-                onClick={(e) => {
-                  dropdownTippyRef.current.hide();
-                  handleShowInFolder();
-                }}
-              >
-                Show in Folder
-              </div>
-              <div
-                className="dropdown-item delete-item"
-                onClick={(e) => {
-                  dropdownTippyRef.current.hide();
-                  setDeleteItemModalOpen(true);
-                }}
-              >
-                Delete
-              </div>
+              <div className="dropdown-separator"></div>
               {isFolder && (
                 <div
                   className="dropdown-item"
@@ -624,17 +700,39 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
                     viewFolderSettings();
                   }}
                 >
+                  <span className="dropdown-icon">
+                    <IconSettings size={16} strokeWidth={2} />
+                  </span>
                   Settings
                 </div>
               )}
+              {isFolder && (
+                <div
+                  className="dropdown-item"
+                  onClick={async (e) => {
+                    dropdownTippyRef.current.hide();
+                    // Get folder pathname
+                    const folderCwd = item.pathname || collectionPathname;
+                    await openDevtoolsAndSwitchToTerminal(dispatch, folderCwd);
+                  }}
+                >
+                  <span className="dropdown-icon">
+                    <IconTerminal2 size={16} strokeWidth={2} />
+                  </span>
+                  Open in Terminal
+                </div>
+              )}
               <div
-                className="dropdown-item item-info"
+                className="dropdown-item delete-item"
                 onClick={(e) => {
                   dropdownTippyRef.current.hide();
-                  setItemInfoModalOpen(true);
+                  setDeleteItemModalOpen(true);
                 }}
               >
-                Info
+                <span className="dropdown-icon">
+                  <IconTrash size={16} strokeWidth={2} />
+                </span>
+                Delete
               </div>
             </Dropdown>
           </div>
@@ -675,4 +773,4 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
   );
 };
 
-export default React.memo(CollectionItem);
\ No newline at end of file
+export default React.memo(CollectionItem);
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/ConfirmCollectionCloseDrafts.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/ConfirmCollectionCloseDrafts.js
new file mode 100644
index 000000000..bb67370b8
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/ConfirmCollectionCloseDrafts.js
@@ -0,0 +1,122 @@
+import React from 'react';
+import filter from 'lodash/filter';
+import { useDispatch } from 'react-redux';
+import { flattenItems, isItemARequest, hasRequestChanges } from 'utils/collections';
+import { pluralizeWord } from 'utils/common';
+import { saveMultipleRequests } from 'providers/ReduxStore/slices/collections/actions';
+import { deleteRequestDraft } from 'providers/ReduxStore/slices/collections';
+import { removeCollection } from 'providers/ReduxStore/slices/collections/actions';
+import { IconAlertTriangle } from '@tabler/icons';
+import Modal from 'components/Modal';
+import toast from 'react-hot-toast';
+
+const ConfirmCollectionCloseDrafts = ({ onClose, collection, collectionUid }) => {
+  const MAX_UNSAVED_REQUESTS_TO_SHOW = 5;
+  const dispatch = useDispatch();
+
+  // Get all draft items in the collection
+  const currentDrafts = React.useMemo(() => {
+    if (!collection) return [];
+    const items = flattenItems(collection.items);
+    const collectionDrafts = filter(items, (item) => isItemARequest(item) && hasRequestChanges(item));
+    return collectionDrafts.map((draft) => ({
+      ...draft,
+      collectionUid: collectionUid
+    }));
+  }, [collection, collectionUid]);
+
+  const handleSaveAll = () => {
+    dispatch(saveMultipleRequests(currentDrafts))
+      .then(() => {
+        dispatch(removeCollection(collectionUid))
+          .then(() => {
+            toast.success('Collection removed from workspace');
+            onClose();
+          })
+          .catch(() => toast.error('An error occurred while removing the collection'));
+      })
+      .catch(() => {
+        toast.error('Failed to save requests!');
+      });
+  };
+
+  const handleDiscardAll = () => {
+    // Discard all drafts
+    currentDrafts.forEach((draft) => {
+      dispatch(deleteRequestDraft({
+        collectionUid: collectionUid,
+        itemUid: draft.uid
+      }));
+    });
+
+    // Then remove the collection
+    dispatch(removeCollection(collectionUid))
+      .then(() => {
+        toast.success('Collection removed from workspace');
+        onClose();
+      })
+      .catch(() => toast.error('An error occurred while removing the collection'));
+  };
+
+  if (!currentDrafts.length) {
+    return null;
+  }
+
+  return (
+    <Modal
+      size="md"
+      title="Remove Collection"
+      confirmText="Save and Remove"
+      cancelText="Remove without saving"
+      handleCancel={onClose}
+      disableEscapeKey={true}
+      disableCloseOnOutsideClick={true}
+      closeModalFadeTimeout={150}
+      hideFooter={true}
+    >
+      <div className="flex items-center">
+        <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
+        <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
+      </div>
+      <p className="mt-4">
+        Do you want to save the changes you made to the following{' '}
+        <span className="font-medium">{currentDrafts.length}</span> {pluralizeWord('request', currentDrafts.length)}?
+      </p>
+
+      <ul className="mt-4">
+        {currentDrafts.slice(0, MAX_UNSAVED_REQUESTS_TO_SHOW).map((item) => {
+          return (
+            <li key={item.uid} className="mt-1 text-xs">
+              {item.filename}
+            </li>
+          );
+        })}
+      </ul>
+
+      {currentDrafts.length > MAX_UNSAVED_REQUESTS_TO_SHOW && (
+        <p className="mt-1 text-xs">
+          ...{currentDrafts.length - MAX_UNSAVED_REQUESTS_TO_SHOW} additional{' '}
+          {pluralizeWord('request', currentDrafts.length - MAX_UNSAVED_REQUESTS_TO_SHOW)} not shown
+        </p>
+      )}
+
+      <div className="flex justify-between mt-6">
+        <div>
+          <button className="btn btn-sm btn-danger" onClick={handleDiscardAll}>
+            Discard and Remove
+          </button>
+        </div>
+        <div>
+          <button className="btn btn-close btn-sm mr-2" onClick={onClose}>
+            Cancel
+          </button>
+          <button className="btn btn-secondary btn-sm" onClick={handleSaveAll}>
+            {currentDrafts.length > 1 ? 'Save All and Remove' : 'Save and Remove'}
+          </button>
+        </div>
+      </div>
+    </Modal>
+  );
+};
+
+export default ConfirmCollectionCloseDrafts;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js
index 17b6dc007..49fc910f4 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/index.js
@@ -1,36 +1,60 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import toast from 'react-hot-toast';
 import Modal from 'components/Modal';
 import { useDispatch, useSelector } from 'react-redux';
 import { IconFiles } from '@tabler/icons';
 import { removeCollection } from 'providers/ReduxStore/slices/collections/actions';
-import { findCollectionByUid } from 'utils/collections/index';
+import { findCollectionByUid, flattenItems, isItemARequest, hasRequestChanges } from 'utils/collections/index';
+import filter from 'lodash/filter';
+import ConfirmCollectionCloseDrafts from './ConfirmCollectionCloseDrafts';
 
 const RemoveCollection = ({ onClose, collectionUid }) => {
   const dispatch = useDispatch();
-  const collection = useSelector(state => findCollectionByUid(state.collections.collections, collectionUid));
+  const collection = useSelector((state) => findCollectionByUid(state.collections.collections, collectionUid));
+
+  // Detect drafts in the collection
+  const drafts = useMemo(() => {
+    if (!collection) return [];
+    const items = flattenItems(collection.items);
+    return filter(items, (item) => isItemARequest(item) && hasRequestChanges(item));
+  }, [collection]);
 
   const onConfirm = () => {
+    if (!collection) {
+      toast.error('Collection not found');
+      onClose();
+      return;
+    }
     dispatch(removeCollection(collection.uid))
       .then(() => {
-        toast.success('Collection closed');
+        toast.success('Collection removed from workspace');
         onClose();
       })
-      .catch(() => toast.error('An error occurred while closing the collection'));
+      .catch(() => toast.error('An error occurred while removing the collection'));
   };
 
+  if (!collection) {
+    return <div>Collection not found</div>;
+  }
+
+  // If there are drafts, show the draft confirmation modal
+  if (drafts.length > 0) {
+    return <ConfirmCollectionCloseDrafts onClose={onClose} collection={collection} collectionUid={collectionUid} />;
+  }
+
+  // Otherwise, show the standard remove confirmation modal
   return (
-    <Modal size="sm" title="Close Collection" confirmText="Close" handleConfirm={onConfirm} handleCancel={onClose}>
+    <Modal size="sm" title="Remove Collection" confirmText="Remove" handleConfirm={onConfirm} handleCancel={onClose}>
       <div className="flex items-center">
         <IconFiles size={18} strokeWidth={1.5} />
-        <span className="ml-2 mr-4 font-semibold">{collection.name}</span>
+        <span className="ml-2 mr-4 font-medium">{collection.name}</span>
       </div>
       <div className="break-words text-xs mt-1">{collection.pathname}</div>
       <div className="mt-4">
-        Are you sure you want to close collection <span className="font-semibold">{collection.name}</span> in Bruno?
+        Are you sure you want to remove collection <span className="font-medium">{collection.name}</span> from this workspace?
       </div>
-      <div className="mt-4">
-        It will still be available in the file system at the above location and can be re-opened later.
+      <div className="mt-4 text-muted">
+        The collection files will remain on disk and can be re-added to this or another workspace later.
       </div>
     </Modal>
   );
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RenameCollection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RenameCollection/index.js
index 0d3a4c34a..49f86bd8d 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RenameCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RenameCollection/index.js
@@ -10,7 +10,7 @@ import { findCollectionByUid } from 'utils/collections/index';
 const RenameCollection = ({ collectionUid, onClose }) => {
   const dispatch = useDispatch();
   const inputRef = useRef();
-  const collection = useSelector(state => findCollectionByUid(state.collections.collections, collectionUid));
+  const collection = useSelector((state) => findCollectionByUid(state.collections.collections, collectionUid));
   const formik = useFormik({
     enableReinitialize: true,
     initialValues: {
@@ -43,9 +43,9 @@ const RenameCollection = ({ collectionUid, onClose }) => {
 
   return (
     <Modal size="sm" title="Rename Collection" confirmText="Rename" handleConfirm={onSubmit} handleCancel={onClose}>
-      <form className="bruno-form" onSubmit={e => e.preventDefault()}>
+      <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
         <div>
-          <label htmlFor="name" className="block font-semibold">
+          <label htmlFor="name" className="block font-medium">
             Name
           </label>
           <input
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/StyledWrapper.js
index dc2e05251..bcce56e5e 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/StyledWrapper.js
@@ -2,11 +2,10 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   .collection-name {
-    height: 1.875rem;
+    height: 1.75rem;
     cursor: pointer;
     user-select: none;
     padding-left: 8px;
-    font-weight: 600;
     border: ${(props) => props.theme.dragAndDrop.borderStyle} transparent;
 
     .rotate-90 {
@@ -95,6 +94,15 @@ const Wrapper = styled.div`
         background: ${(props) => props.theme.sidebar.collection.item.bg} !important;
       }
     }
+
+    &.collection-keyboard-focused {
+      background: ${(props) => props.theme.sidebar.collection.item.keyboardFocusBg};
+      outline: none;
+
+      &:hover {
+        background: ${(props) => props.theme.sidebar.collection.item.keyboardFocusBg} !important;
+      }
+    }
   }
 
   #sidebar-collection-name {
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
index bdd3025c2..b9f0305e3 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
@@ -4,7 +4,22 @@ import classnames from 'classnames';
 import { uuid } from 'utils/common';
 import filter from 'lodash/filter';
 import { useDrop, useDrag } from 'react-dnd';
-import { IconChevronRight, IconDots, IconLoader2 } from '@tabler/icons';
+import {
+  IconChevronRight,
+  IconDots,
+  IconLoader2,
+  IconFilePlus,
+  IconFolderPlus,
+  IconCopy,
+  IconClipboard,
+  IconPlayerPlay,
+  IconEdit,
+  IconShare,
+  IconFoldDown,
+  IconX,
+  IconSettings,
+  IconTerminal2
+} from '@tabler/icons';
 import Dropdown from 'components/Dropdown';
 import { toggleCollection, collapseFullCollection } from 'providers/ReduxStore/slices/collections';
 import { mountCollection, moveCollectionAndPersist, handleCollectionItemDrop, pasteItem } from 'providers/ReduxStore/slices/collections/actions';
@@ -28,6 +43,7 @@ import { scrollToTheActiveTab } from 'utils/tabs';
 import ShareCollection from 'components/ShareCollection/index';
 import { CollectionItemDragPreview } from './CollectionItem/CollectionItemDragPreview/index';
 import { sortByNameThenSequence } from 'utils/common/index';
+import { openDevtoolsAndSwitchToTerminal } from 'utils/terminal';
 
 const Collection = ({ collection, searchText }) => {
   const [showNewFolderModal, setShowNewFolderModal] = useState(false);
@@ -37,10 +53,11 @@ const Collection = ({ collection, searchText }) => {
   const [showShareCollectionModal, setShowShareCollectionModal] = useState(false);
   const [showRemoveCollectionModal, setShowRemoveCollectionModal] = useState(false);
   const [dropType, setDropType] = useState(null);
+  const [isKeyboardFocused, setIsKeyboardFocused] = useState(false);
   const dispatch = useDispatch();
   const isLoading = areItemsLoading(collection);
   const collectionRef = useRef(null);
-  
+
   const isCollectionFocused = useSelector(isTabForItemActive({ itemUid: collection.uid }));
   const { hasCopiedItems } = useSelector((state) => state.app.clipboard);
   const menuDropdownTippyRef = useRef();
@@ -64,7 +81,7 @@ const Collection = ({ collection, searchText }) => {
   };
 
   const ensureCollectionIsMounted = () => {
-    if(collection.mountStatus === 'mounted'){
+    if (collection.mountStatus === 'mounted') {
       return;
     }
     dispatch(mountCollection({
@@ -72,7 +89,7 @@ const Collection = ({ collection, searchText }) => {
       collectionPathname: collection.pathname,
       brunoConfig: collection.brunoConfig
     }));
-  }
+  };
 
   const hasSearchText = searchText && searchText?.trim()?.length;
   const collectionIsCollapsed = hasSearchText ? false : collection.collapsed;
@@ -86,27 +103,27 @@ const Collection = ({ collection, searchText }) => {
     // Check if the click came from the chevron icon
     const isChevronClick = event.target.closest('svg')?.classList.contains('chevron-icon');
     setTimeout(scrollToTheActiveTab, 50);
-    
+
     ensureCollectionIsMounted();
 
-    if(collection.collapsed) {
+    if (collection.collapsed) {
       dispatch(toggleCollection(collection.uid));
     }
-  
-    if(!isChevronClick) {
+
+    if (!isChevronClick) {
       dispatch(hideHomePage()); // @TODO Playwright tests are often stuck on home page, rather than collection settings tab. Revisit for a proper fix.
       dispatch(
         addTab({
           uid: collection.uid,
           collectionUid: collection.uid,
-          type: 'collection-settings',
+          type: 'collection-settings'
         })
       );
     }
   };
 
   const handleDoubleClick = (_event) => {
-    dispatch(makeTabPermanent({ uid: collection.uid }))
+    dispatch(makeTabPermanent({ uid: collection.uid }));
   };
 
   const handleCollectionCollapse = (e) => {
@@ -114,7 +131,7 @@ const Collection = ({ collection, searchText }) => {
     e.preventDefault();
     ensureCollectionIsMounted();
     dispatch(toggleCollection(collection.uid));
-  }
+  };
 
   // prevent the parent's double-click handler from firing
   const handleCollectionDoubleClick = (e) => {
@@ -147,34 +164,55 @@ const Collection = ({ collection, searchText }) => {
     );
   };
 
-  const handlePasteRequest = () => {
+  const handlePasteItem = () => {
     menuDropdownTippyRef.current.hide();
     dispatch(pasteItem(collection.uid, null))
       .then(() => {
-        toast.success('Request pasted successfully');
+        toast.success('Item pasted successfully');
       })
       .catch((err) => {
-        toast.error(err ? err.message : 'An error occurred while pasting the request');
+        toast.error(err ? err.message : 'An error occurred while pasting the item');
       });
   };
 
+  // Keyboard shortcuts handler for collection
+  const handleKeyDown = (e) => {
+    // Detect Mac by checking both metaKey and platform
+    const isMac = navigator.userAgent?.includes('Mac') || navigator.platform?.startsWith('Mac');
+    const isModifierPressed = isMac ? e.metaKey : e.ctrlKey;
+
+    if (isModifierPressed && e.key.toLowerCase() === 'v') {
+      e.preventDefault();
+      e.stopPropagation();
+      handlePasteItem();
+    }
+  };
+
+  const handleFocus = () => {
+    setIsKeyboardFocused(true);
+  };
+
+  const handleBlur = () => {
+    setIsKeyboardFocused(false);
+  };
+
   const isCollectionItem = (itemType) => {
     return itemType === 'collection-item';
   };
 
   const [{ isDragging }, drag, dragPreview] = useDrag({
-    type: "collection",
+    type: 'collection',
     item: collection,
     collect: (monitor) => ({
-      isDragging: monitor.isDragging(),
+      isDragging: monitor.isDragging()
     }),
     options: {
-      dropEffect: "move"
+      dropEffect: 'move'
     }
   });
-  
+
   const [{ isOver }, drop] = useDrop({
-    accept: ["collection", "collection-item"],
+    accept: ['collection', 'collection-item'],
     hover: (_draggedItem, monitor) => {
       const itemType = monitor.getItemType();
       if (isCollectionItem(itemType)) {
@@ -188,9 +226,9 @@ const Collection = ({ collection, searchText }) => {
     drop: (draggedItem, monitor) => {
       const itemType = monitor.getItemType();
       if (isCollectionItem(itemType)) {
-        dispatch(handleCollectionItemDrop({ targetItem: collection, draggedItem, dropType: 'inside', collectionUid: collection.uid }))
+        dispatch(handleCollectionItemDrop({ targetItem: collection, draggedItem, dropType: 'inside', collectionUid: collection.uid }));
       } else {
-        dispatch(moveCollectionAndPersist({draggedItem, targetItem: collection}));
+        dispatch(moveCollectionAndPersist({ draggedItem, targetItem: collection }));
       }
       setDropType(null);
     },
@@ -198,8 +236,8 @@ const Collection = ({ collection, searchText }) => {
       return draggedItem.uid !== collection.uid;
     },
     collect: (monitor) => ({
-      isOver: monitor.isOver(),
-    }),
+      isOver: monitor.isOver()
+    })
   });
 
   useEffect(() => {
@@ -213,10 +251,11 @@ const Collection = ({ collection, searchText }) => {
   }
 
   const collectionRowClassName = classnames('flex py-1 collection-name items-center', {
-      'item-hovered': isOver && dropType === 'adjacent', // For collection-to-collection moves (show line)
-      'drop-target': isOver && dropType === 'inside', // For collection-item drops (highlight full area)
-      'collection-focused-in-tab': isCollectionFocused
-    });
+    'item-hovered': isOver && dropType === 'adjacent', // For collection-to-collection moves (show line)
+    'drop-target': isOver && dropType === 'inside', // For collection-item drops (highlight full area)
+    'collection-focused-in-tab': isCollectionFocused && !isKeyboardFocused,
+    'collection-keyboard-focused': isKeyboardFocused
+  });
 
   // we need to sort request items by seq property
   const sortItemsBySequence = (items = []) => {
@@ -243,11 +282,16 @@ const Collection = ({ collection, searchText }) => {
         <CloneCollection collectionUid={collection.uid} onClose={() => setShowCloneCollectionModalOpen(false)} />
       )}
       <CollectionItemDragPreview />
-      <div className={collectionRowClassName}
+      <div
+        className={collectionRowClassName}
         ref={(node) => {
           collectionRef.current = node;
           drag(drop(node));
         }}
+        tabIndex={0}
+        onKeyDown={handleKeyDown}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
       >
         <div
           className="flex flex-grow items-center overflow-hidden"
@@ -274,20 +318,41 @@ const Collection = ({ collection, searchText }) => {
               className="dropdown-item"
               onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
+                ensureCollectionIsMounted();
                 setShowNewRequestModal(true);
               }}
             >
+              <span className="dropdown-icon">
+                <IconFilePlus size={16} strokeWidth={2} />
+              </span>
               New Request
             </div>
             <div
               className="dropdown-item"
               onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
+                ensureCollectionIsMounted();
                 setShowNewFolderModal(true);
               }}
             >
+              <span className="dropdown-icon">
+                <IconFolderPlus size={16} strokeWidth={2} />
+              </span>
               New Folder
             </div>
+            <div
+              className="dropdown-item"
+              onClick={(_e) => {
+                menuDropdownTippyRef.current.hide();
+                ensureCollectionIsMounted();
+                handleRun();
+              }}
+            >
+              <span className="dropdown-icon">
+                <IconPlayerPlay size={16} strokeWidth={2} />
+              </span>
+              Run
+            </div>
             <div
               className="dropdown-item"
               data-testid="clone-collection"
@@ -296,26 +361,22 @@ const Collection = ({ collection, searchText }) => {
                 setShowCloneCollectionModalOpen(true);
               }}
             >
+              <span className="dropdown-icon">
+                <IconCopy size={16} strokeWidth={2} />
+              </span>
               Clone
             </div>
             {hasCopiedItems && (
               <div
                 className="dropdown-item"
-                onClick={handlePasteRequest}
+                onClick={handlePasteItem}
               >
+                <span className="dropdown-icon">
+                  <IconClipboard size={16} strokeWidth={2} />
+                </span>
                 Paste
               </div>
             )}
-            <div
-              className="dropdown-item"
-              onClick={(_e) => {
-                menuDropdownTippyRef.current.hide();
-                ensureCollectionIsMounted();
-                handleRun();
-              }}
-            >
-              Run
-            </div>
             <div
               className="dropdown-item"
               onClick={(_e) => {
@@ -323,6 +384,9 @@ const Collection = ({ collection, searchText }) => {
                 setShowRenameCollectionModal(true);
               }}
             >
+              <span className="dropdown-icon">
+                <IconEdit size={16} strokeWidth={2} />
+              </span>
               Rename
             </div>
             <div
@@ -333,6 +397,9 @@ const Collection = ({ collection, searchText }) => {
                 setShowShareCollectionModal(true);
               }}
             >
+              <span className="dropdown-icon">
+                <IconShare size={16} strokeWidth={2} />
+              </span>
               Share
             </div>
             <div
@@ -342,8 +409,37 @@ const Collection = ({ collection, searchText }) => {
                 handleCollapseFullCollection();
               }}
             >
+              <span className="dropdown-icon">
+                <IconFoldDown size={16} strokeWidth={2} />
+              </span>
               Collapse
             </div>
+            <div className="dropdown-separator"></div>
+            <div
+              className="dropdown-item"
+              onClick={(_e) => {
+                menuDropdownTippyRef.current.hide();
+                viewCollectionSettings();
+              }}
+            >
+              <span className="dropdown-icon">
+                <IconSettings size={16} strokeWidth={2} />
+              </span>
+              Settings
+            </div>
+            <div
+              className="dropdown-item"
+              onClick={async (_e) => {
+                menuDropdownTippyRef.current.hide();
+                const collectionCwd = collection.pathname;
+                await openDevtoolsAndSwitchToTerminal(dispatch, collectionCwd);
+              }}
+            >
+              <span className="dropdown-icon">
+                <IconTerminal2 size={16} strokeWidth={2} />
+              </span>
+              Open in Terminal
+            </div>
             <div
               className="dropdown-item"
               onClick={(_e) => {
@@ -351,16 +447,10 @@ const Collection = ({ collection, searchText }) => {
                 setShowRemoveCollectionModal(true);
               }}
             >
-              Close
-            </div>
-            <div
-              className="dropdown-item"
-              onClick={(_e) => {
-                menuDropdownTippyRef.current.hide();
-                viewCollectionSettings();
-              }}
-            >
-              Settings
+              <span className="dropdown-icon">
+                <IconX size={16} strokeWidth={2} />
+              </span>
+              Remove
             </div>
           </Dropdown>
         </div>
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/CollectionSearch/index.js b/packages/bruno-app/src/components/Sidebar/Collections/CollectionSearch/index.js
new file mode 100644
index 000000000..db7499c75
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/Collections/CollectionSearch/index.js
@@ -0,0 +1,40 @@
+import { IconSearch, IconX } from '@tabler/icons';
+
+const CollectionSearch = ({ searchText, setSearchText }) => {
+  return (
+    <div className="relative collection-filter px-2">
+      <div className="absolute inset-y-0 left-0 pl-4 flex items-center pointer-events-none">
+        <span className="text-gray-500 sm:text-sm">
+          <IconSearch size={16} strokeWidth={1.5} />
+        </span>
+      </div>
+      <input
+        type="text"
+        name="search"
+        placeholder="Search requests …"
+        id="search"
+        autoComplete="off"
+        autoCorrect="off"
+        autoCapitalize="off"
+        spellCheck="false"
+        className="block w-full pl-7 pr-8 py-1 sm:text-sm"
+        value={searchText}
+        onChange={(e) => setSearchText(e.target.value.toLowerCase())}
+      />
+      {searchText !== '' && (
+        <div className="absolute inset-y-0 right-0 pr-4 flex items-center">
+          <span
+            className="close-icon"
+            onClick={() => {
+              setSearchText('');
+            }}
+          >
+            <IconX size={16} strokeWidth={1.5} className="cursor-pointer" />
+          </span>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default CollectionSearch;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/CollectionsHeader/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/CollectionsHeader/StyledWrapper.js
new file mode 100644
index 000000000..ef11bec64
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/Collections/CollectionsHeader/StyledWrapper.js
@@ -0,0 +1,24 @@
+import styled from 'styled-components';
+
+const Wrapper = styled.div`
+  .collections-badge {
+    margin-inline: 0.5rem;
+    background-color: ${(props) => props.theme.sidebar.badge.bg};
+    border-radius: 5px;
+
+    .caret {
+      margin-left: 0.25rem;
+      color: rgb(140, 140, 140);
+      fill: rgb(140, 140, 140);
+    }
+
+    .collections-header-actions {
+      .collection-action-button {
+        opacity: 0;
+        transition: opacity 0.2s ease-in-out;
+      }
+    }
+  }
+`;
+
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/CollectionsHeader/index.js b/packages/bruno-app/src/components/Sidebar/Collections/CollectionsHeader/index.js
new file mode 100644
index 000000000..935239723
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/Collections/CollectionsHeader/index.js
@@ -0,0 +1,86 @@
+import { useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { IconArrowsSort, IconFolders, IconSortAscendingLetters, IconSortDescendingLetters } from '@tabler/icons';
+import CloseAllIcon from 'components/Icons/CloseAll';
+import { sortCollections } from 'providers/ReduxStore/slices/collections/index';
+import RemoveCollectionsModal from '../RemoveCollectionsModal';
+import StyledWrapper from './StyledWrapper';
+
+const CollectionsHeader = () => {
+  const dispatch = useDispatch();
+  const { collections } = useSelector((state) => state.collections);
+  const { collectionSortOrder } = useSelector((state) => state.collections);
+  const [collectionsToClose, setCollectionsToClose] = useState([]);
+
+  const sortCollectionOrder = () => {
+    let order;
+    switch (collectionSortOrder) {
+      case 'default':
+        order = 'alphabetical';
+        break;
+      case 'alphabetical':
+        order = 'reverseAlphabetical';
+        break;
+      case 'reverseAlphabetical':
+        order = 'default';
+        break;
+    }
+    dispatch(sortCollections({ order }));
+  };
+
+  let sortIcon;
+  if (collectionSortOrder === 'default') {
+    sortIcon = <IconArrowsSort size={18} strokeWidth={1.5} />;
+  } else if (collectionSortOrder === 'alphabetical') {
+    sortIcon = <IconSortAscendingLetters size={18} strokeWidth={1.5} />;
+  } else {
+    sortIcon = <IconSortDescendingLetters size={18} strokeWidth={1.5} />;
+  }
+
+  const selectAllCollectionsToClose = () => {
+    setCollectionsToClose(collections.map((c) => c.uid));
+  };
+
+  const clearCollectionsToClose = () => {
+    setCollectionsToClose([]);
+  };
+
+  return (
+    <StyledWrapper>
+      <div className="collections-badge flex items-center justify-between px-2 mt-2 relative">
+        <div className="flex items-center  py-1 select-none">
+          <span className="mr-2">
+            <IconFolders size={18} strokeWidth={1.5} />
+          </span>
+          <span>Collections</span>
+        </div>
+        {collections.length >= 1 && (
+          <div className="flex items-center collections-header-actions">
+            <button
+              className="mr-1 collection-action-button"
+              onClick={selectAllCollectionsToClose}
+              aria-label="Close all collections"
+              title="Close all collections"
+              data-testid="close-all-collections-button"
+            >
+              <CloseAllIcon size={18} strokeWidth={1.5} className="cursor-pointer" />
+            </button>
+            <button
+              className="collection-action-button"
+              onClick={() => sortCollectionOrder()}
+              aria-label="Sort collections"
+              title="Sort collections"
+            >
+              {sortIcon}
+            </button>
+            {collectionsToClose.length > 0 && (
+              <RemoveCollectionsModal collectionUids={collectionsToClose} onClose={clearCollectionsToClose} />
+            )}
+          </div>
+        )}
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default CollectionsHeader;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/CreateOrOpenCollection/index.js b/packages/bruno-app/src/components/Sidebar/Collections/CreateOrOpenCollection/index.js
index 1de9084ab..fbaefa2f8 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/CreateOrOpenCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/CreateOrOpenCollection/index.js
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { useTheme } from '../../../../providers/Theme';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { openCollection } from 'providers/ReduxStore/slices/collections/actions';
 
 import toast from 'react-hot-toast';
@@ -17,6 +17,9 @@ const CreateOrOpenCollection = () => {
   const dispatch = useDispatch();
   const [createCollectionModalOpen, setCreateCollectionModalOpen] = useState(false);
 
+  const { workspaces, activeWorkspaceUid } = useSelector((state) => state.workspaces);
+  const activeWorkspace = workspaces.find((w) => w.uid === activeWorkspaceUid);
+
   const handleOpenCollection = () => {
     dispatch(openCollection()).catch(
       (err) => {
@@ -42,7 +45,11 @@ const CreateOrOpenCollection = () => {
 
   return (
     <StyledWrapper className="px-2 mt-4">
-      {createCollectionModalOpen ? <CreateCollection onClose={() => setCreateCollectionModalOpen(false)} /> : null}
+      {createCollectionModalOpen ? (
+        <CreateCollection
+          onClose={() => setCreateCollectionModalOpen(false)}
+        />
+      ) : null}
 
       <div className="text-xs text-center">
         <div>No collections found.</div>
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/RemoveCollectionsModal/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/RemoveCollectionsModal/StyledWrapper.js
new file mode 100644
index 000000000..c45141ee0
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/Collections/RemoveCollectionsModal/StyledWrapper.js
@@ -0,0 +1,60 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  width: 600px;
+  overflow: hidden;
+  box-sizing: border-box;
+
+  .collections-list-container {
+    width: 100%;
+    max-height: 150px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 4px 0;
+    box-sizing: border-box;
+  }
+
+  .collections-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    width: 100%;
+  }
+
+  .collection-tag {
+    display: inline-flex;
+    align-items: center;
+    padding: 6px 12px;
+    background-color: ${(props) => props.theme.requestTabs.active.bg};
+    border: 1px solid ${(props) => props.theme.requestTabs.bottomBorder};
+    border-radius: 4px;
+    font-size: ${(props) => props.theme.font.size.sm};
+    font-weight: 500;
+    color: ${(props) => props.theme.text};
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .collection-tag-text {
+    display: inline-block;
+    max-width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .show-more-link,
+  .show-less-link {
+    display: inline-flex;
+    align-items: center;
+    
+    &:hover {
+      span {
+        text-decoration: underline;
+      }
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/RemoveCollectionsModal/index.js b/packages/bruno-app/src/components/Sidebar/Collections/RemoveCollectionsModal/index.js
new file mode 100644
index 000000000..1c0715e52
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/Collections/RemoveCollectionsModal/index.js
@@ -0,0 +1,273 @@
+import React, { useState, useMemo } from 'react';
+import toast from 'react-hot-toast';
+import { useDispatch, useSelector } from 'react-redux';
+import { filter, groupBy } from 'lodash';
+import Modal from 'components/Modal';
+import Portal from 'components/Portal';
+import {
+  removeCollection,
+  saveMultipleRequests,
+  saveMultipleCollections,
+  saveMultipleFolders
+} from 'providers/ReduxStore/slices/collections/actions';
+import {
+  findCollectionByUid,
+  flattenItems,
+  isItemARequest,
+  isItemAFolder,
+  hasRequestChanges
+} from 'utils/collections/index';
+import { IconAlertTriangle } from '@tabler/icons';
+import StyledWrapper from './StyledWrapper';
+
+const MAX_COLLECTIONS_WIDTH = 530;
+const CHARACTER_WIDTH = 8;
+const COLLECTION_PADDING = 24;
+const COLLECTION_GAP = 12;
+
+const getDisplayItems = (items, maxWidth = MAX_COLLECTIONS_WIDTH) => {
+  const visibleItems = [];
+  let totalWidth = 0;
+
+  for (let i = 0; i < items.length; i += 1) {
+    const currentItem = items[i];
+    const name = typeof currentItem === 'string' ? currentItem : currentItem?.name || '';
+    const width = name.length * CHARACTER_WIDTH + COLLECTION_PADDING + COLLECTION_GAP;
+
+    if (i === 0 || totalWidth + width <= maxWidth) {
+      totalWidth += width;
+      visibleItems.push(currentItem);
+    } else {
+      break;
+    }
+  }
+
+  return visibleItems;
+};
+
+const RemoveCollectionsModal = ({ collectionUids, onClose }) => {
+  const dispatch = useDispatch();
+  const allCollections = useSelector((state) => state.collections.collections || []);
+  const [showAllCollections, setShowAllCollections] = useState(false);
+
+  const allDrafts = useMemo(() => {
+    const requestDrafts = [];
+    const collectionDrafts = [];
+    const folderDrafts = [];
+
+    collectionUids.forEach((collectionUid) => {
+      const collection = findCollectionByUid(allCollections, collectionUid);
+      if (!collection) {
+        return;
+      }
+
+      // Check for collection draft
+      if (collection.draft) {
+        collectionDrafts.push({
+          name: collection.name,
+          collectionUid: collectionUid
+        });
+      }
+
+      // Check for request and folder drafts
+      const items = flattenItems(collection.items);
+
+      // Request drafts
+      const unsavedRequests = filter(items, (item) => isItemARequest(item) && hasRequestChanges(item));
+      unsavedRequests.forEach((request) => {
+        requestDrafts.push({
+          ...request,
+          collectionUid: collectionUid
+        });
+      });
+
+      // Folder drafts
+      const unsavedFolders = filter(items, (item) => isItemAFolder(item) && item.draft);
+      unsavedFolders.forEach((folder) => {
+        folderDrafts.push({
+          name: folder.name,
+          folderUid: folder.uid,
+          collectionUid: collectionUid
+        });
+      });
+    });
+
+    return { requestDrafts, collectionDrafts, folderDrafts };
+  }, [collectionUids, allCollections]);
+
+  const collectionsWithUnsavedChanges = useMemo(() => {
+    const allDraftTypes = [...allDrafts.collectionDrafts, ...allDrafts.folderDrafts, ...allDrafts.requestDrafts];
+    const draftsByCollection = groupBy(allDraftTypes, 'collectionUid');
+    return Object.keys(draftsByCollection)
+      .map((collectionUid) => {
+        const collection = findCollectionByUid(allCollections, collectionUid);
+        return collection ? { uid: collectionUid, name: collection.name } : null;
+      })
+      .filter(Boolean);
+  }, [allDrafts, allCollections]);
+
+  const hasUnsavedChanges
+    = allDrafts.collectionDrafts.length > 0 || allDrafts.folderDrafts.length > 0 || allDrafts.requestDrafts.length > 0;
+
+  const handleCloseAllCollections = () => {
+    const removalPromises = collectionUids.map((uid) => dispatch(removeCollection(uid)));
+
+    Promise.all(removalPromises)
+      .then(() => {
+        toast.success('Closed all collections');
+      })
+      .catch((error) => {
+        console.error('Error closing collections:', error);
+        toast.error('An error occurred while closing collections');
+      })
+      .finally(() => {
+        onClose();
+      });
+  };
+
+  const handleDiscard = () => {
+    handleCloseAllCollections();
+  };
+
+  const handleCancel = () => {
+    onClose();
+  };
+
+  const handleSave = async () => {
+    try {
+      const savePromises = [];
+
+      // Save all collection drafts
+      if (allDrafts.collectionDrafts.length > 0) {
+        savePromises.push(dispatch(saveMultipleCollections(allDrafts.collectionDrafts)));
+      }
+
+      // Save all folder drafts
+      if (allDrafts.folderDrafts.length > 0) {
+        savePromises.push(dispatch(saveMultipleFolders(allDrafts.folderDrafts)));
+      }
+
+      // Save all request drafts
+      if (allDrafts.requestDrafts.length > 0) {
+        savePromises.push(dispatch(saveMultipleRequests(allDrafts.requestDrafts)));
+      }
+
+      await Promise.all(savePromises);
+      handleCloseAllCollections();
+    } catch (error) {
+      console.error('Error saving drafts:', error);
+      toast.error('An error occurred while saving changes');
+      handleCancel();
+    }
+  };
+
+  if (collectionUids.length === 0) {
+    return null;
+  }
+
+  const hasMultipleCollections = collectionUids.length > 1;
+  const singleCollectionName = hasMultipleCollections
+    ? null
+    : findCollectionByUid(allCollections, collectionUids[0])?.name;
+
+  const displayedCollections = useMemo(() => showAllCollections ? collectionsWithUnsavedChanges : getDisplayItems(collectionsWithUnsavedChanges),
+    [collectionsWithUnsavedChanges, showAllCollections]);
+  const hasMoreCollections = collectionsWithUnsavedChanges.length > displayedCollections.length;
+  const hiddenCollectionsCount = collectionsWithUnsavedChanges.length - displayedCollections.length;
+
+  const toggleButton = hasMoreCollections || showAllCollections ? (
+    <span
+      className={`${showAllCollections ? 'show-less-link' : 'show-more-link'} w-fit flex items-center mt-2 cursor-pointer`}
+      onClick={() => setShowAllCollections(!showAllCollections)}
+    >
+      <span className="text-link">
+        {showAllCollections ? 'Show less' : `Show ${hiddenCollectionsCount} more`}
+      </span>
+    </span>
+  ) : null;
+
+  return (
+    <Portal>
+      <Modal
+        size="md"
+        title="Close all collections"
+        disableEscapeKey={hasUnsavedChanges}
+        disableCloseOnOutsideClick={hasUnsavedChanges}
+        handleCancel={handleCancel}
+        hideFooter={true}
+      >
+        <StyledWrapper>
+          {hasUnsavedChanges ? (
+            <>
+              <div className="flex items-center font-normal">
+                <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
+                <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
+              </div>
+              <div className="font-normal mt-4">
+                Do you want to save changes you made to the following{' '}
+                {collectionsWithUnsavedChanges.length === 1 ? 'collection' : 'collections'}?
+              </div>
+              <div className="mt-2 text-xs text-gray-500">
+                Collections will still be available in the file system and can be re-opened later.
+              </div>
+
+              <div className="mt-4">
+                <div className="collections-list-container">
+                  <div className="collections-list">
+                    {displayedCollections.map(({ uid, name }) => (
+                      <span key={uid} className="collection-tag">
+                        <span className="collection-tag-text">{name}</span>
+                      </span>
+                    ))}
+                    {toggleButton}
+                  </div>
+                </div>
+              </div>
+
+              <div className="flex justify-between mt-6">
+                <div>
+                  <button className="btn btn-sm btn-danger" onClick={handleDiscard}>
+                    Discard and Close
+                  </button>
+                </div>
+                <div>
+                  <button className="btn btn-close btn-sm mr-2" onClick={handleCancel}>
+                    Cancel
+                  </button>
+                  <button className="btn btn-secondary btn-sm" onClick={handleSave}>
+                    Save and Close
+                  </button>
+                </div>
+              </div>
+            </>
+          ) : (
+            <>
+              <div className="mt-4">
+                {hasMultipleCollections ? (
+                  `Are you sure you want to close all ${collectionUids.length} collections in Bruno?`
+                ) : (
+                  <>
+                    Are you sure you want to close the collection <strong>{singleCollectionName}</strong> in Bruno?
+                  </>
+                )}
+              </div>
+              <div className="mt-4 text-xs text-gray-500">
+                Collections will still be available in the file system and can be re-opened later.
+              </div>
+              <div className="flex justify-end mt-6">
+                <button className="btn btn-close btn-sm mr-2" onClick={handleCancel}>
+                  Cancel
+                </button>
+                <button className="btn btn-secondary btn-sm" onClick={handleCloseAllCollections}>
+                  {hasMultipleCollections ? 'Close All' : 'Close'}
+                </button>
+              </div>
+            </>
+          )}
+        </StyledWrapper>
+      </Modal>
+    </Portal>
+  );
+};
+
+export default RemoveCollectionsModal;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/StyledWrapper.js
index 18058e6aa..2854eeb09 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/StyledWrapper.js
@@ -1,21 +1,13 @@
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-  .collections-badge {
-    margin-inline: 0.5rem;
-    background-color: ${(props) => props.theme.sidebar.badge.bg};
-    border-radius: 5px;
-
-    .caret {
-      margin-left: 0.25rem;
-      color: rgb(140, 140, 140);
-      fill: rgb(140, 140, 140);
-    }
-  }
-
   span.close-icon {
     color: ${(props) => props.theme.colors.text.muted};
   }
+
+  &:hover .collections-badge .collections-header-actions .collection-action-button {
+    opacity: 1;
+  }
 `;
 
 export default Wrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/index.js b/packages/bruno-app/src/components/Sidebar/Collections/index.js
index 119318819..31bb9ac91 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/index.js
@@ -1,121 +1,50 @@
 import React, { useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  IconSearch,
-  IconFolders,
-  IconArrowsSort,
-  IconSortAscendingLetters,
-  IconSortDescendingLetters,
-  IconX
-} from '@tabler/icons';
+import { useSelector } from 'react-redux';
 import Collection from './Collection';
 import CreateCollection from '../CreateCollection';
 import StyledWrapper from './StyledWrapper';
 import CreateOrOpenCollection from './CreateOrOpenCollection';
-import { sortCollections } from 'providers/ReduxStore/slices/collections/actions';
+import CollectionSearch from './CollectionSearch/index';
 
-// todo: move this to a separate folder
-// the coding convention is to keep all the components in a folder named after the component
-const CollectionsBadge = () => {
-  const dispatch = useDispatch();
-  const { collections } = useSelector((state) => state.collections);
-  const { collectionSortOrder } = useSelector((state) => state.collections);
-  const sortCollectionOrder = () => {
-    let order;
-    switch (collectionSortOrder) {
-      case 'default':
-        order = 'alphabetical';
-        break;
-      case 'alphabetical':
-        order = 'reverseAlphabetical';
-        break;
-      case 'reverseAlphabetical':
-        order = 'default';
-        break;
-    }
-    dispatch(sortCollections({ order }));
-  };
-  return (
-    <div className="items-center mt-2 relative">
-      <div className="collections-badge flex items-center justify-between px-2">
-        <div className="flex items-center  py-1 select-none">
-          <span className="mr-2">
-            <IconFolders size={18} strokeWidth={1.5} />
-          </span>
-          <span>Collections</span>
-        </div>
-        {collections.length >= 1 && (
-          <button onClick={() => sortCollectionOrder()}>
-            {collectionSortOrder == 'default' ? (
-              <IconArrowsSort size={18} strokeWidth={1.5} />
-            ) : collectionSortOrder == 'alphabetical' ? (
-              <IconSortAscendingLetters size={18} strokeWidth={1.5} />
-            ) : (
-              <IconSortDescendingLetters size={18} strokeWidth={1.5} />
-            )}
-          </button>
-        )}
-      </div>
-    </div>
-  );
-};
-
-const Collections = () => {
+const Collections = ({ showSearch }) => {
   const [searchText, setSearchText] = useState('');
   const { collections } = useSelector((state) => state.collections);
+  const { workspaces, activeWorkspaceUid } = useSelector((state) => state.workspaces);
   const [createCollectionModalOpen, setCreateCollectionModalOpen] = useState(false);
 
-  if (!collections || !collections.length) {
+  const activeWorkspace = workspaces.find((w) => w.uid === activeWorkspaceUid) || workspaces.find((w) => w.type === 'default');
+
+  let workspaceCollections = [];
+
+  if (activeWorkspace?.collections?.length) {
+    workspaceCollections = activeWorkspace.collections.map((wc) => {
+      return collections.find((c) => c.pathname === wc.path);
+    }).filter(Boolean);
+  }
+
+  if (!workspaceCollections || !workspaceCollections.length) {
     return (
       <StyledWrapper>
-        <CollectionsBadge />
         <CreateOrOpenCollection />
       </StyledWrapper>
     );
   }
 
   return (
-    <StyledWrapper>
-      {createCollectionModalOpen ? <CreateCollection onClose={() => setCreateCollectionModalOpen(false)} /> : null}
-
-      <CollectionsBadge />
-
-      <div className="mt-4 relative collection-filter px-2">
-        <div className="absolute inset-y-0 left-0 pl-4 flex items-center pointer-events-none">
-          <span className="text-gray-500 sm:text-sm">
-            <IconSearch size={16} strokeWidth={1.5} />
-          </span>
-        </div>
-        <input
-          type="text"
-          name="search"
-          placeholder="Search requests …"
-          id="search"
-          autoComplete="off"
-          autoCorrect="off"
-          autoCapitalize="off"
-          spellCheck="false"
-          className="block w-full pl-7 py-1 sm:text-sm"
-          value={searchText}
-          onChange={(e) => setSearchText(e.target.value.toLowerCase())}
+    <StyledWrapper data-testid="collections">
+      {createCollectionModalOpen ? (
+        <CreateCollection
+          onClose={() => setCreateCollectionModalOpen(false)}
         />
-        {searchText !== '' && (
-          <div className="absolute inset-y-0 right-0 pr-4 flex items-center">
-            <span
-              className="close-icon"
-              onClick={() => {
-                setSearchText('');
-              }}
-            >
-              <IconX size={16} strokeWidth={1.5} className="cursor-pointer" />
-            </span>
-          </div>
-        )}
-      </div>
+      ) : null}
 
-      <div className="mt-4 flex flex-col overflow-hidden hover:overflow-y-auto absolute top-32 bottom-0 left-0 right-0">
-        {collections && collections.length
-          ? collections.map((c) => {
+      {showSearch && (
+        <CollectionSearch searchText={searchText} setSearchText={setSearchText} />
+      )}
+
+      <div className={`mt-4 flex flex-col overflow-hidden hover:overflow-y-auto absolute ${showSearch ? 'top-16' : 'top-8'} bottom-0 left-0 right-0`}>
+        {workspaceCollections && workspaceCollections.length
+          ? workspaceCollections.map((c) => {
               return (
                 <Collection searchText={searchText} collection={c} key={c.uid} />
               );
diff --git a/packages/bruno-app/src/components/Sidebar/CreateCollection/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/CreateCollection/StyledWrapper.js
new file mode 100644
index 000000000..4f8bad5d0
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/CreateCollection/StyledWrapper.js
@@ -0,0 +1,12 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  .advanced-options {
+    .caret {
+      color: ${(props) => props.theme.textLink};
+      fill: ${(props) => props.theme.textLink};
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js b/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js
index 642cf1ca9..9137d0b53 100644
--- a/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js
@@ -1,34 +1,53 @@
-import React, { useRef, useEffect } from 'react';
+import React, { useRef, useEffect, forwardRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
-import { browseDirectory } from 'providers/ReduxStore/slices/collections/actions';
-import { createCollection } from 'providers/ReduxStore/slices/collections/actions';
+import path from 'path';
+import { browseDirectory, createCollection } from 'providers/ReduxStore/slices/collections/actions';
 import toast from 'react-hot-toast';
+import Portal from 'components/Portal';
 import Modal from 'components/Modal';
 import { sanitizeName, validateName, validateNameError } from 'utils/common/regex';
 import PathDisplay from 'components/PathDisplay/index';
 import { useState } from 'react';
-import { IconArrowBackUp, IconEdit } from '@tabler/icons';
+import { IconArrowBackUp, IconEdit, IconCaretDown } from '@tabler/icons';
 import Help from 'components/Help';
-import { multiLineMsg } from "utils/common";
-import { formatIpcError } from "utils/common/error";
+import { multiLineMsg } from 'utils/common';
+import { formatIpcError } from 'utils/common/error';
 import { toggleSidebarCollapse } from 'providers/ReduxStore/slices/app';
+import Dropdown from 'components/Dropdown';
+import StyledWrapper from './StyledWrapper';
 import get from 'lodash/get';
 
-const CreateCollection = ({ onClose }) => {
+const CreateCollection = ({ onClose, defaultLocation: propDefaultLocation }) => {
   const inputRef = useRef();
   const dispatch = useDispatch();
+  const workspaces = useSelector((state) => state.workspaces?.workspaces || []);
+  const workspaceUid = useSelector((state) => state.workspaces?.activeWorkspaceUid);
   const [isEditing, toggleEditing] = useState(false);
   const preferences = useSelector((state) => state.app.preferences);
-  const defaultLocation = get(preferences, 'general.defaultCollectionLocation', '');
+  const [showExternalLocation, setShowExternalLocation] = useState(false);
+  const [showAdvanced, setShowAdvanced] = useState(false);
+  const dropdownTippyRef = useRef();
+  const onDropdownCreate = (ref) => (dropdownTippyRef.current = ref);
+
+  const activeWorkspace = workspaces.find((w) => w.uid === workspaceUid);
+  const isDefaultWorkspace = activeWorkspace?.type === 'default';
+
+  const hideLocationInput = activeWorkspace && activeWorkspace.type !== 'default' && !!activeWorkspace?.pathname;
+
+  const defaultLocation = isDefaultWorkspace ? get(preferences, 'general.defaultCollectionLocation', '') : (activeWorkspace?.pathname ? `${activeWorkspace.pathname}/collections` : '');
+
+  const shouldShowAccordion = workspaceUid && hideLocationInput && !isDefaultWorkspace;
+  const actuallyHideLocationInput = hideLocationInput && !showExternalLocation && !isDefaultWorkspace;
 
   const formik = useFormik({
     enableReinitialize: true,
     initialValues: {
       collectionName: '',
       collectionFolderName: '',
-      collectionLocation: defaultLocation
+      collectionLocation: defaultLocation || '',
+      format: 'yml'
     },
     validationSchema: Yup.object({
       collectionName: Yup.string()
@@ -38,35 +57,58 @@ const CreateCollection = ({ onClose }) => {
       collectionFolderName: Yup.string()
         .min(1, 'must be at least 1 character')
         .max(255, 'must be 255 characters or less')
-        .test('is-valid-collection-name', function(value) {
+        .test('is-valid-collection-name', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
         .required('folder name is required'),
-      collectionLocation: Yup.string().min(1, 'location is required').required('location is required')
+      collectionLocation: actuallyHideLocationInput
+        ? Yup.string() // Optional for workspaces when not using external location
+        : Yup.string().min(1, 'location is required').required('location is required'),
+      format: Yup.string().oneOf(['bru', 'yml'], 'invalid format').required('format is required')
     }),
-    onSubmit: (values) => {
-      dispatch(createCollection(values.collectionName, values.collectionFolderName, values.collectionLocation))
-        .then(() => {
-          toast.success('Collection created!');
-          dispatch(toggleSidebarCollapse());
-          onClose();
-        })
-        .catch((e) => toast.error(multiLineMsg('An error occurred while creating the collection', formatIpcError(e))));
+    onSubmit: async (values) => {
+      try {
+        const currentWorkspace = workspaces.find((w) => w.uid === workspaceUid);
+        const useExternalLocation = workspaceUid && showExternalLocation && values.collectionLocation;
+
+        let collectionLocation = values.collectionLocation;
+        if (workspaceUid && !useExternalLocation && currentWorkspace && currentWorkspace.type !== 'default') {
+          collectionLocation = path.join(currentWorkspace.pathname, 'collections');
+        }
+
+        await dispatch(createCollection(values.collectionName,
+          values.collectionFolderName,
+          collectionLocation,
+          { format: values.format }));
+
+        if (useExternalLocation && currentWorkspace) {
+          const { ipcRenderer } = window;
+          const collectionPath = path.join(values.collectionLocation, values.collectionFolderName);
+          const workspaceCollection = {
+            name: values.collectionName,
+            path: collectionPath
+          };
+          await ipcRenderer.invoke('renderer:add-collection-to-workspace', currentWorkspace.pathname, workspaceCollection);
+        }
+
+        toast.success('Collection created!');
+        onClose();
+      } catch (e) {
+        toast.error(multiLineMsg('An error occurred while creating the collection', formatIpcError(e)));
+      }
     }
   });
 
   const browse = () => {
     dispatch(browseDirectory())
       .then((dirPath) => {
-        // When the user closes the dialog without selecting anything dirPath will be false
         if (typeof dirPath === 'string') {
           formik.setFieldValue('collectionLocation', dirPath);
         }
       })
-      .catch((error) => {
+      .catch(() => {
         formik.setFieldValue('collectionLocation', '');
-        console.error(error);
       });
   };
 
@@ -76,132 +118,225 @@ const CreateCollection = ({ onClose }) => {
     }
   }, [inputRef]);
 
-  const onSubmit = () => formik.handleSubmit();
+  const AdvancedOptions = forwardRef((props, ref) => {
+    return (
+      <div ref={ref} className="flex mr-2 text-link cursor-pointer items-center">
+        <button
+          className="btn-advanced"
+          type="button"
+        >
+          Options
+        </button>
+        <IconCaretDown className="caret ml-1" size={14} strokeWidth={2} />
+      </div>
+    );
+  });
 
   return (
-    <Modal size="sm" title="Create Collection" confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
-      <form className="bruno-form" onSubmit={e => e.preventDefault()}>
-        <div>
-          <label htmlFor="collection-name" className="flex items-center font-semibold">
-            Name
-          </label>
-          <input
-            id="collection-name"
-            type="text"
-            name="collectionName"
-            ref={inputRef}
-            className="block textbox mt-2 w-full"
-            onChange={(e) => {
-              formik.handleChange(e);
-              !isEditing && formik.setFieldValue('collectionFolderName', sanitizeName(e.target.value));
-            }}
-            autoComplete="off"
-            autoCorrect="off"
-            autoCapitalize="off"
-            spellCheck="false"
-            value={formik.values.collectionName || ''}
-          />
-          {formik.touched.collectionName && formik.errors.collectionName ? (
-            <div className="text-red-500">{formik.errors.collectionName}</div>
-          ) : null}
+    <Portal>
+      <StyledWrapper>
+        <Modal size="sm" title="Create Collection" hideFooter={true} handleCancel={onClose}>
+          <form className="bruno-form" onSubmit={formik.handleSubmit}>
+            <div>
+              <label htmlFor="collection-name" className="flex items-center font-medium">
+                Name
+              </label>
+              <input
+                id="collection-name"
+                type="text"
+                name="collectionName"
+                ref={inputRef}
+                className="block textbox mt-2 w-full"
+                onChange={(e) => {
+                  formik.handleChange(e);
+                  !isEditing && formik.setFieldValue('collectionFolderName', sanitizeName(e.target.value));
+                }}
+                autoComplete="off"
+                autoCorrect="off"
+                autoCapitalize="off"
+                spellCheck="false"
+                value={formik.values.collectionName || ''}
+              />
+              {formik.touched.collectionName && formik.errors.collectionName ? (
+                <div className="text-red-500">{formik.errors.collectionName}</div>
+              ) : null}
 
-          <label htmlFor="collection-location" className="block font-semibold mt-3 flex items-center">
-            Location
-            <Help>
-              <p>
-                Bruno stores your collections on your computer's filesystem.
-              </p>
-              <p className="mt-2">
-                Choose the location where you want to store this collection.
-              </p>
-            </Help>
-          </label>
-          <input
-            id="collection-location"
-            type="text"
-            name="collectionLocation"
-            className="block textbox mt-2 w-full cursor-pointer"
-            autoComplete="off"
-            autoCorrect="off"
-            autoCapitalize="off"
-            spellCheck="false"
-            value={formik.values.collectionLocation || ''}
-            onClick={browse}
-            onChange={e => {
-              formik.setFieldValue('collectionLocation', e.target.value);
-            }}
-          />
-          {formik.touched.collectionLocation && formik.errors.collectionLocation ? (
-            <div className="text-red-500">{formik.errors.collectionLocation}</div>
-          ) : null}
-          <div className="mt-1">
-            <span
-              className="text-link cursor-pointer hover:underline" onClick={browse}
-              style={{
-                fontSize: '0.8125rem'
-              }}
-            >
-              Browse
-            </span>
-          </div>
-          {formik.values.collectionName?.trim()?.length > 0 && (
-            <div className="mt-4">
-              <div className="flex items-center justify-between">
-                <label htmlFor="filename" className="flex items-center font-semibold">
-                  Folder Name
-                  <Help width="300">
-                    <p>
-                      The name of the folder used to store the collection.
-                    </p>
-                    <p className="mt-2">
-                      You can choose a folder name different from your collection's name or one compatible with filesystem rules.
-                    </p>
-                  </Help>
-                </label>
-                {isEditing ? (
-                  <IconArrowBackUp 
-                    className="cursor-pointer opacity-50 hover:opacity-80" 
-                    size={16} 
-                    strokeWidth={1.5} 
-                    onClick={() => toggleEditing(false)} 
-                  />
-                ) : (
-                  <IconEdit
-                    className="cursor-pointer opacity-50 hover:opacity-80" 
-                    size={16} 
-                    strokeWidth={1.5} 
-                    onClick={() => toggleEditing(true)} 
-                  />
-                )}
-              </div>
-              {isEditing ? (
-                <input
-                  id="collection-folder-name"
-                  type="text"
-                  name="collectionFolderName"
-                  className="block textbox mt-2 w-full"
-                  onChange={formik.handleChange}
-                  autoComplete="off"
-                  autoCorrect="off"
-                  autoCapitalize="off"
-                  spellCheck="false"
-                  value={formik.values.collectionFolderName || ''}
-                />
-              ) : (
-                <div className='relative flex flex-row gap-1 items-center justify-between'>
-                  <PathDisplay
-                    baseName={formik.values.collectionFolderName}
+              {!actuallyHideLocationInput && (
+                <>
+                  <label htmlFor="collection-location" className="font-medium mt-3 flex items-center">
+                    Location
+                    <Help>
+                      <p>
+                        Bruno stores your collections on your computer's filesystem.
+                      </p>
+                      <p className="mt-2">
+                        Choose the location where you want to store this collection.
+                      </p>
+                    </Help>
+                  </label>
+                  <input
+                    id="collection-location"
+                    type="text"
+                    name="collectionLocation"
+                    className="block textbox mt-2 w-full cursor-pointer"
+                    autoComplete="off"
+                    autoCorrect="off"
+                    autoCapitalize="off"
+                    spellCheck="false"
+                    value={formik.values.collectionLocation || ''}
+                    onClick={browse}
+                    onChange={(e) => {
+                      formik.setFieldValue('collectionLocation', e.target.value);
+                    }}
                   />
+                  {formik.touched.collectionLocation && formik.errors.collectionLocation ? (
+                    <div className="text-red-500">{formik.errors.collectionLocation}</div>
+                  ) : null}
+                  <div className="mt-1">
+                    <span
+                      className="text-link cursor-pointer hover:underline"
+                      onClick={browse}
+                    >
+                      Browse
+                    </span>
+                  </div>
+                </>
+              )}
+              {formik.values.collectionName?.trim()?.length > 0 && (
+                <div className="mt-4">
+                  <div className="flex items-center justify-between">
+                    <label htmlFor="filename" className="flex items-center font-medium">
+                      Folder Name
+                      <Help width="300">
+                        <p>
+                          The name of the folder used to store the collection.
+                        </p>
+                        <p className="mt-2">
+                          You can choose a folder name different from your collection's name or one compatible with filesystem rules.
+                        </p>
+                      </Help>
+                    </label>
+                    {isEditing ? (
+                      <IconArrowBackUp
+                        className="cursor-pointer opacity-50 hover:opacity-80"
+                        size={16}
+                        strokeWidth={1.5}
+                        onClick={() => toggleEditing(false)}
+                      />
+                    ) : (
+                      <IconEdit
+                        className="cursor-pointer opacity-50 hover:opacity-80"
+                        size={16}
+                        strokeWidth={1.5}
+                        onClick={() => toggleEditing(true)}
+                      />
+                    )}
+                  </div>
+                  {isEditing ? (
+                    <input
+                      id="collection-folder-name"
+                      type="text"
+                      name="collectionFolderName"
+                      className="block textbox mt-2 w-full"
+                      onChange={formik.handleChange}
+                      autoComplete="off"
+                      autoCorrect="off"
+                      autoCapitalize="off"
+                      spellCheck="false"
+                      value={formik.values.collectionFolderName || ''}
+                    />
+                  ) : (
+                    <div className="relative flex flex-row gap-1 items-center justify-between">
+                      <PathDisplay
+                        baseName={formik.values.collectionFolderName}
+                      />
+                    </div>
+                  )}
+                  {formik.touched.collectionFolderName && formik.errors.collectionFolderName ? (
+                    <div className="text-red-500">{formik.errors.collectionFolderName}</div>
+                  ) : null}
+                </div>
+              )}
+
+              {showAdvanced && (
+                <div className="mt-4">
+                  <label htmlFor="format" className="flex items-center font-medium">
+                    File Format
+                    <Help width="300">
+                      <p>
+                        Choose the file format for storing requests in this collection.
+                      </p>
+                      <p className="mt-2">
+                        <strong>OpenCollection (YAML):</strong> Industry-standard YAML format (.yml files)
+                      </p>
+                      <p className="mt-1">
+                        <strong>BRU:</strong> Bruno's native file format (.bru files)
+                      </p>
+                    </Help>
+                  </label>
+                  <select
+                    id="format"
+                    name="format"
+                    className="block textbox mt-2 w-full"
+                    value={formik.values.format}
+                    onChange={formik.handleChange}
+                  >
+                    <option value="yml">OpenCollection (YAML)</option>
+                    <option value="bru">BRU Format (.bru)</option>
+                  </select>
+                  {formik.touched.format && formik.errors.format ? (
+                    <div className="text-red-500">{formik.errors.format}</div>
+                  ) : null}
                 </div>
               )}
-              {formik.touched.collectionFolderName && formik.errors.collectionFolderName ? (
-                <div className="text-red-500">{formik.errors.collectionFolderName}</div>
-              ) : null}
             </div>
-          )}
-        </div>
-      </form>
-    </Modal>
+            <div className="flex justify-between items-center mt-8 bruno-modal-footer">
+              <div className="flex advanced-options">
+                <Dropdown onCreate={onDropdownCreate} icon={<AdvancedOptions />} placement="bottom-start">
+                  {shouldShowAccordion && (
+                    <div
+                      className="dropdown-item"
+                      key="create-external-location"
+                      onClick={(e) => {
+                        dropdownTippyRef.current.hide();
+                        setShowExternalLocation(!showExternalLocation);
+                      }}
+                    >
+                      {showExternalLocation ? 'Use Default Location' : 'Create in External Location'}
+                    </div>
+                  )}
+                  <div
+                    className="dropdown-item"
+                    key="show-file-format"
+                    onClick={(e) => {
+                      dropdownTippyRef.current.hide();
+                      setShowAdvanced(!showAdvanced);
+                    }}
+                  >
+                    {showAdvanced ? 'Hide File Format' : 'Show File Format'}
+                  </div>
+                </Dropdown>
+              </div>
+              <div className="flex justify-end">
+                <span className="mr-2">
+                  <button type="button" onClick={onClose} className="btn btn-md btn-close">
+                    Cancel
+                  </button>
+                </span>
+                <span>
+                  <button
+                    type="submit"
+                    className="submit btn btn-md btn-secondary"
+                  >
+                    Create
+                  </button>
+                </span>
+              </div>
+            </div>
+          </form>
+        </Modal>
+      </StyledWrapper>
+    </Portal>
   );
 };
 
diff --git a/packages/bruno-app/src/components/Sidebar/GoldenEdition/index.js b/packages/bruno-app/src/components/Sidebar/GoldenEdition/index.js
index d238fd206..b769c32bf 100644
--- a/packages/bruno-app/src/components/Sidebar/GoldenEdition/index.js
+++ b/packages/bruno-app/src/components/Sidebar/GoldenEdition/index.js
@@ -53,7 +53,8 @@ const CheckIcon = () => {
         fillRule="evenodd"
         d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
         clipRule="evenodd"
-      ></path>
+      >
+      </path>
     </svg>
   );
 };
@@ -113,22 +114,22 @@ const GoldenEdition = ({ onClose }) => {
 
   const themeBasedContainerClassNames = displayedTheme === 'light' ? 'text-gray-900' : 'text-white';
   const themeBasedTabContainerClassNames = displayedTheme === 'light' ? 'bg-gray-200' : 'bg-gray-800';
-  const themeBasedActiveTabClassNames =
-    displayedTheme === 'light' ? 'bg-white text-gray-900 font-medium' : 'bg-gray-700 text-white font-medium';
+  const themeBasedActiveTabClassNames
+    = displayedTheme === 'light' ? 'bg-white text-gray-900 font-medium' : 'bg-gray-700 text-white font-medium';
 
   return (
     <StyledWrapper>
-      <Modal size="sm" title={'Golden Edition'} handleCancel={onClose} hideFooter={true}>
+      <Modal size="sm" title="Golden Edition" handleCancel={onClose} hideFooter={true}>
         <div className={`flex flex-col w-full ${themeBasedContainerClassNames}`}>
           <div className="flex items-center justify-between">
-            <h3 className="text-lg font-semibold">Golden Edition</h3>
+            <h3 className="text-lg font-medium">Golden Edition</h3>
             <a
               onClick={() => {
                 goldenEditionBuyClick();
                 window.open('https://www.usebruno.com/pricing', '_blank');
               }}
               target="_blank"
-              className="flex text-white bg-yellow-600 hover:bg-yellow-700 font-medium rounded-lg text-sm px-4 py-2 text-center cursor-pointer"
+              className="flex text-white bg-yellow-600 hover:bg-yellow-700 font-medium rounded-lg px-4 py-2 text-center cursor-pointer"
             >
               <IconHeart size={18} strokeWidth={1.5} /> <span className="ml-2">Buy</span>
             </a>
@@ -138,8 +139,8 @@ const GoldenEdition = ({ onClose }) => {
               <div className="my-4">
                 <span className="text-3xl font-extrabold">$19</span>
               </div>
-              <p className="bg-yellow-200 text-black rounded-md px-2 py-1 mb-2 inline-flex text-sm">One Time Payment</p>
-              <p className="text-sm">perpetual license for 2 devices, with 2 years of updates</p>
+              <p className="bg-yellow-200 text-black rounded-md px-2 py-1 mb-2 inline-flex">One Time Payment</p>
+              <p>perpetual license for 2 devices, with 2 years of updates</p>
             </div>
           ) : (
             <div>
@@ -147,8 +148,8 @@ const GoldenEdition = ({ onClose }) => {
                 <span className="text-3xl font-extrabold">$49</span>
                 <span className="ml-2">/&nbsp;user</span>
               </div>
-              <p className="bg-yellow-200 text-black rounded-md px-2 py-1 mb-2 inline-flex text-sm">One Time Payment</p>
-              <p className="text-sm">perpetual license with 2 years of updates</p>
+              <p className="bg-yellow-200 text-black rounded-md px-2 py-1 mb-2 inline-flex">One Time Payment</p>
+              <p>perpetual license with 2 years of updates</p>
             </div>
           )}
           <div
diff --git a/packages/bruno-app/src/components/Sidebar/ImportCollection/FullscreenLoader/index.js b/packages/bruno-app/src/components/Sidebar/ImportCollection/FullscreenLoader/index.js
index d5a26ad22..4c5b10bd6 100644
--- a/packages/bruno-app/src/components/Sidebar/ImportCollection/FullscreenLoader/index.js
+++ b/packages/bruno-app/src/components/Sidebar/ImportCollection/FullscreenLoader/index.js
@@ -32,7 +32,7 @@ const FullscreenLoader = ({ isLoading }) => {
       <div className="flex flex-col items-center p-8 rounded-lg bg-white dark:bg-zinc-800 shadow-lg max-w-md text-center">
         <IconLoader2 className="animate-spin h-12 w-12 mb-4" strokeWidth={1.5} />
         <h3 className="text-lg font-medium text-zinc-900 dark:text-zinc-50 mb-2">{loadingMessage}</h3>
-        <p className="text-sm text-zinc-500 dark:text-zinc-400">
+        <p className="text-zinc-500 dark:text-zinc-400">
           This may take a moment depending on the collection size
         </p>
       </div>
diff --git a/packages/bruno-app/src/components/Sidebar/ImportCollection/index.js b/packages/bruno-app/src/components/Sidebar/ImportCollection/index.js
index f0760f7e4..e5b90d7d2 100644
--- a/packages/bruno-app/src/components/Sidebar/ImportCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/ImportCollection/index.js
@@ -126,7 +126,7 @@ const ImportCollection = ({ onClose, handleSubmit }) => {
     <Modal size="sm" title="Import Collection" hideFooter={true} handleCancel={onClose} dataTestId="import-collection-modal">
       <div className="flex flex-col">
         <div className="mb-4">
-          <h3 className="text-sm font-medium text-gray-900 dark:text-gray-100 mb-2">Import from file</h3>
+          <h3 className="font-medium text-gray-900 dark:text-gray-100 mb-2">Import from file</h3>
           <div
             onDragEnter={handleDrag}
             onDragOver={handleDrag}
@@ -149,7 +149,7 @@ const ImportCollection = ({ onClose, handleSubmit }) => {
                 onChange={handleFileInputChange}
                 accept={acceptedFileTypes.join(',')}
               />
-              <p className="text-sm text-gray-600 dark:text-gray-300 mb-2">
+              <p className="text-gray-600 dark:text-gray-300 mb-2">
                 Drop file to import or{' '}
                 <button
                   className="text-blue-500 underline cursor-pointer"
diff --git a/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js b/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js
index ffd543bf6..581ff9847 100644
--- a/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js
+++ b/packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js
@@ -116,7 +116,7 @@ const ImportCollectionLocation = ({ onClose, handleSubmit, rawData, format }) =>
     return (
       <div ref={ref} className="flex items-center justify-between w-full current-group" data-testid="grouping-dropdown">
         <div>
-          <div className="text-sm font-medium text-gray-900 dark:text-gray-100">{selectedOption.label}</div>
+          <div className="font-medium text-gray-900 dark:text-gray-100">{selectedOption.label}</div>
         </div>
         <IconCaretDown size={16} className="text-gray-400 ml-[0.25rem]" fill="currentColor" />
       </div>
@@ -155,13 +155,13 @@ const ImportCollectionLocation = ({ onClose, handleSubmit, rawData, format }) =>
       >
         <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
           <div>
-            <label htmlFor="collectionName" className="block font-semibold">
+            <label htmlFor="collectionName" className="block font-medium">
               Name
             </label>
             <div className="mt-2">{collectionName}</div>
 
             <>
-              <label htmlFor="collectionLocation" className="font-semibold mt-4 flex items-center">
+              <label htmlFor="collectionLocation" className="font-medium mt-4 flex items-center">
                 Location
                 <Help>
                   <p>Bruno stores your collections on your computer's filesystem.</p>
@@ -198,10 +198,10 @@ const ImportCollectionLocation = ({ onClose, handleSubmit, rawData, format }) =>
           {isOpenApi && (
             <div className="mt-4 flex gap-4 items-center">
               <div>
-                <label htmlFor="groupingType" className="block font-semibold mt-4">
+                <label htmlFor="groupingType" className="block font-medium mt-4">
                   Folder arrangement
                 </label>
-                <p className="text-sm text-gray-600 dark:text-gray-400 mt-1 mb-2">
+                <p className="text-gray-600 dark:text-gray-400 mt-1 mb-2">
                   Select whether to create folders according to the spec's paths or tags.
                 </p>
               </div>
diff --git a/packages/bruno-app/src/components/Sidebar/NewFolder/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/NewFolder/StyledWrapper.js
index d46e186d2..4f8bad5d0 100644
--- a/packages/bruno-app/src/components/Sidebar/NewFolder/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/NewFolder/StyledWrapper.js
@@ -9,4 +9,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/NewFolder/index.js b/packages/bruno-app/src/components/Sidebar/NewFolder/index.js
index d7a7e6998..3fa769b76 100644
--- a/packages/bruno-app/src/components/Sidebar/NewFolder/index.js
+++ b/packages/bruno-app/src/components/Sidebar/NewFolder/index.js
@@ -6,12 +6,12 @@ import Portal from 'components/Portal';
 import Modal from 'components/Modal';
 import { useDispatch } from 'react-redux';
 import { newFolder } from 'providers/ReduxStore/slices/collections/actions';
-import { IconArrowBackUp, IconEdit} from '@tabler/icons';
+import { IconArrowBackUp, IconEdit } from '@tabler/icons';
 import { sanitizeName, validateName, validateNameError } from 'utils/common/regex';
 import PathDisplay from 'components/PathDisplay/index';
 import Help from 'components/Help';
-import Dropdown from "components/Dropdown";
-import { IconCaretDown } from "@tabler/icons";
+import Dropdown from 'components/Dropdown';
+import { IconCaretDown } from '@tabler/icons';
 import StyledWrapper from './StyledWrapper';
 
 const NewFolder = ({ collectionUid, item, onClose }) => {
@@ -38,7 +38,7 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
         .trim()
         .min(1, 'must be at least 1 character')
         .required('foldername is required')
-        .test('is-valid-folder-name', function(value) {
+        .test('is-valid-folder-name', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
@@ -76,7 +76,7 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
         >
           Options
         </button>
-        <IconCaretDown className="caret ml-1" size={14} strokeWidth={2}/>
+        <IconCaretDown className="caret ml-1" size={14} strokeWidth={2} />
       </div>
     );
   });
@@ -86,7 +86,7 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
       <StyledWrapper>
         <Modal size="md" title="New Folder" hideFooter={true} handleCancel={onClose}>
           <form className="bruno-form" onSubmit={formik.handleSubmit}>
-            <label htmlFor="folderName" className="block font-semibold">
+            <label htmlFor="folderName" className="block font-medium">
               Folder Name
             </label>
             <input
@@ -99,7 +99,7 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
               autoCorrect="off"
               autoCapitalize="off"
               spellCheck="false"
-              onChange={e => {
+              onChange={(e) => {
                 formik.setFieldValue('folderName', e.target.value);
                 !isEditing && formik.setFieldValue('directoryName', sanitizeName(e.target.value));
               }}
@@ -112,8 +112,8 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
             {showFilesystemName && (
               <div className="mt-4">
                 <div className="flex items-center justify-between">
-                  <label htmlFor="directoryName" className="flex items-center font-semibold">
-                    Folder Name <small className='font-normal text-muted ml-1'>(on filesystem)</small>
+                  <label htmlFor="directoryName" className="flex items-center font-medium">
+                    Folder Name <small className="font-normal text-muted ml-1">(on filesystem)</small>
                     <Help width="300">
                       <p>
                         You can choose to save the folder as a different name on your file system versus what is displayed in the app.
@@ -121,29 +121,29 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
                     </Help>
                   </label>
                   {isEditing ? (
-                    <IconArrowBackUp 
-                      className="cursor-pointer opacity-50 hover:opacity-80" 
-                      size={16} 
-                      strokeWidth={1.5} 
-                      onClick={() => toggleEditing(false)} 
-                    />
-                  ): (
-                    <IconEdit
-                      className="cursor-pointer opacity-50 hover:opacity-80" 
-                      size={16} 
+                    <IconArrowBackUp
+                      className="cursor-pointer opacity-50 hover:opacity-80"
+                      size={16}
                       strokeWidth={1.5}
-                      onClick={() => toggleEditing(true)} 
+                      onClick={() => toggleEditing(false)}
+                    />
+                  ) : (
+                    <IconEdit
+                      className="cursor-pointer opacity-50 hover:opacity-80"
+                      size={16}
+                      strokeWidth={1.5}
+                      onClick={() => toggleEditing(true)}
                     />
                   )}
                 </div>
                 {isEditing ? (
-                  <div className='relative flex flex-row gap-1 items-center justify-between'>
+                  <div className="relative flex flex-row gap-1 items-center justify-between">
                     <input
                       id="file-name"
                       type="text"
                       name="directoryName"
                       placeholder="Folder Name"
-                      className={`block textbox mt-2 w-full`}
+                      className="block textbox mt-2 w-full"
                       autoComplete="off"
                       autoCorrect="off"
                       autoCapitalize="off"
@@ -153,7 +153,7 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
                     />
                   </div>
                 ) : (
-                  <div className='relative flex flex-row gap-1 items-center justify-between'>
+                  <div className="relative flex flex-row gap-1 items-center justify-between">
                     <PathDisplay
                       iconType="folder"
                       baseName={formik.values.directoryName}
@@ -166,9 +166,9 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
               </div>
             )}
             <div className="flex justify-between items-center mt-8 bruno-modal-footer">
-              <div className='flex advanced-options'>
+              <div className="flex advanced-options">
                 <Dropdown onCreate={onDropdownCreate} icon={<AdvancedOptions />} placement="bottom-start">
-                  <div 
+                  <div
                     className="dropdown-item"
                     key="show-filesystem-name"
                     onClick={(e) => {
@@ -180,8 +180,8 @@ const NewFolder = ({ collectionUid, item, onClose }) => {
                   </div>
                 </Dropdown>
               </div>
-              <div className='flex justify-end'>
-                <span className='mr-2'>
+              <div className="flex justify-end">
+                <span className="mr-2">
                   <button type="button" onClick={onClose} className="btn btn-md btn-close">
                     Cancel
                   </button>
diff --git a/packages/bruno-app/src/components/Sidebar/NewRequest/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/NewRequest/StyledWrapper.js
index 338fb2e60..0a5d05784 100644
--- a/packages/bruno-app/src/components/Sidebar/NewRequest/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/NewRequest/StyledWrapper.js
@@ -50,4 +50,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper;
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
index c148dc649..219852657 100644
--- a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
+++ b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
@@ -29,9 +29,6 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
   const storedTheme = useTheme();
 
   const collection = useSelector((state) => state.collections.collections?.find((c) => c.uid === collectionUid));
-  const {
-    brunoConfig: { presets: collectionPresets = {} }
-  } = collection;
   const [curlRequestTypeDetected, setCurlRequestTypeDetected] = useState(null);
   const [showFilesystemName, toggleShowFilesystemName] = useState(false);
 
@@ -72,41 +69,13 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
 
   const [isEditing, toggleEditing] = useState(false);
 
-  const getRequestType = (collectionPresets) => {
-    if (!collectionPresets || !collectionPresets.requestType) {
-      return 'http-request';
-    }
-
-    // Note: Why different labels for the same thing?
-    // http-request and graphql-request are used inside the app's json representation of a request
-    // http and graphql are used in Bru DSL as well as collection exports
-    // We need to eventually standardize the app's DSL to use the same labels as bru DSL
-    if (collectionPresets.requestType === 'http') {
-      return 'http-request';
-    }
-
-    if (collectionPresets.requestType === 'graphql') {
-      return 'graphql-request';
-    }
-
-    if (collectionPresets.requestType === 'grpc') {
-      return 'grpc-request';
-    }
-
-    if (collectionPresets.requestType === 'ws') {
-      return 'ws-request';
-    }
-
-    return 'http-request';
-  };
-
   const formik = useFormik({
     enableReinitialize: true,
     initialValues: {
       requestName: '',
       filename: '',
-      requestType: getRequestType(collectionPresets),
-      requestUrl: collectionPresets.requestUrl || '',
+      requestType: 'http-request',
+      requestUrl: '',
       requestMethod: 'GET',
       curlCommand: ''
     },
@@ -145,12 +114,13 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
     onSubmit: (values) => {
       const isGrpcRequest = values.requestType === 'grpc-request';
       const isWsRequest = values.requestType === 'ws-request';
+      const filename = values.filename;
 
       if (isGrpcRequest) {
         dispatch(
           newGrpcRequest({
             requestName: values.requestName,
-            filename: values.filename,
+            filename: filename,
             requestType: values.requestType,
             requestUrl: values.requestUrl,
             collectionUid: collection.uid,
@@ -168,7 +138,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
         dispatch(newWsRequest({
           requestName: values.requestName,
           requestMethod: values.requestMethod,
-          filename: values.filename,
+          filename: filename,
           requestType: values.requestType,
           requestUrl: values.requestUrl,
           collectionUid: collection.uid,
@@ -185,7 +155,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
           newEphemeralHttpRequest({
             uid: uid,
             requestName: values.requestName,
-            filename: values.filename,
+            filename: filename,
             requestType: values.requestType,
             requestUrl: values.requestUrl,
             requestMethod: values.requestMethod,
@@ -210,7 +180,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
         dispatch(
           newHttpRequest({
             requestName: values.requestName,
-            filename: values.filename,
+            filename: filename,
             requestType: curlRequestTypeDetected,
             requestUrl: request.url,
             requestMethod: request.method,
@@ -231,7 +201,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
         dispatch(
           newHttpRequest({
             requestName: values.requestName,
-            filename: values.filename,
+            filename: filename,
             requestType: values.requestType,
             requestUrl: values.requestUrl,
             requestMethod: values.requestMethod,
@@ -319,7 +289,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
             }}
           >
             <div>
-              <label htmlFor="requestName" className="block font-semibold">
+              <label htmlFor="requestName" className="block font-medium">
                 Type
               </label>
 
@@ -406,7 +376,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
               </div>
             </div>
             <div className="mt-4">
-              <label htmlFor="requestName" className="block font-semibold">
+              <label htmlFor="requestName" className="block font-medium">
                 Request Name
               </label>
               <input
@@ -434,7 +404,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
             {showFilesystemName && (
               <div className="mt-4">
                 <div className="flex items-center justify-between">
-                  <label htmlFor="filename" className="flex items-center font-semibold">
+                  <label htmlFor="filename" className="flex items-center font-medium">
                     File Name <small className="font-normal text-muted ml-1">(on filesystem)</small>
                     <Help width="300">
                       <p>Bruno saves each request as a file in your collection's folder.</p>
@@ -467,7 +437,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
                       type="text"
                       name="filename"
                       placeholder="File Name"
-                      className={`!pr-10 block textbox mt-2 w-full`}
+                      className="!pr-10 block textbox mt-2 w-full"
                       autoComplete="off"
                       autoCorrect="off"
                       autoCapitalize="off"
@@ -476,11 +446,13 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
                       value={formik.values.filename || ''}
                       data-testid="file-name"
                     />
-                    <span className="absolute right-2 top-4 flex justify-center items-center file-extension">.bru</span>
+                    <span className="absolute right-2 top-4 flex justify-center items-center file-extension">.{collection.format}</span>
                   </div>
                 ) : (
                   <div className="relative flex flex-row gap-1 items-center justify-between">
-                    <PathDisplay baseName={formik.values.filename ? `${formik.values.filename}.bru` : ''} />
+                    <PathDisplay
+                      baseName={formik.values.filename ? `${formik.values.filename}.${collection.format}` : ''}
+                    />
                   </div>
                 )}
                 {formik.touched.filename && formik.errors.filename ? (
@@ -491,7 +463,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
             {formik.values.requestType !== 'from-curl' ? (
               <>
                 <div className="mt-4">
-                  <label htmlFor="request-url" className="block font-semibold">
+                  <label htmlFor="request-url" className="block font-medium">
                     URL
                   </label>
                   <div className="flex items-center mt-2 ">
@@ -534,7 +506,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
             ) : (
               <div className="mt-4">
                 <div className="flex justify-between">
-                  <label htmlFor="request-url" className="block font-semibold">
+                  <label htmlFor="request-url" className="block font-medium">
                     cURL Command
                   </label>
                   <Dropdown className="dropdown" onCreate={onDropdownCreate} icon={<Icon />} placement="bottom-end">
@@ -565,7 +537,8 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
                   value={formik.values.curlCommand}
                   onChange={handleCurlCommandChange}
                   data-testid="curl-command"
-                ></textarea>
+                >
+                </textarea>
                 {formik.touched.curlCommand && formik.errors.curlCommand ? (
                   <div className="text-red-500">{formik.errors.curlCommand}</div>
                 ) : null}
diff --git a/packages/bruno-app/src/components/Sidebar/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/StyledWrapper.js
index 2cec70df5..5cda45b32 100644
--- a/packages/bruno-app/src/components/Sidebar/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/StyledWrapper.js
@@ -53,10 +53,16 @@ const Wrapper = styled.div`
     right: -3px;
     transition: opacity 0.2s ease;
 
-    &:hover div.drag-request-border {
-      width: 2px;
+    div.drag-request-border {
+      width: 1px;
       height: 100%;
-      border-left: solid 1px ${(props) => props.theme.sidebar.dragbar};
+      border-left: solid 1px ${(props) => props.theme.sidebar.dragbar.border};
+    }
+
+    &:hover div.drag-request-border {
+      width: 1px;
+      height: 100%;
+      border-left: solid 1px ${(props) => props.theme.sidebar.dragbar.activeBorder};
     }
   }
 `;
diff --git a/packages/bruno-app/src/components/Sidebar/TitleBar/CloseWorkspace/index.js b/packages/bruno-app/src/components/Sidebar/TitleBar/CloseWorkspace/index.js
new file mode 100644
index 000000000..f837b554e
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/TitleBar/CloseWorkspace/index.js
@@ -0,0 +1,60 @@
+import React from 'react';
+import toast from 'react-hot-toast';
+import Modal from 'components/Modal';
+import { useDispatch, useSelector } from 'react-redux';
+import { IconFolder } from '@tabler/icons';
+import { closeWorkspaceAction } from 'providers/ReduxStore/slices/workspaces/actions';
+
+const CloseWorkspace = ({ workspaceUid, onClose }) => {
+  const dispatch = useDispatch();
+  const { workspaces } = useSelector((state) => state.workspaces);
+  const workspace = workspaces.find((w) => w.uid === workspaceUid);
+
+  const onConfirm = async () => {
+    try {
+      if (!workspace) {
+        toast.error('Workspace not found');
+        onClose();
+        return;
+      }
+      if (workspace.type === 'default') {
+        toast.error('Cannot close the default workspace');
+        onClose();
+        return;
+      }
+
+      await dispatch(closeWorkspaceAction(workspace.uid));
+      toast.success('Workspace closed');
+      onClose();
+    } catch (error) {
+      console.error('Error closing workspace:', error);
+      toast.error('An error occurred while closing the workspace');
+    }
+  };
+
+  return (
+    <Modal
+      size="sm"
+      title="Close Workspace"
+      confirmText="Close"
+      handleConfirm={onConfirm}
+      handleCancel={onClose}
+    >
+      <div className="flex items-center">
+        <IconFolder size={18} strokeWidth={1.5} />
+        <span className="ml-2 mr-4 font-semibold">{workspace?.name}</span>
+      </div>
+      {workspace?.pathname && (
+        <div className="break-words text-xs mt-1">{workspace.pathname}</div>
+      )}
+      <div className="mt-4">
+        Are you sure you want to close workspace <span className="font-semibold">{workspace?.name}</span>?
+      </div>
+      <div className="mt-4">
+        It will still be available in the file system at the above location and can be re-opened later.
+      </div>
+    </Modal>
+  );
+};
+
+export default CloseWorkspace;
diff --git a/packages/bruno-app/src/components/Sidebar/TitleBar/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/TitleBar/StyledWrapper.js
index f312e534b..288a02e98 100644
--- a/packages/bruno-app/src/components/Sidebar/TitleBar/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/TitleBar/StyledWrapper.js
@@ -1,6 +1,141 @@
 import styled from 'styled-components';
 
 const StyledWrapper = styled.div`
+  .titlebar-container {
+    display: flex;
+    align-items: center;
+  }
+
+  .workspace-name-container {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    padding: 6px 10px;
+    margin-left: 0px;
+    border-radius: ${(props) => props.theme.border.radius.base};
+    cursor: pointer;
+    transition: all 0.2s ease;
+    min-width: 0;
+    flex: 1;
+    max-width: 120px;
+
+    &:hover {
+      background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+    }
+
+    .workspace-name {
+      font-size: ${(props) => props.theme.font.size.base};
+      font-weight: 600;
+      color: ${(props) => props.theme.sidebar.color};
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .chevron-icon {
+      flex-shrink: 0;
+      color: ${(props) => props.theme.sidebar.muted};
+      transition: transform 0.2s ease;
+    }
+  }
+
+  /* Actions Button */
+  .actions-container {
+    margin-left: auto;
+    display: flex;
+    align-items: center;
+  }
+
+  .home-icon-button,
+  .search-icon-button,
+  .plus-icon-button {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 26px;
+    height: 26px;
+    border: none;
+    background: transparent;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background 0.15s ease;
+    color: ${(props) => props.theme.text};
+  }
+
+  .workspace-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 10px !important;
+    margin: 0 !important;
+    
+    &.active {
+      .check-icon {
+        opacity: 1;
+      }
+    }
+
+    &:hover {
+      .pin-btn:not(.pinned) {
+        opacity: 1;
+      }
+    }
+
+    .workspace-name {
+      flex: 1;
+      min-width: 0;
+      font-size: ${(props) => props.theme.font.size.base};
+      font-weight: 400;
+      color: ${(props) => props.theme.dropdown.color};
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .workspace-actions {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-left: 8px;
+      flex-shrink: 0;
+      pointer-events: none;
+      
+      > * {
+        pointer-events: auto;
+      }
+    }
+
+    .check-icon {
+      color: ${(props) => props.theme.workspace?.accent || props.theme.colors?.text?.yellow || '#f0c674'};
+      flex-shrink: 0;
+    }
+
+    .pin-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 22px;
+      height: 22px;
+      padding: 0;
+      border: none;
+      background: transparent;
+      border-radius: 4px;
+      cursor: pointer;
+      color: ${(props) => props.theme.dropdown?.mutedText || props.theme.text?.muted || '#888'};
+      transition: background 0.15s ease, color 0.15s ease, opacity 0.15s ease;
+      opacity: 0;
+
+      &.pinned {
+        opacity: 1;
+      }
+
+      &:hover {
+        background: ${(props) => props.theme.dropdown?.hoverBg || props.theme.sidebar?.collection?.item?.hoverBg};
+        color: ${(props) => props.theme.dropdown?.mutedText || props.theme.text?.muted || '#888'};
+      }
+    }
+  }
+
   .collection-dropdown {
     color: ${(props) => props.theme.sidebar.dropdownIcon.color};
 
diff --git a/packages/bruno-app/src/components/Sidebar/TitleBar/WorkspaceSelector/index.js b/packages/bruno-app/src/components/Sidebar/TitleBar/WorkspaceSelector/index.js
new file mode 100644
index 000000000..86d279bc7
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/TitleBar/WorkspaceSelector/index.js
@@ -0,0 +1,136 @@
+import { useState, forwardRef, useRef, useMemo, useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import toast from 'react-hot-toast';
+import { IconPlus, IconChevronDown, IconCheck, IconFolder, IconPin, IconPinned } from '@tabler/icons';
+
+import { savePreferences } from 'providers/ReduxStore/slices/app';
+import { switchWorkspace, openWorkspaceDialog } from 'providers/ReduxStore/slices/workspaces/actions';
+import { sortWorkspaces, toggleWorkspacePin } from 'utils/workspaces';
+
+import Dropdown from 'components/Dropdown';
+import CreateWorkspace from 'components/WorkspaceSidebar/CreateWorkspace';
+
+const WorkspaceSelector = () => {
+  const dispatch = useDispatch();
+
+  const { workspaces, activeWorkspaceUid } = useSelector((state) => state.workspaces);
+  const preferences = useSelector((state) => state.app.preferences);
+  const activeWorkspace = workspaces.find((w) => w.uid === activeWorkspaceUid);
+
+  const sortedWorkspaces = useMemo(() => {
+    return sortWorkspaces(workspaces, preferences);
+  }, [workspaces, preferences]);
+
+  const [showDropdown, setShowDropdown] = useState(false);
+  const [createWorkspaceModalOpen, setCreateWorkspaceModalOpen] = useState(false);
+
+  const dropdownTippyRef = useRef();
+  const onDropdownCreate = (ref) => (dropdownTippyRef.current = ref);
+
+  const toTitleCase = (str) => {
+    if (!str) return '';
+    if (str === 'default') return 'Default';
+    return str
+      .split(/[\s-_]+/)
+      .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+      .join(' ');
+  };
+
+  const WorkspaceName = forwardRef((props, ref) => {
+    return (
+      <div ref={ref} className="workspace-name-container" onClick={() => setShowDropdown(!showDropdown)}>
+        <span className="workspace-name">{toTitleCase(activeWorkspace?.name) || 'Default Workspace'}</span>
+        <IconChevronDown size={14} stroke={1.5} className="chevron-icon" />
+      </div>
+    );
+  });
+
+  const handleWorkspaceSwitch = (workspaceUid) => {
+    dispatch(switchWorkspace(workspaceUid));
+    setShowDropdown(false);
+    toast.success(`Switched to ${workspaces.find((w) => w.uid === workspaceUid)?.name}`);
+  };
+
+  const handleOpenWorkspace = async () => {
+    setShowDropdown(false);
+    try {
+      await dispatch(openWorkspaceDialog());
+      toast.success('Workspace opened successfully');
+    } catch (error) {
+      toast.error(error.message || 'Failed to open workspace');
+    }
+  };
+
+  const handleCreateWorkspace = () => {
+    setShowDropdown(false);
+    setCreateWorkspaceModalOpen(true);
+  };
+
+  const handlePinWorkspace = useCallback((workspaceUid, e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    const newPreferences = toggleWorkspacePin(workspaceUid, preferences);
+    dispatch(savePreferences(newPreferences));
+  }, [dispatch, preferences]);
+
+  return (
+    <>
+      {createWorkspaceModalOpen && (
+        <CreateWorkspace onClose={() => setCreateWorkspaceModalOpen(false)} />
+      )}
+
+      <Dropdown
+        onCreate={onDropdownCreate}
+        icon={<WorkspaceName />}
+        placement="bottom-start"
+        style="new"
+        visible={showDropdown}
+        onClickOutside={() => setShowDropdown(false)}
+      >
+        {sortedWorkspaces.map((workspace) => {
+          const isActive = workspace.uid === activeWorkspaceUid;
+          const isPinned = preferences?.workspaces?.pinnedWorkspaceUids?.includes(workspace.uid);
+
+          return (
+            <div
+              key={workspace.uid}
+              className={`dropdown-item workspace-item ${isActive ? 'active' : ''}`}
+              onClick={() => handleWorkspaceSwitch(workspace.uid)}
+            >
+              <span className="workspace-name">{toTitleCase(workspace.name)}</span>
+              <div className="workspace-actions">
+                {workspace.type !== 'default' && (
+                  <button
+                    className={`pin-btn ${isPinned ? 'pinned' : ''}`}
+                    onClick={(e) => handlePinWorkspace(workspace.uid, e)}
+                    title={isPinned ? 'Unpin workspace' : 'Pin workspace'}
+                  >
+                    {isPinned ? (
+                      <IconPinned size={14} stroke={1.5} />
+                    ) : (
+                      <IconPin size={14} stroke={1.5} />
+                    )}
+                  </button>
+                )}
+                {isActive && <IconCheck size={16} stroke={1.5} className="check-icon" />}
+              </div>
+            </div>
+          );
+        })}
+
+        <div className="label-item border-top">Workspaces</div>
+
+        <div className="dropdown-item" onClick={handleCreateWorkspace}>
+          <IconPlus size={16} stroke={1.5} className="icon" />
+          Create workspace
+        </div>
+        <div className="dropdown-item" onClick={handleOpenWorkspace}>
+          <IconFolder size={16} stroke={1.5} className="icon" />
+          Open workspace
+        </div>
+      </Dropdown>
+    </>
+  );
+};
+
+export default WorkspaceSelector;
diff --git a/packages/bruno-app/src/components/Sidebar/TitleBar/index.js b/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
index 4388b26d7..f2777eb2b 100644
--- a/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
+++ b/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
@@ -1,31 +1,47 @@
+import { useState, useRef } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import toast from 'react-hot-toast';
-import Bruno from 'components/Bruno';
+import { IconPlus, IconFolder, IconDownload, IconHome, IconSearch, IconDeviceDesktop } from '@tabler/icons';
+
+import { showHomePage } from 'providers/ReduxStore/slices/app';
+import { openCollection, importCollection } from 'providers/ReduxStore/slices/collections/actions';
+import { importCollectionInWorkspace } from 'providers/ReduxStore/slices/workspaces/actions';
+
 import Dropdown from 'components/Dropdown';
-import CreateCollection from '../CreateCollection';
 import ImportCollection from 'components/Sidebar/ImportCollection';
 import ImportCollectionLocation from 'components/Sidebar/ImportCollectionLocation';
 
-import { IconDots } from '@tabler/icons';
-import { useState, forwardRef, useRef } from 'react';
-import { useDispatch } from 'react-redux';
-import { showHomePage } from 'providers/ReduxStore/slices/app';
-import { openCollection, importCollection } from 'providers/ReduxStore/slices/collections/actions';
+import CreateCollection from '../CreateCollection';
+import WorkspaceSelector from './WorkspaceSelector';
 import StyledWrapper from './StyledWrapper';
-import { multiLineMsg } from "utils/common";
-import { formatIpcError } from "utils/common/error";
 
-const TitleBar = () => {
-  const [createCollectionModalOpen, setCreateCollectionModalOpen] = useState(false);
-  const [importCollectionModalOpen, setImportCollectionModalOpen] = useState(false);
-  const [importCollectionLocationModalOpen, setImportCollectionLocationModalOpen] = useState(false);
-  const [importData, setImportData] = useState(null);
+const TitleBar = ({ showSearch, setShowSearch }) => {
   const dispatch = useDispatch();
   const { ipcRenderer } = window;
 
+  const { workspaces, activeWorkspaceUid } = useSelector((state) => state.workspaces);
+  const activeWorkspace = workspaces.find((w) => w.uid === activeWorkspaceUid);
+
+  const [importData, setImportData] = useState(null);
+  const [createCollectionModalOpen, setCreateCollectionModalOpen] = useState(false);
+  const [importCollectionModalOpen, setImportCollectionModalOpen] = useState(false);
+  const [importCollectionLocationModalOpen, setImportCollectionLocationModalOpen] = useState(false);
+
+  const actionsDropdownTippyRef = useRef();
+  const onActionsDropdownCreate = (ref) => (actionsDropdownTippyRef.current = ref);
+
   const handleImportCollection = ({ rawData, type }) => {
-    setImportData({ rawData, type });
     setImportCollectionModalOpen(false);
-    setImportCollectionLocationModalOpen(true);
+
+    if (activeWorkspace && activeWorkspace.type !== 'default') {
+      dispatch(importCollectionInWorkspace(rawData, activeWorkspace.uid, undefined, type))
+        .catch((err) => {
+          toast.error('An error occurred while importing the collection');
+        });
+    } else {
+      setImportData({ rawData, type });
+      setImportCollectionLocationModalOpen(true);
+    }
   };
 
   const handleImportCollectionLocation = (convertedCollection, collectionLocation) => {
@@ -37,93 +53,122 @@ const TitleBar = () => {
       })
       .catch((err) => {
         console.error(err);
-        toast.error(multiLineMsg('An error occurred while importing the collection.', formatIpcError(err)));
+        toast.error('An error occurred while importing the collection');
       });
   };
 
-  const menuDropdownTippyRef = useRef();
-  const onMenuDropdownCreate = (ref) => (menuDropdownTippyRef.current = ref);
-  const MenuIcon = forwardRef((props, ref) => {
-    return (
-      <div ref={ref} className="dropdown-icon cursor-pointer">
-        <IconDots size={22} />
-      </div>
-    );
-  });
-
-  const handleTitleClick = () => dispatch(showHomePage());
+  const handleToggleSearch = () => {
+    if (setShowSearch) {
+      setShowSearch((prev) => !prev);
+    }
+  };
 
   const handleOpenCollection = () => {
-    dispatch(openCollection()).catch(
-      (err) => {
-        console.log(err);
-        toast.error('An error occurred while opening the collection');
-      }
-    );
+    const options = {};
+    if (activeWorkspace?.pathname) {
+      options.workspaceId = activeWorkspace.pathname;
+    }
+
+    dispatch(openCollection(options)).catch((err) => {
+      toast.error('An error occurred while opening the collection');
+    });
   };
 
   const openDevTools = () => {
     ipcRenderer.invoke('renderer:open-devtools');
   };
 
-  return (
-    <StyledWrapper className="px-2 py-2">
-      {createCollectionModalOpen ? <CreateCollection onClose={() => setCreateCollectionModalOpen(false)} /> : null}
-      {importCollectionModalOpen ? (
-        <ImportCollection onClose={() => setImportCollectionModalOpen(false)} handleSubmit={handleImportCollection} />
-      ) : null}
-      {importCollectionLocationModalOpen && importData ? (
+  const renderModals = () => (
+    <>
+      {createCollectionModalOpen && (
+        <CreateCollection
+          onClose={() => setCreateCollectionModalOpen(false)}
+        />
+      )}
+      {importCollectionModalOpen && (
+        <ImportCollection
+          onClose={() => setImportCollectionModalOpen(false)}
+          handleSubmit={handleImportCollection}
+        />
+      )}
+      {importCollectionLocationModalOpen && importData && (
         <ImportCollectionLocation
           rawData={importData.rawData}
           format={importData.type}
           onClose={() => setImportCollectionLocationModalOpen(false)}
           handleSubmit={handleImportCollectionLocation}
         />
-      ) : null}
+      )}
+    </>
+  );
 
-      <div className="flex items-center">
-        <button className="bruno-logo flex items-center gap-2 text-sm font-medium" onClick={handleTitleClick}>
-          <span aria-hidden>
-            <Bruno width={30} />
-          </span>
-          bruno
-        </button>
-        <div className="collection-dropdown flex flex-grow items-center justify-end">
-          <Dropdown onCreate={onMenuDropdownCreate} icon={<MenuIcon />} placement="bottom-start">
+  return (
+    <StyledWrapper className="px-2 py-2">
+      {renderModals()}
+      <div className="titlebar-container">
+        <WorkspaceSelector />
+
+        <div className="actions-container">
+          <button className="home-icon-button" onClick={() => dispatch(showHomePage())} title="Home">
+            <IconHome size={16} stroke={1.5} />
+          </button>
+
+          {setShowSearch && (
+            <button className="search-icon-button" onClick={handleToggleSearch} title="Toggle search">
+              <IconSearch size={16} stroke={1.5} />
+            </button>
+          )}
+
+          <Dropdown
+            onCreate={onActionsDropdownCreate}
+            icon={(
+              <button className="plus-icon-button">
+                <IconPlus size={16} stroke={1.5} />
+              </button>
+            )}
+            placement="bottom-end"
+            style="new"
+          >
+            <div className="label-item">Collections</div>
             <div
               className="dropdown-item"
               onClick={(e) => {
                 setCreateCollectionModalOpen(true);
-                menuDropdownTippyRef.current.hide();
+                actionsDropdownTippyRef.current?.hide();
               }}
             >
-              Create Collection
+              <IconPlus size={16} stroke={1.5} className="icon" />
+              Create collection
+            </div>
+            <div
+              className="dropdown-item"
+              onClick={(e) => {
+                actionsDropdownTippyRef.current?.hide();
+                setImportCollectionModalOpen(true);
+              }}
+            >
+              <IconDownload size={16} stroke={1.5} className="icon" />
+              Import collection
             </div>
             <div
               className="dropdown-item"
               onClick={(e) => {
                 handleOpenCollection();
-                menuDropdownTippyRef.current.hide();
+                actionsDropdownTippyRef.current?.hide();
               }}
             >
-              Open Collection
+              <IconFolder size={16} stroke={1.5} className="icon" />
+              Open collection
             </div>
+            <div className="dropdown-separator"></div>
             <div
               className="dropdown-item"
               onClick={(e) => {
-                menuDropdownTippyRef.current.hide();
-                setImportCollectionModalOpen(true);
-              }}
-            >
-              Import Collection
-            </div>
-            <div
-              className="dropdown-item"
-              onClick={(e) => {
-                menuDropdownTippyRef.current.hide();
+                actionsDropdownTippyRef.current?.hide();
                 openDevTools();
               }}
             >
+              <IconDeviceDesktop size={16} stroke={1.5} className="icon" />
               Devtools
             </div>
           </Dropdown>
diff --git a/packages/bruno-app/src/components/SingleLineEditor/StyledWrapper.js b/packages/bruno-app/src/components/SingleLineEditor/StyledWrapper.js
index 728cdeb25..c1dbb4686 100644
--- a/packages/bruno-app/src/components/SingleLineEditor/StyledWrapper.js
+++ b/packages/bruno-app/src/components/SingleLineEditor/StyledWrapper.js
@@ -15,7 +15,7 @@ const StyledWrapper = styled.div`
   .CodeMirror {
     background: transparent;
     height: 34px;
-    font-size: 14px;
+    font-size: ${(props) => props.theme.font.size.base};
     line-height: 30px;
     overflow: hidden;
 
diff --git a/packages/bruno-app/src/components/SingleLineEditor/index.js b/packages/bruno-app/src/components/SingleLineEditor/index.js
index 87c47f3b0..2bf4d2557 100644
--- a/packages/bruno-app/src/components/SingleLineEditor/index.js
+++ b/packages/bruno-app/src/components/SingleLineEditor/index.js
@@ -6,6 +6,7 @@ import { MaskedEditor } from 'utils/common/masked-editor';
 import { setupAutoComplete } from 'utils/codemirror/autocomplete';
 import StyledWrapper from './StyledWrapper';
 import { IconEye, IconEyeOff } from '@tabler/icons';
+import { setupLinkAware } from 'utils/codemirror/linkAware';
 
 const CodeMirror = require('codemirror');
 
@@ -40,7 +41,7 @@ class SingleLineEditor extends Component {
         this.props.onSave();
       }
     };
-    const noopHandler = () => {};
+    const noopHandler = () => { };
 
     this.editor = CodeMirror(this.editorRef.current, {
       placeholder: this.props.placeholder ?? '',
@@ -48,14 +49,16 @@ class SingleLineEditor extends Component {
       lineNumbers: false,
       theme: this.props.theme === 'dark' ? 'monokai' : 'default',
       mode: 'brunovariables',
-      brunoVarInfo: {
-        variables
-      },
+      brunoVarInfo: this.props.enableBrunoVarInfo !== false ? {
+        variables,
+        collection: this.props.collection,
+        item: this.props.item
+      } : false,
       scrollbarStyle: null,
       tabindex: 0,
       readOnly: this.props.readOnly,
       extraKeys: {
-        Enter: runHandler,
+        'Enter': runHandler,
         'Ctrl-Enter': runHandler,
         'Cmd-Enter': runHandler,
         'Alt-Enter': () => {
@@ -72,7 +75,7 @@ class SingleLineEditor extends Component {
         'Cmd-F': noopHandler,
         'Ctrl-F': noopHandler,
         // Tabbing disabled to make tabindex work
-        Tab: false,
+        'Tab': false,
         'Shift-Tab': false
       }
     });
@@ -92,13 +95,19 @@ class SingleLineEditor extends Component {
       this.editor,
       autoCompleteOptions
     );
-    
+
     this.editor.setValue(String(this.props.value ?? ''));
     this.editor.on('change', this._onEdit);
     this.editor.on('paste', this._onPaste);
     this.addOverlay(variables);
     this._enableMaskedEditor(this.props.isSecret);
     this.setState({ maskInput: this.props.isSecret });
+
+    // Add newline arrow markers if enabled
+    if (this.props.showNewlineArrow) {
+      this._updateNewlineMarkers();
+    }
+    setupLinkAware(this.editor);
   }
 
   /** Enable or disable masking the rendered content of the editor */
@@ -123,6 +132,11 @@ class SingleLineEditor extends Component {
       if (this.props.onChange && (this.props.value !== this.cachedValue)) {
         this.props.onChange(this.cachedValue);
       }
+
+      // Update newline markers after edit
+      if (this.props.showNewlineArrow) {
+        this._updateNewlineMarkers();
+      }
     }
   };
 
@@ -136,15 +150,32 @@ class SingleLineEditor extends Component {
 
     let variables = getAllVariables(this.props.collection, this.props.item);
     if (!isEqual(variables, this.variables)) {
-      this.editor.options.brunoVarInfo.variables = variables;
+      if (this.props.enableBrunoVarInfo !== false && this.editor.options.brunoVarInfo) {
+        this.editor.options.brunoVarInfo.variables = variables;
+      }
       this.addOverlay(variables);
     }
+
+    // Update collection and item when they change
+    if (this.props.enableBrunoVarInfo !== false && this.editor.options.brunoVarInfo) {
+      if (!isEqual(this.props.collection, this.editor.options.brunoVarInfo.collection)) {
+        this.editor.options.brunoVarInfo.collection = this.props.collection;
+      }
+      if (!isEqual(this.props.item, this.editor.options.brunoVarInfo.item)) {
+        this.editor.options.brunoVarInfo.item = this.props.item;
+      }
+    }
     if (this.props.theme !== prevProps.theme && this.editor) {
       this.editor.setOption('theme', this.props.theme === 'dark' ? 'monokai' : 'default');
     }
     if (this.props.value !== prevProps.value && this.props.value !== this.cachedValue && this.editor) {
       this.cachedValue = String(this.props.value);
       this.editor.setValue(String(this.props.value ?? ''));
+
+      // Update newline markers after value change
+      if (this.props.showNewlineArrow) {
+        this._updateNewlineMarkers();
+      }
     }
     if (!isEqual(this.props.isSecret, prevProps.isSecret)) {
       // If the secret flag has changed, update the editor to reflect the change
@@ -160,8 +191,12 @@ class SingleLineEditor extends Component {
 
   componentWillUnmount() {
     if (this.editor) {
+      if (this.editor?._destroyLinkAware) {
+        this.editor._destroyLinkAware();
+      }
       this.editor.off('change', this._onEdit);
       this.editor.off('paste', this._onPaste);
+      this._clearNewlineMarkers();
       this.editor.getWrapperElement().remove();
       this.editor = null;
     }
@@ -180,6 +215,63 @@ class SingleLineEditor extends Component {
     this.editor.setOption('mode', 'brunovariables');
   };
 
+  /**
+   * Update markers to show arrows for newlines
+   */
+  _updateNewlineMarkers = () => {
+    if (!this.editor) return;
+
+    // Clear existing markers
+    this._clearNewlineMarkers();
+
+    this.newlineMarkers = [];
+    const content = this.editor.getValue();
+
+    // Find all newlines and replace them with arrow widgets
+    for (let i = 0; i < content.length; i++) {
+      if (content[i] === '\n') {
+        const pos = this.editor.posFromIndex(i);
+        const nextPos = this.editor.posFromIndex(i + 1);
+
+        // Create a widget to display the arrow
+        const arrow = document.createElement('span');
+        arrow.className = 'newline-arrow';
+        arrow.textContent = '↲';
+        arrow.style.cssText = `
+          color: #888;
+          font-size: 8px;
+          margin: 0 2px;
+          vertical-align: middle;
+          display: inline-block;
+        `;
+
+        // Mark the newline character and replace it with the arrow widget
+        const marker = this.editor.markText(pos, nextPos, {
+          replacedWith: arrow,
+          handleMouseEvents: true
+        });
+
+        this.newlineMarkers.push(marker);
+      }
+    }
+  };
+
+  /**
+   * Clear all newline markers
+   */
+  _clearNewlineMarkers = () => {
+    if (this.newlineMarkers) {
+      this.newlineMarkers.forEach((marker) => {
+        try {
+          marker.clear();
+        } catch (e) {
+          // Marker might already be cleared
+        }
+      });
+      this.newlineMarkers = [];
+    }
+  };
+
   toggleVisibleSecret = () => {
     const isVisible = !this.state.maskInput;
     this.setState({ maskInput: isVisible });
@@ -204,13 +296,15 @@ class SingleLineEditor extends Component {
 
   render() {
     return (
-      <div className={`flex flex-row justify-between w-full overflow-x-auto ${this.props.className}`}>
+      <div className={`flex flex-row items-center w-full overflow-x-auto ${this.props.className}`}>
         <StyledWrapper
           ref={this.editorRef}
           className={`single-line-editor grow ${this.props.readOnly ? 'read-only' : ''}`}
           {...(this.props['data-testid'] ? { 'data-testid': this.props['data-testid'] } : {})}
         />
-        {this.secretEye(this.props.isSecret)}
+        <div className="flex items-center">
+          {this.secretEye(this.props.isSecret)}
+        </div>
       </div>
     );
   }
diff --git a/packages/bruno-app/src/components/StatusBar/StyledWrapper.js b/packages/bruno-app/src/components/StatusBar/StyledWrapper.js
index 4304f37dc..0a7cd69e7 100644
--- a/packages/bruno-app/src/components/StatusBar/StyledWrapper.js
+++ b/packages/bruno-app/src/components/StatusBar/StyledWrapper.js
@@ -10,7 +10,7 @@ const StyledWrapper = styled.div`
     background: ${(props) => props.theme.sidebar.bg};
     border-top: 1px solid ${(props) => props.theme.statusBar.border};
     color: ${(props) => props.theme.statusBar.color};
-    font-size: 0.75rem;
+    font-size: ${(props) => props.theme.font.size.sm};
     user-select: none;
     position: relative;
   }
@@ -51,7 +51,7 @@ const StyledWrapper = styled.div`
 
   .error-count-inline {
     font-size: 10px;
-    font-weight: 600;
+    font-weight: 500;
     color: ${(props) => props.theme.colors.text.danger};
     background: ${(props) => props.theme.colors.bg.danger}20;
     padding: 1px 4px;
@@ -72,4 +72,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/StatusBar/index.js b/packages/bruno-app/src/components/StatusBar/index.js
index 9ce6de680..f55161a97 100644
--- a/packages/bruno-app/src/components/StatusBar/index.js
+++ b/packages/bruno-app/src/components/StatusBar/index.js
@@ -22,7 +22,7 @@ const StatusBar = () => {
   const [cookiesOpen, setCookiesOpen] = useState(false);
   const { version } = useApp();
 
-  const errorCount = logs.filter(log => log.type === 'error').length;
+  const errorCount = logs.filter((log) => log.type === 'error').length;
 
   const handleConsoleClick = () => {
     dispatch(openConsole());
@@ -51,7 +51,7 @@ const StatusBar = () => {
           />
         </Portal>
       )}
-      
+
       {cookiesOpen && (
         <Portal>
           <Cookies
@@ -91,7 +91,7 @@ const StatusBar = () => {
                 <IconSettings size={16} strokeWidth={1.5} aria-hidden="true" />
               </button>
             </ToolHint>
-            
+
             <ToolHint text="Notifications" toolhintId="Notifications" place="top" offset={10}>
               <div className="status-bar-button">
                 <Notifications />
@@ -114,7 +114,7 @@ const StatusBar = () => {
                 <span className="console-label">Search</span>
               </div>
             </button>
-            
+
             <button
               className="status-bar-button"
               data-trigger="cookies"
@@ -127,7 +127,7 @@ const StatusBar = () => {
                 <span className="console-label">Cookies</span>
               </div>
             </button>
-            
+
             <button
               className={`status-bar-button ${errorCount > 0 ? 'has-errors' : ''}`}
               data-trigger="dev-tools"
@@ -143,9 +143,9 @@ const StatusBar = () => {
                 )}
               </div>
             </button>
-            
+
             <div className="status-bar-divider"></div>
-            
+
             <div className="status-bar-version">
               v{version}
             </div>
@@ -156,4 +156,4 @@ const StatusBar = () => {
   );
 };
 
-export default StatusBar; 
\ No newline at end of file
+export default StatusBar;
diff --git a/packages/bruno-app/src/components/StatusDot/index.js b/packages/bruno-app/src/components/StatusDot/index.js
index d5c090efe..f02002111 100644
--- a/packages/bruno-app/src/components/StatusDot/index.js
+++ b/packages/bruno-app/src/components/StatusDot/index.js
@@ -11,5 +11,4 @@ const StatusDot = ({ type = 'default' }) => (
   </sup>
 );
 
-
-export default StatusDot;
\ No newline at end of file
+export default StatusDot;
diff --git a/packages/bruno-app/src/components/StopWatch/index.js b/packages/bruno-app/src/components/StopWatch/index.js
index 5954106d3..2f9066119 100644
--- a/packages/bruno-app/src/components/StopWatch/index.js
+++ b/packages/bruno-app/src/components/StopWatch/index.js
@@ -2,22 +2,22 @@ import React, { useState, useEffect } from 'react';
 
 const StopWatch = ({ startTime }) => {
   const [currentTime, setCurrentTime] = useState(Date.now());
-  
+
   useEffect(() => {
     if (!startTime) return;
-    
+
     const intervalId = setInterval(() => {
       setCurrentTime(Date.now());
     }, 100);
-    
+
     return () => clearInterval(intervalId);
   }, [startTime]);
-  
+
   if (!startTime) return <span>Loading...</span>;
-  
+
   const elapsedTime = currentTime - startTime;
   if (elapsedTime < 250) return <span>Loading...</span>;
-  
+
   const seconds = elapsedTime / 1000;
   return <span>{seconds.toFixed(1)}s</span>;
 };
diff --git a/packages/bruno-app/src/components/Tab/index.js b/packages/bruno-app/src/components/Tab/index.js
index dd74c9261..bf94addcb 100644
--- a/packages/bruno-app/src/components/Tab/index.js
+++ b/packages/bruno-app/src/components/Tab/index.js
@@ -2,21 +2,22 @@ import React from 'react';
 import classnames from 'classnames';
 
 const Tab = ({ name, label, isActive, onClick, count = 0, className = '', ...props }) => {
-  const tabClassName = classnames("tab select-none", {
+  const tabClassName = classnames('tab select-none', {
     active: isActive
   }, className);
 
   return (
-    <div 
-      className={tabClassName} 
-      role="tab" 
+    <div
+      className={tabClassName}
+      role="tab"
       onClick={() => onClick(name)}
+      data-testid={`tab-${name}`}
       {...props}
     >
       {label}
-      {count > 0 && <sup className="ml-1 font-medium">{count}</sup>}
+      {count > 0 && <sup className="ml-1 font-medium" data-testid={`tab-${name}-count`}>{count}</sup>}
     </div>
   );
 };
 
-export default Tab; 
\ No newline at end of file
+export default Tab;
diff --git a/packages/bruno-app/src/components/Table/index.js b/packages/bruno-app/src/components/Table/index.js
index 4944276c6..6d6a79a68 100644
--- a/packages/bruno-app/src/components/Table/index.js
+++ b/packages/bruno-app/src/components/Table/index.js
@@ -95,7 +95,8 @@ const Table = ({ minColumnWidth = 1, headers = [], children }) => {
                   <div
                     className="resizer absolute cursor-col-resize w-[4px] right-[-2px] top-0 z-10 opacity-50 hover:bg-blue-500 active:bg-blue-500"
                     onMouseDown={handleMouseDown(i)}
-                  ></div>
+                  >
+                  </div>
                 </th>
               ))}
             </tr>
diff --git a/packages/bruno-app/src/components/Tabs/index.js b/packages/bruno-app/src/components/Tabs/index.js
index fe9134359..97d5219b0 100644
--- a/packages/bruno-app/src/components/Tabs/index.js
+++ b/packages/bruno-app/src/components/Tabs/index.js
@@ -32,7 +32,7 @@ export const TabsTrigger = ({ value: triggerValue, children, className = '' }) =
   return (
     <button
       onClick={() => onValueChange(triggerValue)}
-      className={`inline-flex items-center justify-center rounded-[4px] p-[8px] text-sm whitespace-nowrap transition-all cursor-pointer border border-transparent hover:opacity-90 ${className}`}
+      className={`inline-flex items-center justify-center rounded-[4px] p-[8px] text-xs whitespace-nowrap transition-all cursor-pointer border border-transparent hover:opacity-90 ${className}`}
       style={{
         background: isActive ? theme.tabs.secondary.active.bg : 'transparent',
         color: isActive ? theme.tabs.secondary.active.color : theme.tabs.secondary.inactive.color
diff --git a/packages/bruno-app/src/components/TagList/StyledWrapper.js b/packages/bruno-app/src/components/TagList/StyledWrapper.js
index 97fbdf920..2aa48f248 100644
--- a/packages/bruno-app/src/components/TagList/StyledWrapper.js
+++ b/packages/bruno-app/src/components/TagList/StyledWrapper.js
@@ -17,7 +17,7 @@ const StyledWrapper = styled.div`
     background-color: ${(props) => props.theme.sidebar.bg};
     border: 1px solid ${(props) => props.theme.requestTabs.bottomBorder};
     border-radius: 3px;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     font-weight: 500;
     color: ${(props) => props.theme.text};
     max-width: 200px;
@@ -101,15 +101,15 @@ const StyledWrapper = styled.div`
   }
 
   .empty-title {
-    font-weight: 600;
+    font-weight: 500;
     margin: 0 0 4px 0;
-    font-size: 14px;
+    font-size: ${(props) => props.theme.font.size.base};
     color: ${(props) => props.theme.text};
   }
 
   .empty-subtitle {
     margin: 0;
-    font-size: 12px;
+    font-size: ${(props) => props.theme.font.size.sm};
     opacity: 0.8;
     line-height: 1.5;
     color: ${(props) => props.theme.textSecondary || props.theme.text};
@@ -123,7 +123,7 @@ const StyledWrapper = styled.div`
     
     .tag-item {
       padding: 4px 8px;
-      font-size: 11px;
+      font-size: ${(props) => props.theme.font.size.xs};
     }
     
     .empty-state {
@@ -134,4 +134,4 @@ const StyledWrapper = styled.div`
   }
 `;
 
-export default StyledWrapper; 
\ No newline at end of file
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/TagList/index.js b/packages/bruno-app/src/components/TagList/index.js
index 1b800a6a0..94403225d 100644
--- a/packages/bruno-app/src/components/TagList/index.js
+++ b/packages/bruno-app/src/components/TagList/index.js
@@ -51,7 +51,7 @@ const TagList = ({ tagsHintList = [], handleAddTag, tags, handleRemoveTag, onSav
         onSave={onSave}
         data-testid="tag-input"
       />
-      {error && <span className='text-xs text-red-500'>{error}</span>}
+      {error && <span className="text-xs text-red-500">{error}</span>}
       <ul className="flex flex-wrap gap-1">
         {tags && tags.length
           ? tags.map((_tag) => (
diff --git a/packages/bruno-app/src/components/ToggleSwitch/StyledWrapper.js b/packages/bruno-app/src/components/ToggleSwitch/StyledWrapper.js
index cf6bb9e92..1fbb0aeb5 100644
--- a/packages/bruno-app/src/components/ToggleSwitch/StyledWrapper.js
+++ b/packages/bruno-app/src/components/ToggleSwitch/StyledWrapper.js
@@ -2,11 +2,11 @@ import styled from 'styled-components';
 
 const switchSizes = {
   '2xs': { width: 32, height: 16, buttonSize: 14 },
-  xs: { width: 40, height: 20, buttonSize: 18 },
-  s: { width: 44, height: 22, buttonSize: 20 },
-  m: { width: 50, height: 24, buttonSize: 22 }, // default size
-  l: { width: 56, height: 28, buttonSize: 26 },
-  xl: { width: 64, height: 32, buttonSize: 30 },
+  'xs': { width: 40, height: 20, buttonSize: 18 },
+  's': { width: 44, height: 22, buttonSize: 20 },
+  'm': { width: 50, height: 24, buttonSize: 22 }, // default size
+  'l': { width: 56, height: 28, buttonSize: 26 },
+  'xl': { width: 64, height: 32, buttonSize: 30 },
   '2xl': { width: 72, height: 36, buttonSize: 34 }
 };
 
diff --git a/packages/bruno-app/src/components/VariablesEditor/index.js b/packages/bruno-app/src/components/VariablesEditor/index.js
index 322d2f3a1..ea02b1615 100644
--- a/packages/bruno-app/src/components/VariablesEditor/index.js
+++ b/packages/bruno-app/src/components/VariablesEditor/index.js
@@ -38,7 +38,7 @@ const EnvVariables = ({ collection, theme }) => {
   if (!environment) {
     return (
       <>
-        <h1 className="font-semibold mt-4 mb-2">Environment Variables</h1>
+        <h1 className="font-medium mt-4 mb-2">Environment Variables</h1>
         <div className="muted text-xs">No environment selected</div>
       </>
     );
@@ -50,7 +50,7 @@ const EnvVariables = ({ collection, theme }) => {
   return (
     <>
       <div className="flex items-center mt-4 mb-2">
-        <h1 className="font-semibold">Environment Variables</h1>
+        <h1 className="font-medium">Environment Variables</h1>
         <span className="muted ml-2">({environment.name})</span>
       </div>
       {enabledEnvVars.length > 0 ? (
@@ -73,7 +73,7 @@ const RuntimeVariables = ({ collection, theme }) => {
 
   return (
     <>
-      <h1 className="font-semibold mb-2">Runtime Variables</h1>
+      <h1 className="font-medium mb-2">Runtime Variables</h1>
       {runtimeVariablesFound ? (
         <KeyValueExplorer data={runtimeVariableArray} theme={theme} />
       ) : (
diff --git a/packages/bruno-app/src/components/Welcome/StyledWrapper.js b/packages/bruno-app/src/components/Welcome/StyledWrapper.js
deleted file mode 100644
index 886ae15ab..000000000
--- a/packages/bruno-app/src/components/Welcome/StyledWrapper.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import styled from 'styled-components';
-
-const StyledWrapper = styled.div`
-  .heading {
-    color: ${(props) => props.theme.welcome.heading};
-    font-size: 0.75rem;
-  }
-
-  .muted {
-    color: ${(props) => props.theme.welcome.muted};
-  }
-
-  .collection-options {
-    cursor: pointer;
-
-    svg {
-      position: relative;
-      top: -1px;
-    }
-
-    .label {
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-
-  .keycap {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    padding: 1px 6px;
-    border: 1px solid ${(props) => props.theme.modal.input.border};
-    border-radius: 4px;
-    background: ${(props) =>
-      props.theme.mode === 'dark' ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'};
-    font-size: 0.75rem;
-    font-weight: 500;
-    font-family: inherit;
-    line-height: 1;
-    color: ${(props) => props.theme.text};
-  }
-`;
-
-export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Welcome/index.js b/packages/bruno-app/src/components/Welcome/index.js
deleted file mode 100644
index 0374b6600..000000000
--- a/packages/bruno-app/src/components/Welcome/index.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import { useState } from 'react';
-import toast from 'react-hot-toast';
-import { useDispatch, useSelector } from 'react-redux';
-import { useTranslation } from 'react-i18next';
-import { openCollection, importCollection } from 'providers/ReduxStore/slices/collections/actions';
-
-import { IconBrandGithub, IconPlus, IconDownload, IconFolders, IconSpeakerphone, IconBook } from '@tabler/icons';
-
-import Bruno from 'components/Bruno';
-import CreateCollection from 'components/Sidebar/CreateCollection';
-import ImportCollection from 'components/Sidebar/ImportCollection';
-import ImportCollectionLocation from 'components/Sidebar/ImportCollectionLocation';
-import StyledWrapper from './StyledWrapper';
-
-const Welcome = () => {
-  const dispatch = useDispatch();
-  const { t } = useTranslation();
-  const sidebarCollapsed = useSelector((state) => state.app.sidebarCollapsed);
-  const collections = useSelector((state) => state.collections.collections);
-  const [importData, setImportData] = useState(null);
-  const [createCollectionModalOpen, setCreateCollectionModalOpen] = useState(false);
-  const [importCollectionModalOpen, setImportCollectionModalOpen] = useState(false);
-  const [importCollectionLocationModalOpen, setImportCollectionLocationModalOpen] = useState(false);
-
-  const handleOpenCollection = () => {
-    dispatch(openCollection())
-      .catch((err) => {
-        console.error(err);
-        toast.error(t('WELCOME.COLLECTION_OPEN_ERROR'));
-      });
-  };
-
-  const handleImportCollection = ({ rawData, type }) => {
-    setImportData({ rawData, type });
-    setImportCollectionModalOpen(false);
-    setImportCollectionLocationModalOpen(true);
-  };
-
-  const handleImportCollectionLocation = (convertedCollection, collectionLocation) => {
-    dispatch(importCollection(convertedCollection, collectionLocation))
-      .then(() => {
-        setImportCollectionLocationModalOpen(false);
-        setImportData(null);
-        toast.success(t('WELCOME.COLLECTION_IMPORT_SUCCESS'));
-      })
-      .catch((err) => {
-        setImportCollectionLocationModalOpen(false);
-        console.error(err);
-        toast.error(t('WELCOME.COLLECTION_IMPORT_ERROR'));
-      });
-  };
-
-  return (
-    <StyledWrapper className="pb-4 px-6 mt-6">
-      {createCollectionModalOpen ? <CreateCollection onClose={() => setCreateCollectionModalOpen(false)} /> : null}
-      {importCollectionModalOpen ? (
-        <ImportCollection onClose={() => setImportCollectionModalOpen(false)} handleSubmit={handleImportCollection} />
-      ) : null}
-      {importCollectionLocationModalOpen && importData ? (
-        <ImportCollectionLocation
-          rawData={importData.rawData}
-          format={importData.type}
-          onClose={() => setImportCollectionLocationModalOpen(false)}
-          handleSubmit={handleImportCollectionLocation}
-        />
-      ) : null}
-
-      <div aria-hidden className="">
-        <Bruno width={50} />
-      </div>
-      <div className="text-xl font-semibold select-none">bruno</div>
-      <div className="mt-4">{t('WELCOME.ABOUT_BRUNO')}</div>
-
-      <div className="uppercase font-semibold heading mt-10">{t('COMMON.COLLECTIONS')}</div>
-      <div className="mt-4 flex items-center collection-options select-none">
-        <button
-          className="flex items-center"
-          onClick={() => setCreateCollectionModalOpen(true)}
-          aria-label={t('WELCOME.CREATE_COLLECTION')}
-        >
-          <IconPlus aria-hidden size={18} strokeWidth={2} />
-          <span className="label ml-2" id="create-collection" data-testid="create-collection">
-            {t('WELCOME.CREATE_COLLECTION')}
-          </span>
-        </button>
-
-        <button className="flex items-center ml-6" onClick={handleOpenCollection} aria-label="Open Collection">
-          <IconFolders aria-hidden size={18} strokeWidth={2} />
-          <span className="label ml-2">{t('WELCOME.OPEN_COLLECTION')}</span>
-        </button>
-
-        <button
-          className="flex items-center ml-6"
-          onClick={() => setImportCollectionModalOpen(true)}
-          aria-label={t('WELCOME.IMPORT_COLLECTION')}
-        >
-          <IconDownload aria-hidden size={18} strokeWidth={2} />
-          <span className="label ml-2" id="import-collection">
-            {t('WELCOME.IMPORT_COLLECTION')}
-          </span>
-        </button>
-      </div>
-
-      <div className="uppercase font-semibold heading mt-10 pt-6">{t('WELCOME.LINKS')}</div>
-      <div className="mt-4 flex flex-col collection-options select-none">
-        <div className="flex items-center mt-2">
-          <a
-            href="https://docs.usebruno.com"
-            aria-label="Read documentation"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="inline-flex items-center"
-          >
-            <IconBook aria-hidden size={18} strokeWidth={2} />
-            <span className="label ml-2">{t('COMMON.DOCUMENTATION')}</span>
-          </a>
-        </div>
-        <div className="flex items-center mt-2">
-          <a
-            href="https://github.com/usebruno/bruno/issues"
-            aria-label="Report issues on GitHub"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="inline-flex items-center"
-          >
-            <IconSpeakerphone aria-hidden size={18} strokeWidth={2} />
-            <span className="label ml-2">{t('COMMON.REPORT_ISSUES')}</span>
-          </a>
-        </div>
-        <div className="flex items-center mt-2">
-          <a
-            href="https://github.com/usebruno/bruno"
-            aria-label="Go to GitHub repository"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="flex items-center"
-          >
-            <IconBrandGithub aria-hidden size={18} strokeWidth={2} />
-            <span className="label ml-2">{t('COMMON.GITHUB')}</span>
-          </a>
-        </div>
-
-        <div className="mt-10 select-none">
-          {t('WELCOME.GLOBAL_SEARCH_TIP_PART1')} <span className="keycap">⌘</span>{' '}<span className="keycap">K</span>{' '}
-          {t('WELCOME.GLOBAL_SEARCH_TIP_PART2')} <span className="keycap">Ctrl</span>{' '}<span className="keycap">K</span>{' '}
-          {t('WELCOME.GLOBAL_SEARCH_TIP_PART3')}
-        </div>
-      </div>
-    </StyledWrapper>
-  );
-};
-
-export default Welcome;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/StyledWrapper.js
new file mode 100644
index 000000000..7e800b754
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/StyledWrapper.js
@@ -0,0 +1,134 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  .workspace-header {
+    position: relative;
+  }
+
+  .workspace-rename-container {
+    height: 28px;
+    display: flex;
+    align-items: center;
+    background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+    gap: 8px;
+    border-radius: 4px;
+  }
+
+  .workspace-name-input {
+    padding: 0 8px;
+    font-size: 18px;
+    font-weight: 600;
+    border-radius: 4px;
+    background: transparent;
+    color: ${(props) => props.theme.text.primary};
+    outline: none;
+    min-width: 200px;
+
+    &:focus {
+      outline: none;
+    }
+  }
+
+  .inline-actions {
+    display: flex;
+    gap: 4px;
+  }
+
+  .inline-action-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 4px;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: all 0.2s;
+
+    &.save {
+      color: ${(props) => props.theme.colors.text.green};
+
+      &:hover {
+        background: ${(props) => props.theme.colors.bg.green};
+      }
+    }
+
+    &.cancel {
+      color: ${(props) => props.theme.colors.text.red};
+
+      &:hover {
+        background: ${(props) => props.theme.colors.bg.red};
+      }
+    }
+  }
+
+  .workspace-error {
+    position: absolute;
+    top: 100%;
+    left: 16px;
+    margin-top: 4px;
+    font-size: 12px;
+    color: ${(props) => props.theme.colors.text.red};
+  }
+
+  .workspace-menu-dropdown {
+    min-width: 150px;
+  }
+
+  .dropdown-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 8px 12px;
+    cursor: pointer;
+    transition: background 0.2s;
+    color: ${(props) => props.theme.text.primary};
+
+    &.disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+  }
+
+  .tabs-container {
+    border-bottom: 1px solid ${(props) => props.theme.workspace.border};
+    background: ${(props) => props.theme.bg.primary};
+  }
+
+  .tab-item {
+    position: relative;
+    cursor: pointer;
+    color: var(--color-tab-inactive);
+    border-bottom: 2px solid transparent;
+    transition: all 0.15s ease;
+
+    &:hover {
+      color: ${(props) => props.theme.text.primary};
+      border-bottom-color: ${(props) => props.theme.colors.border};
+    }
+
+    &.active {
+      border-bottom-color: ${(props) => props.theme.colors.text.yellow};
+      color: ${(props) => props.theme.tabs.active.color};
+    }
+  }
+
+  .workspace-action-buttons {
+    gap: 4px;
+  }
+
+  .workspace-button {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    padding: 4px 8px;
+    font-size: 12px;
+    border-radius: 8px;
+    color: ${(props) => props.theme.text.primary};
+    cursor: pointer;
+
+    &:hover {
+      background-color: ${(props) => props.theme.workspace.button.bg};
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceCollections/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceCollections/StyledWrapper.js
new file mode 100644
index 000000000..1c464a0d6
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceCollections/StyledWrapper.js
@@ -0,0 +1,154 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  .collections-table {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    font-size: ${(props) => props.theme.font.size.base};
+  }
+
+  .collections-header {
+    display: grid;
+    gap: 16px;
+    padding: 10px 16px;
+    border-bottom: ${(props) => props.theme.workspace.collection.header.indentBorder};
+    position: sticky;
+    top: 0;
+    z-index: 10;
+
+    &:has(.header-git) {
+      grid-template-columns: 1fr 3fr 1fr 1.5fr;
+    }
+
+    &:not(:has(.header-git)) {
+      grid-template-columns: 1fr 3fr 1.5fr;
+    }
+  }
+
+  .header-cell {
+    font-weight: 600;
+    font-size: ${(props) => props.theme.font.size.xs};
+    color: ${(props) => props.theme.text.muted};
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    display: flex;
+    align-items: center;
+  }
+
+  .collections-body {
+    flex: 1;
+    overflow-y: auto;
+  }
+
+  .collection-row {
+    display: grid;
+    gap: 16px;
+    padding: 8px 16px;
+    border-bottom: ${(props) => props.theme.workspace.collection.item.indentBorder};
+    transition: background-color 0.15s ease;
+    cursor: pointer;
+    grid-template-columns: 1fr 3fr 1.5fr;
+
+    &:hover {
+      background-color: ${(props) => props.theme.sidebar.bg};
+    }
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .row-cell {
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+  }
+
+  .cell-name {
+    .collection-icon {
+      color: ${(props) => props.theme.workspace.accent};
+      flex-shrink: 0;
+    }
+
+    .collection-info {
+      min-width: 0;
+      flex: 1;
+    }
+
+    .collection-name {
+      font-weight: 400;
+      color: ${(props) => props.theme.text};
+      font-size: ${(props) => props.theme.font.size.base};
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .collection-subtitle {
+      font-size: ${(props) => props.theme.font.size.xs};
+      color: ${(props) => props.theme.text.muted};
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin-top: 2px;
+    }
+  }
+
+  .cell-location {
+    .location-text {
+      font-size: ${(props) => props.theme.font.size.sm};
+      color: ${(props) => props.theme.text.muted};
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 100%;
+    }
+  }
+
+  .cell-actions {
+    justify-content: flex-end;
+    
+    .action-buttons {
+      display: flex;
+      gap: 4px;
+    }
+  }
+
+  .action-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 30px;
+    height: 30px;
+    border: none;
+    background: transparent;
+    border-radius: 5px;
+    cursor: pointer;
+    transition: background 0.15s ease, color 0.15s ease;
+    color: ${(props) => props.theme.text.muted};
+
+    &:disabled {
+      opacity: 0.4;
+      cursor: not-allowed;
+    }
+
+    &:hover:not(:disabled) {
+      background-color: ${(props) => props.theme.listItem.hoverBg};
+      
+      &.action-edit {
+        color: ${(props) => props.theme.text};
+      }
+      
+      &.action-share {
+        color: #3B82F6;
+      }
+      
+      &.action-delete {
+        color: #EF4444;
+      }
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceCollections/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceCollections/index.js
new file mode 100644
index 000000000..89b1349c9
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceCollections/index.js
@@ -0,0 +1,343 @@
+import React, { useState } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { IconBox, IconTrash, IconEdit, IconShare } from '@tabler/icons';
+import { removeCollectionFromWorkspaceAction, importCollectionInWorkspace } from 'providers/ReduxStore/slices/workspaces/actions';
+import { addTab } from 'providers/ReduxStore/slices/tabs';
+import { hideHomePage } from 'providers/ReduxStore/slices/app';
+import toast from 'react-hot-toast';
+import Modal from 'components/Modal';
+import CreateCollection from 'components/Sidebar/CreateCollection';
+import ImportCollection from 'components/Sidebar/ImportCollection';
+import RenameCollection from 'components/Sidebar/Collections/Collection/RenameCollection';
+import ShareCollection from 'components/ShareCollection';
+import StyledWrapper from './StyledWrapper';
+import { mountCollection } from 'providers/ReduxStore/slices/collections/actions';
+
+const WorkspaceCollections = ({ workspace, onImportCollection }) => {
+  const dispatch = useDispatch();
+  const { collections } = useSelector((state) => state.collections);
+  const [collectionToRemove, setCollectionToRemove] = useState(null);
+  const [renameCollectionModalOpen, setRenameCollectionModalOpen] = useState(false);
+  const [shareCollectionModalOpen, setShareCollectionModalOpen] = useState(false);
+  const [selectedCollectionUid, setSelectedCollectionUid] = useState(null);
+
+  const [createCollectionModalOpen, setCreateCollectionModalOpen] = useState(false);
+  const [importCollectionModalOpen, setImportCollectionModalOpen] = useState(false);
+
+  const handleImportCollection = ({ rawData, type }) => {
+    if (onImportCollection) {
+      onImportCollection();
+      return;
+    }
+
+    setImportCollectionModalOpen(false);
+    dispatch(importCollectionInWorkspace(rawData, workspace.uid, undefined, type))
+      .catch((err) => {
+        console.error(err);
+        toast.error('An error occurred while importing the collection');
+      });
+  };
+
+  const workspaceCollections = React.useMemo(() => {
+    if (!workspace.collections || workspace.collections.length === 0) {
+      return [];
+    }
+
+    const result = [];
+
+    workspace.collections.forEach((wc) => {
+      const loadedCollection = collections.find((c) => c.pathname === wc.path);
+
+      if (loadedCollection) {
+        result.push({
+          ...loadedCollection,
+          isGitBacked: !!wc.remote,
+          gitRemoteUrl: wc.remote
+        });
+      } else {
+        result.push({
+          uid: `unloaded-${wc.path}`,
+          name: wc.name,
+          pathname: wc.path,
+          items: [],
+          environments: [],
+          isGitBacked: !!wc.remote,
+          isLoaded: false,
+          gitRemoteUrl: wc.remote,
+          git: { gitRootPath: null },
+          brunoConfig: {},
+          root: {
+            request: {
+              headers: [],
+              auth: { mode: 'none' },
+              vars: { req: [], res: [] },
+              script: { req: '', res: '' },
+              tests: ''
+            },
+            docs: ''
+          }
+        });
+      }
+    });
+
+    return result;
+  }, [workspace.collections, collections, workspace.pathname]);
+
+  const handleOpenCollectionClick = (collection, event) => {
+    if (event.target.closest('.action-buttons')) {
+      return;
+    }
+
+    if (collection.isLoaded === false) {
+      if (collection.isGitBacked) {
+        toast.error(`Collection "${collection.name}" needs to be cloned first`);
+      } else {
+        toast.error(`Collection "${collection.name}" does not exist on disk`);
+      }
+      return;
+    }
+
+    dispatch(mountCollection({
+      collectionUid: collection.uid,
+      collectionPathname: collection.pathname,
+      brunoConfig: collection.brunoConfig
+    }));
+
+    dispatch(hideHomePage());
+
+    dispatch(addTab({
+      uid: collection.uid,
+      collectionUid: collection.uid,
+      type: 'collection-settings'
+    }));
+  };
+
+  const handleRenameCollection = (collection) => {
+    if (collection.isLoaded === false) {
+      toast.error('Cannot rename collections that are not cloned yet');
+      return;
+    }
+
+    setSelectedCollectionUid(collection.uid);
+    setRenameCollectionModalOpen(true);
+  };
+
+  const handleShareCollection = (collection) => {
+    if (collection.isLoaded === false) {
+      toast.error('Please clone this collection first before sharing it');
+      return;
+    }
+
+    dispatch(mountCollection({
+      collectionUid: collection.uid,
+      collectionPathname: collection.pathname,
+      brunoConfig: collection.brunoConfig
+    }));
+
+    setSelectedCollectionUid(collection.uid);
+    setShareCollectionModalOpen(true);
+  };
+
+  const handleRemoveCollection = (collection) => {
+    setCollectionToRemove(collection);
+  };
+
+  const confirmRemoveCollection = async () => {
+    if (!collectionToRemove) return;
+
+    try {
+      await dispatch(removeCollectionFromWorkspaceAction(workspace.uid, collectionToRemove.pathname));
+
+      const collectionInfo = getCollectionWorkspaceInfo(collectionToRemove);
+
+      if (collectionInfo.isLoaded && !collectionInfo.isGitBacked) {
+        toast.success(`Deleted "${collectionToRemove.name}" collection`);
+      } else if (collectionInfo.isGitBacked) {
+        toast.success(`Removed git-backed collection "${collectionToRemove.name}" from workspace`);
+      } else {
+        toast.success(`Removed "${collectionToRemove.name}" from workspace`);
+      }
+
+      setCollectionToRemove(null);
+    } catch (error) {
+      console.error('Error removing collection:', error);
+      toast.error(error.message || 'Failed to remove collection from workspace');
+    }
+  };
+
+  const getCollectionWorkspaceInfo = (collection) => {
+    if (collection.hasOwnProperty('isGitBacked')) {
+      return {
+        isGitBacked: collection.isGitBacked,
+        gitRemoteUrl: collection.gitRemoteUrl,
+        isLoaded: collection.isLoaded !== false
+      };
+    }
+
+    const workspaceCollection = workspace.collections?.find((wc) => {
+      return collection.pathname === wc.path;
+    });
+
+    return {
+      isGitBacked: !!workspaceCollection?.remote,
+      gitRemoteUrl: workspaceCollection?.remote,
+      isLoaded: true
+    };
+  };
+
+  return (
+    <StyledWrapper className="h-full">
+      <div className="w-full h-full">
+
+        {createCollectionModalOpen && (
+          <CreateCollection
+            onClose={() => setCreateCollectionModalOpen(false)}
+          />
+        )}
+
+        {importCollectionModalOpen && (
+          <ImportCollection
+            onClose={() => setImportCollectionModalOpen(false)}
+            handleSubmit={handleImportCollection}
+          />
+        )}
+
+        {renameCollectionModalOpen && selectedCollectionUid && (
+          <RenameCollection
+            collectionUid={selectedCollectionUid}
+            onClose={() => {
+              setRenameCollectionModalOpen(false);
+              setSelectedCollectionUid(null);
+            }}
+          />
+        )}
+
+        {shareCollectionModalOpen && selectedCollectionUid && (
+          <ShareCollection
+            collectionUid={selectedCollectionUid}
+            onClose={() => {
+              setShareCollectionModalOpen(false);
+              setSelectedCollectionUid(null);
+            }}
+          />
+        )}
+
+        {collectionToRemove && (
+          <Modal
+            size="sm"
+            title="Delete Collection"
+            handleCancel={() => setCollectionToRemove(null)}
+            handleConfirm={confirmRemoveCollection}
+            confirmText="Delete Collection"
+            cancelText="Cancel"
+            style="new"
+          >
+            <p className="text-gray-600 dark:text-gray-300">
+              Are you sure you want to delete <strong>"{collectionToRemove.name}"</strong>?
+            </p>
+            <p className="text-sm text-gray-500 dark:text-gray-400 mt-3">
+              {(() => {
+                const collectionInfo = getCollectionWorkspaceInfo(collectionToRemove);
+
+                if (collectionInfo.isGitBacked) {
+                  return 'This will remove the git-backed collection reference from workspace.yml. Local files (if any) will not be deleted.';
+                } else {
+                  return 'This will permanently delete the collection files from the workspace collections folder.';
+                }
+              })()}
+            </p>
+          </Modal>
+        )}
+
+        <div className="h-full overflow-auto">
+          {workspaceCollections.length === 0 ? (
+            <div className="flex flex-col items-center justify-center h-full text-center p-8">
+              <div className="p-4 bg-gray-50 dark:bg-gray-800 rounded-full mb-4">
+                <IconBox size={32} stroke={1.5} className="text-gray-400" />
+              </div>
+              <h3 className="text-lg font-medium mb-2">No collections yet</h3>
+              <p className="text-muted mb-4">
+                Create your first collection or open an existing one to get started.
+              </p>
+            </div>
+          ) : (
+            <div className="collections-table">
+              <div className="collections-header">
+                <div className="header-cell header-name">Collection</div>
+                <div className="header-cell header-location">Location</div>
+                <div className="header-cell flex justify-end">Actions</div>
+              </div>
+
+              <div className="collections-body">
+                {workspaceCollections.map((collection, index) => {
+                  return (
+                    <div
+                      key={collection.uid || index}
+                      className="collection-row"
+                      onClick={(e) => handleOpenCollectionClick(collection, e)}
+                    >
+                      <div className="row-cell cell-name">
+                        <div className="flex items-center gap-2">
+                          <IconBox size={16} stroke={1.5} className="collection-icon" />
+                          <div className="collection-info">
+                            <div className="collection-name">{collection.name}</div>
+                            {collection.brunoConfig?.name && collection.brunoConfig.name !== collection.name && (
+                              <div className="collection-subtitle">{collection.brunoConfig.name}</div>
+                            )}
+                          </div>
+                        </div>
+                      </div>
+
+                      <div className="row-cell cell-location">
+                        <div className="location-text" title={collection.pathname}>
+                          {collection.pathname}
+                        </div>
+                      </div>
+
+                      <div className="row-cell cell-actions">
+                        <div className="action-buttons">
+                          <button
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              handleRenameCollection(collection);
+                            }}
+                            className="action-btn action-edit"
+                            title="Rename collection"
+                          >
+                            <IconEdit size={16} stroke={1.5} />
+                          </button>
+                          <button
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              handleShareCollection(collection);
+                            }}
+                            className="action-btn action-share"
+                            title="Share collection"
+                          >
+                            <IconShare size={16} stroke={1.5} />
+                          </button>
+                          <button
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              handleRemoveCollection(collection);
+                            }}
+                            className="action-btn action-delete"
+                            title="Remove from workspace"
+                          >
+                            <IconTrash size={16} stroke={1.5} />
+                          </button>
+                        </div>
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default WorkspaceCollections;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceDocs/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceDocs/StyledWrapper.js
new file mode 100644
index 000000000..af80d4c08
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceDocs/StyledWrapper.js
@@ -0,0 +1,9 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  .editing-mode {
+    cursor: pointer;
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceDocs/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceDocs/index.js
new file mode 100644
index 000000000..f676070ca
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceDocs/index.js
@@ -0,0 +1,147 @@
+import 'github-markdown-css/github-markdown.css';
+import get from 'lodash/get';
+import { useTheme } from 'providers/Theme';
+import { useState, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { saveWorkspaceDocs } from 'providers/ReduxStore/slices/workspaces/actions';
+import Markdown from 'components/MarkDown';
+import CodeEditor from 'components/CodeEditor';
+import StyledWrapper from './StyledWrapper';
+import { IconEdit, IconX, IconFileText } from '@tabler/icons';
+import toast from 'react-hot-toast';
+
+const WorkspaceDocs = ({ workspace }) => {
+  const dispatch = useDispatch();
+  const { displayedTheme } = useTheme();
+  const [isEditing, setIsEditing] = useState(false);
+  const [localDocs, setLocalDocs] = useState(workspace?.docs || '');
+  const preferences = useSelector((state) => state.app.preferences);
+
+  useEffect(() => {
+    setLocalDocs(workspace?.docs || '');
+    setIsEditing(false);
+  }, [workspace?.uid, workspace?.docs]);
+
+  const toggleViewMode = () => {
+    setIsEditing((prev) => !prev);
+  };
+
+  const onEdit = (value) => {
+    setLocalDocs(value);
+  };
+
+  const handleDiscardChanges = () => {
+    setLocalDocs(workspace?.docs || '');
+    toggleViewMode();
+  };
+
+  const onSave = async () => {
+    if (!workspace) {
+      toast.error('Workspace not found');
+      return;
+    }
+
+    try {
+      await dispatch(saveWorkspaceDocs(workspace.uid, localDocs));
+      toast.success('Documentation saved successfully');
+      toggleViewMode();
+    } catch (error) {
+      console.error('Error saving workspace docs:', error);
+      toast.error('Failed to save documentation');
+    }
+  };
+
+  return (
+    <StyledWrapper className="h-full w-full relative flex flex-col p-4">
+      <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} />
+          Workspace Documentation
+        </div>
+        <div className="flex flex-row gap-2 items-center justify-center">
+          {isEditing ? (
+            <>
+              <div className="editing-mode" role="tab" onClick={handleDiscardChanges}>
+                <IconX className="cursor-pointer" size={20} strokeWidth={1.5} />
+              </div>
+              <button type="submit" className="submit btn btn-sm btn-secondary" onClick={onSave}>
+                Save
+              </button>
+            </>
+          ) : (
+            <div className="editing-mode" role="tab" onClick={toggleViewMode}>
+              <IconEdit className="cursor-pointer" size={20} strokeWidth={1.5} />
+            </div>
+          )}
+        </div>
+      </div>
+      {isEditing ? (
+        <CodeEditor
+          theme={displayedTheme}
+          value={localDocs}
+          onEdit={onEdit}
+          onSave={onSave}
+          mode="markdown"
+          font={get(preferences, 'font.codeFont', 'default')}
+          fontSize={get(preferences, 'font.codeFontSize')}
+        />
+      ) : (
+        <div className="h-full overflow-auto pl-1">
+          <div className="h-[1px] min-h-[500px]">
+            {
+              localDocs?.length > 0
+                ? <Markdown onDoubleClick={toggleViewMode} content={localDocs} />
+                : <Markdown onDoubleClick={toggleViewMode} content={workspaceDocumentationPlaceholder} />
+            }
+          </div>
+        </div>
+      )}
+    </StyledWrapper>
+  );
+};
+
+export default WorkspaceDocs;
+
+const workspaceDocumentationPlaceholder = `
+# Welcome to your Workspace Documentation
+
+This is your workspace documentation area where you can document your entire project, team guidelines, and shared resources.
+
+## What to Document Here
+
+### Project Overview
+- Project goals and objectives
+- Architecture overview
+- Key stakeholders and team members
+- Project timeline and milestones
+
+### Development Guidelines
+- Coding standards and conventions
+- Git workflow and branching strategy
+- Code review process
+- Testing guidelines
+
+### API Documentation
+- Authentication methods
+- Base URLs and environments
+- Common headers and parameters
+- Error handling standards
+
+### Team Resources
+- Useful links and references
+- Development environment setup
+- Deployment procedures
+- Troubleshooting guides
+
+## Markdown Support
+
+This documentation supports full Markdown formatting:
+
+- **Bold** and *italic* text
+- \`inline code\` and code blocks
+- Lists and tables
+- [Links](https://usebruno.com) and images
+- Headers and sections
+
+**Tip:** Double-click anywhere in this area to start editing!
+`;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/CopyEnvironment/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/CopyEnvironment/index.js
new file mode 100644
index 000000000..cb967a34e
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/CopyEnvironment/index.js
@@ -0,0 +1,78 @@
+import Modal from 'components/Modal/index';
+import Portal from 'components/Portal/index';
+import { useFormik } from 'formik';
+import { copyGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+import { useEffect, useRef } from 'react';
+import toast from 'react-hot-toast';
+import { useDispatch } from 'react-redux';
+import * as Yup from 'yup';
+
+const CopyEnvironment = ({ environment, onClose }) => {
+  const dispatch = useDispatch();
+  const inputRef = useRef();
+  const formik = useFormik({
+    enableReinitialize: true,
+    initialValues: {
+      name: environment.name + ' - Copy'
+    },
+    validationSchema: Yup.object({
+      name: Yup.string()
+        .min(1, 'must be at least 1 character')
+        .max(50, 'must be 50 characters or less')
+        .required('name is required')
+    }),
+    onSubmit: (values) => {
+      dispatch(copyGlobalEnvironment({ name: values.name, environmentUid: environment.uid }))
+        .then(() => {
+          toast.success('Environment created!');
+          onClose();
+        })
+        .catch((error) => {
+          toast.error('An error occurred while creating the environment');
+          console.error(error);
+        });
+    }
+  });
+
+  useEffect(() => {
+    if (inputRef && inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [inputRef]);
+
+  const onSubmit = () => {
+    formik.handleSubmit();
+  };
+
+  return (
+    <Portal>
+      <Modal size="sm" title="Copy Environment" confirmText="Copy" handleConfirm={onSubmit} handleCancel={onClose}>
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
+          <div>
+            <label htmlFor="environment-name" className="block font-semibold">
+              New Environment Name
+            </label>
+            <input
+              id="environment-name"
+              type="text"
+              name="name"
+              ref={inputRef}
+              className="block textbox mt-2 w-full"
+              autoComplete="off"
+              autoCorrect="off"
+              autoCapitalize="off"
+              spellCheck="false"
+              onChange={formik.handleChange}
+              value={formik.values.name || ''}
+            />
+            {formik.touched.name && formik.errors.name ? (
+              <div className="text-red-500">{formik.errors.name}</div>
+            ) : null}
+          </div>
+        </form>
+      </Modal>
+    </Portal>
+  );
+};
+
+export default CopyEnvironment;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/CreateEnvironment/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/CreateEnvironment/index.js
new file mode 100644
index 000000000..7899c807a
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/CreateEnvironment/index.js
@@ -0,0 +1,100 @@
+import React, { useEffect, useRef } from 'react';
+import toast from 'react-hot-toast';
+import { useFormik } from 'formik';
+import * as Yup from 'yup';
+import { useDispatch, useSelector } from 'react-redux';
+import Portal from 'components/Portal';
+import Modal from 'components/Modal';
+import { addGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+import { validateName, validateNameError } from 'utils/common/regex';
+
+const CreateEnvironment = ({ onClose, onEnvironmentCreated }) => {
+  const globalEnvs = useSelector((state) => state?.globalEnvironments?.globalEnvironments);
+
+  const validateEnvironmentName = (name) => {
+    const trimmedName = name?.toLowerCase().trim();
+    return (globalEnvs || []).every((env) => env?.name?.toLowerCase().trim() !== trimmedName);
+  };
+
+  const dispatch = useDispatch();
+  const inputRef = useRef();
+  const formik = useFormik({
+    enableReinitialize: true,
+    initialValues: {
+      name: ''
+    },
+    validationSchema: Yup.object({
+      name: Yup.string()
+        .min(1, 'Must be at least 1 character')
+        .max(255, 'Must be 255 characters or less')
+        .test('is-valid-filename', function (value) {
+          const isValid = validateName(value);
+          return isValid ? true : this.createError({ message: validateNameError(value) });
+        })
+        .required('Name is required')
+        .test('duplicate-name', 'Environment already exists', validateEnvironmentName)
+    }),
+    onSubmit: (values) => {
+      dispatch(addGlobalEnvironment({ name: values.name }))
+        .then(() => {
+          toast.success('Environment created!');
+          onClose();
+          // Call the callback if provided
+          if (onEnvironmentCreated) {
+            onEnvironmentCreated();
+          }
+        })
+        .catch(() => toast.error('An error occurred while creating the environment'));
+    }
+  });
+
+  useEffect(() => {
+    if (inputRef && inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [inputRef]);
+
+  const onSubmit = () => {
+    formik.handleSubmit();
+  };
+
+  return (
+    <Portal>
+      <Modal
+        size="sm"
+        title="Create Environment"
+        confirmText="Create"
+        handleConfirm={onSubmit}
+        handleCancel={onClose}
+      >
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
+          <div>
+            <label htmlFor="name" className="block font-semibold">
+              Environment Name
+            </label>
+            <div className="flex items-center mt-2">
+              <input
+                id="environment-name"
+                type="text"
+                name="name"
+                ref={inputRef}
+                className="block textbox w-full"
+                autoComplete="off"
+                autoCorrect="off"
+                autoCapitalize="off"
+                spellCheck="false"
+                onChange={formik.handleChange}
+                value={formik.values.name || ''}
+              />
+            </div>
+            {formik.touched.name && formik.errors.name ? (
+              <div className="text-red-500">{formik.errors.name}</div>
+            ) : null}
+          </div>
+        </form>
+      </Modal>
+    </Portal>
+  );
+};
+
+export default CreateEnvironment;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/DeleteEnvironment/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/DeleteEnvironment/StyledWrapper.js
new file mode 100644
index 000000000..48b874214
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/DeleteEnvironment/StyledWrapper.js
@@ -0,0 +1,15 @@
+import styled from 'styled-components';
+
+const Wrapper = styled.div`
+  button.submit {
+    color: white;
+    background-color: var(--color-background-danger) !important;
+    border: inherit !important;
+
+    &:hover {
+      border: inherit !important;
+    }
+  }
+`;
+
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/DeleteEnvironment/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/DeleteEnvironment/index.js
new file mode 100644
index 000000000..766215d66
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/DeleteEnvironment/index.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import Portal from 'components/Portal/index';
+import toast from 'react-hot-toast';
+import Modal from 'components/Modal/index';
+import { useDispatch } from 'react-redux';
+import StyledWrapper from './StyledWrapper';
+import { deleteGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+
+const DeleteEnvironment = ({ onClose, environment }) => {
+  const dispatch = useDispatch();
+  const onConfirm = () => {
+    dispatch(deleteGlobalEnvironment({ environmentUid: environment.uid }))
+      .then(() => {
+        toast.success('Environment deleted successfully');
+        onClose();
+      })
+      .catch(() => toast.error('An error occurred while deleting the environment'));
+  };
+
+  return (
+    <Portal>
+      <StyledWrapper>
+        <Modal
+          size="sm"
+          title="Delete Environment"
+          confirmText="Delete"
+          handleConfirm={onConfirm}
+          handleCancel={onClose}
+        >
+          Are you sure you want to delete <span className="font-semibold">{environment.name}</span> ?
+        </Modal>
+      </StyledWrapper>
+    </Portal>
+  );
+};
+
+export default DeleteEnvironment;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/ConfirmSwitchEnv.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/ConfirmSwitchEnv.js
new file mode 100644
index 000000000..82bc985bf
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/ConfirmSwitchEnv.js
@@ -0,0 +1,41 @@
+import React from 'react';
+import { IconAlertTriangle } from '@tabler/icons';
+import Modal from 'components/Modal';
+import { createPortal } from 'react-dom';
+
+const ConfirmSwitchEnv = ({ onCancel }) => {
+  const modalContent = (
+    <Modal
+      size="md"
+      title="Unsaved changes"
+      disableEscapeKey={true}
+      disableCloseOnOutsideClick={true}
+      closeModalFadeTimeout={150}
+      handleCancel={onCancel}
+      onClick={(e) => {
+        e.stopPropagation();
+        e.preventDefault();
+      }}
+      hideFooter={true}
+    >
+      <div className="flex items-center font-normal">
+        <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
+        <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+      </div>
+      <div className="font-normal mt-4">You have unsaved changes in this environment.</div>
+
+      <div className="flex justify-between mt-6">
+        <div>
+          <button className="btn btn-sm btn-danger" onClick={onCancel}>
+            Close
+          </button>
+        </div>
+        <div></div>
+      </div>
+    </Modal>
+  );
+
+  return createPortal(modalContent, document.body);
+};
+
+export default ConfirmSwitchEnv;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
new file mode 100644
index 000000000..88d57a40f
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/StyledWrapper.js
@@ -0,0 +1,195 @@
+import styled from 'styled-components';
+
+const Wrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  overflow: hidden;
+  
+  .table-container {
+    overflow-y: auto;
+    border-radius: 8px;
+    border: ${(props) => props.theme.workspace.environments.indentBorder};
+  }
+
+  table {
+    width: 100%;
+    border-collapse: collapse;
+    table-layout: fixed;
+    font-size: 12px;
+
+    thead,
+    td {
+      padding: 4px 12px;
+
+      &:nth-child(1),
+      &:nth-child(4) {
+        width: 80px;
+      }
+      &:nth-child(5) {
+        width: 60px;
+      }
+
+      &:nth-child(2) {
+        width: 30%;
+      }
+    }
+
+    thead {
+      color: ${(props) => props.theme.colors.text.muted};
+      background: ${(props) => props.theme.sidebar.bg};
+      font-size: 11px;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 0.3px;
+      user-select: none;
+      
+      td {
+        padding: 8px 10px;
+        border-bottom: ${(props) => props.theme.workspace.environments.indentBorder};
+        border-right: ${(props) => props.theme.workspace.environments.indentBorder};
+        font-weight: 600;
+        
+        &:last-child {
+          border-right: none;
+        }
+      }
+    }
+    
+    tbody {
+      tr {
+        transition: background 0.1s ease;
+        
+        &:hover {
+          background: ${(props) => props.theme.sidebar.bg};
+        }
+        
+        &:last-child td {
+          border-bottom: none;
+        }
+        
+        td {
+          border-bottom: ${(props) => props.theme.workspace.environments.indentBorder};
+          border-right: ${(props) => props.theme.workspace.environments.indentBorder};
+          
+          &:last-child {
+            border-right: none;
+          }
+        }
+      }
+    }
+  }
+
+  .btn-add-param {
+    font-size: 12px;
+    color: ${(props) => props.theme.textLink};
+    font-weight: 500;
+    padding: 7px 14px;
+    cursor: pointer;
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    border-radius: 6px;
+    border: ${(props) => props.theme.sidebar.collection.item.indentBorder};
+    background: transparent;
+    transition: all 0.15s ease;
+    
+    &:hover {
+      background: ${(props) => props.theme.listItem.hoverBg};
+      border-color: ${(props) => props.theme.textLink};
+    }
+  }
+
+  .tooltip-mod {
+    font-size: 11px !important;
+    max-width: 200px !important;
+  }
+
+  input[type='text'] {
+    width: 100%;
+    border: 1px solid transparent;
+    outline: none !important;
+    background-color: transparent;
+    color: ${(props) => props.theme.text};
+    padding: 5px 8px;
+    font-size: 12px;
+    border-radius: 4px;
+    transition: all 0.15s ease;
+
+    &:focus {
+      outline: none !important;
+    }
+  }
+
+  input[type='checkbox'] {
+    cursor: pointer;
+    width: 14px;
+    height: 14px;
+    accent-color: ${(props) => props.theme.workspace.accent};
+  }
+  
+  button {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 4px;
+    color: ${(props) => props.theme.colors.text.muted};
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    border-radius: 4px;
+    transition: color 0.15s ease, background 0.15s ease;
+  }
+  
+  .button-container {
+    padding: 12px 0;
+    background: ${(props) => props.theme.bg};
+    flex-shrink: 0;
+    display: flex;
+    gap: 8px;
+  }
+  
+  .submit {
+    padding: 7px 16px;
+    font-size: 12px;
+    font-weight: 500;
+    border-radius: 6px;
+    border: none;
+    background: ${(props) => props.theme.workspace.accent};
+    color: ${(props) => props.theme.bg};
+    cursor: pointer;
+    transition: opacity 0.15s ease;
+    
+    &:hover {
+      opacity: 0.9;
+    }
+  }
+
+  .reset {
+    background: transparent;
+    padding: 6px 16px;
+    border: 1px solid ${(props) => props.theme.workspace.accent};
+    color: ${(props) => props.theme.workspace.accent};
+    &:hover {
+      opacity: 0.9;
+    }
+  }
+  
+  .discard {
+    padding: 7px 16px;
+    font-size: 12px;
+    font-weight: 500;
+    border-radius: 6px;
+    background: transparent;
+    color: ${(props) => props.theme.text};
+    border: ${(props) => props.theme.sidebar.collection.item.indentBorder};
+    cursor: pointer;
+    transition: all 0.15s ease;
+    
+    &:hover {
+      background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+    }
+  }
+`;
+
+export default Wrapper;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js
new file mode 100644
index 000000000..e173b765c
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/EnvironmentVariables/index.js
@@ -0,0 +1,344 @@
+import React from 'react';
+import cloneDeep from 'lodash/cloneDeep';
+import { IconTrash, IconAlertCircle, IconInfoCircle } from '@tabler/icons';
+import { useTheme } from 'providers/Theme';
+import { useDispatch, useSelector } from 'react-redux';
+import MultiLineEditor from 'components/MultiLineEditor/index';
+import StyledWrapper from './StyledWrapper';
+import { uuid } from 'utils/common';
+import { useFormik } from 'formik';
+import * as Yup from 'yup';
+import { variableNameRegex } from 'utils/common/regex';
+import toast from 'react-hot-toast';
+import { saveGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+import { Tooltip } from 'react-tooltip';
+import { getGlobalEnvironmentVariables } from 'utils/collections';
+
+const EnvironmentVariables = ({ environment, setIsModified, originalEnvironmentVariables, collection }) => {
+  const dispatch = useDispatch();
+  const { storedTheme } = useTheme();
+  const { globalEnvironments, activeGlobalEnvironmentUid } = useSelector((state) => state.globalEnvironments);
+
+  let _collection = collection ? cloneDeep(collection) : {};
+
+  const globalEnvironmentVariables = getGlobalEnvironmentVariables({ globalEnvironments, activeGlobalEnvironmentUid });
+  if (_collection) {
+    _collection.globalEnvironmentVariables = globalEnvironmentVariables;
+  }
+
+  const initialValues = React.useMemo(() => {
+    const vars = environment.variables || [];
+    return [
+      ...vars,
+      {
+        uid: uuid(),
+        name: '',
+        value: '',
+        type: 'text',
+        secret: false,
+        enabled: true
+      }
+    ];
+  }, [environment.uid, environment.variables]);
+
+  const formik = useFormik({
+    enableReinitialize: true,
+    initialValues: initialValues,
+    validationSchema: Yup.array().of(Yup.object({
+      enabled: Yup.boolean(),
+      name: Yup.string()
+        .when('$isLastRow', {
+          is: true,
+          then: (schema) => schema.optional(),
+          otherwise: (schema) => schema
+            .required('Name cannot be empty')
+            .matches(variableNameRegex,
+              'Name contains invalid characters. Must only contain alphanumeric characters, "-", "_", "." and cannot start with a digit.')
+            .trim()
+        }),
+      secret: Yup.boolean(),
+      type: Yup.string(),
+      uid: Yup.string(),
+      value: Yup.mixed().nullable()
+    })),
+    validate: (values) => {
+      const errors = {};
+      values.forEach((variable, index) => {
+        const isLastRow = index === values.length - 1;
+        const isEmptyRow = !variable.name || variable.name.trim() === '';
+
+        // Skip validation for the last empty row
+        if (isLastRow && isEmptyRow) {
+          return;
+        }
+
+        // Validate name for non-empty rows
+        if (!variable.name || variable.name.trim() === '') {
+          if (!errors[index]) errors[index] = {};
+          errors[index].name = 'Name cannot be empty';
+        } else if (!variableNameRegex.test(variable.name)) {
+          if (!errors[index]) errors[index] = {};
+          errors[index].name = 'Name contains invalid characters. Must only contain alphanumeric characters, "-", "_", "." and cannot start with a digit.';
+        }
+      });
+      return Object.keys(errors).length > 0 ? errors : {};
+    },
+    onSubmit: () => {}
+  });
+
+  React.useEffect(() => {
+    const currentValues = formik.values.filter((variable) => variable.name && variable.name.trim() !== '');
+    const savedValues = environment.variables || [];
+
+    const hasActualChanges = JSON.stringify(currentValues) !== JSON.stringify(savedValues);
+
+    setIsModified(hasActualChanges);
+  }, [formik.values, environment.variables, setIsModified]);
+
+  const ErrorMessage = ({ name, index }) => {
+    const meta = formik.getFieldMeta(name);
+    const id = `error-${name}-${index}`;
+
+    // Don't show error for the last empty row
+    const isLastRow = index === formik.values.length - 1;
+    const variable = formik.values[index];
+    const isEmptyRow = !variable?.name || variable.name.trim() === '';
+
+    if (isLastRow && isEmptyRow) {
+      return null;
+    }
+
+    if (!meta.error || !meta.touched) {
+      return null;
+    }
+    return (
+      <span>
+        <IconAlertCircle id={id} className="text-red-600 cursor-pointer" size={20} />
+        <Tooltip className="tooltip-mod" anchorId={id} html={meta.error || ''} />
+      </span>
+    );
+  };
+
+  const handleRemoveVar = (id) => {
+    const filteredValues = formik.values.filter((variable) => variable.uid !== id);
+
+    const lastRow = formik.values[formik.values.length - 1];
+    const isLastEmptyRow = lastRow.uid === id && (!lastRow.name || lastRow.name.trim() === '');
+
+    if (isLastEmptyRow) {
+      return;
+    }
+
+    const hasEmptyLastRow = filteredValues.length > 0
+      && (!filteredValues[filteredValues.length - 1].name
+        || filteredValues[filteredValues.length - 1].name.trim() === '');
+
+    if (!hasEmptyLastRow) {
+      filteredValues.push({
+        uid: uuid(),
+        name: '',
+        value: '',
+        type: 'text',
+        secret: false,
+        enabled: true
+      });
+    }
+
+    formik.setValues(filteredValues);
+  };
+
+  const handleNameChange = (index, e) => {
+    formik.handleChange(e);
+    const isLastRow = index === formik.values.length - 1;
+
+    // If typing in the last row, add a new empty row
+    if (isLastRow) {
+      const newVariable = {
+        uid: uuid(),
+        name: '',
+        value: '',
+        type: 'text',
+        secret: false,
+        enabled: true
+      };
+      // Use setTimeout to ensure the change is processed first
+      setTimeout(() => {
+        formik.setFieldValue(formik.values.length, newVariable, false);
+      }, 0);
+    }
+  };
+
+  const handleSave = () => {
+    const variablesToSave = formik.values.filter((variable) => variable.name && variable.name.trim() !== '');
+
+    const hasValidationErrors = variablesToSave.some((variable) => {
+      if (!variable.name || variable.name.trim() === '') {
+        return true;
+      }
+      if (!variableNameRegex.test(variable.name)) {
+        return true;
+      }
+      return false;
+    });
+
+    if (hasValidationErrors) {
+      toast.error('Please fix validation errors before saving');
+      return;
+    }
+
+    dispatch(saveGlobalEnvironment({ environmentUid: environment.uid, variables: cloneDeep(variablesToSave) }))
+      .then(() => {
+        toast.success('Changes saved successfully');
+        const newValues = [
+          ...variablesToSave,
+          {
+            uid: uuid(),
+            name: '',
+            value: '',
+            type: 'text',
+            secret: false,
+            enabled: true
+          }
+        ];
+        formik.resetForm({ values: newValues });
+        setIsModified(false);
+      })
+      .catch((error) => {
+        console.error(error);
+        toast.error('An error occurred while saving the changes');
+      });
+  };
+
+  const handleReset = () => {
+    const originalVars = environment.variables || [];
+    const resetValues = [
+      ...originalVars,
+      {
+        uid: uuid(),
+        name: '',
+        value: '',
+        type: 'text',
+        secret: false,
+        enabled: true
+      }
+    ];
+    formik.resetForm({ values: resetValues });
+  };
+
+  return (
+    <StyledWrapper>
+      <div className="table-container">
+        <table>
+          <thead>
+            <tr>
+              <td className="text-center">Enabled</td>
+              <td>Name</td>
+              <td>Value</td>
+              <td className="text-center">Secret</td>
+              <td></td>
+            </tr>
+          </thead>
+          <tbody>
+            {formik.values.map((variable, index) => {
+              const isLastRow = index === formik.values.length - 1;
+              const isEmptyRow = !variable.name || variable.name.trim() === '';
+              const isLastEmptyRow = isLastRow && isEmptyRow;
+
+              return (
+                <tr key={variable.uid}>
+                  <td className="text-center">
+                    {!isLastEmptyRow && (
+                      <input
+                        type="checkbox"
+                        className="mousetrap"
+                        name={`${index}.enabled`}
+                        checked={variable.enabled}
+                        onChange={formik.handleChange}
+                      />
+                    )}
+                  </td>
+                  <td>
+                    <div className="flex items-center">
+                      <input
+                        type="text"
+                        autoComplete="off"
+                        autoCorrect="off"
+                        autoCapitalize="off"
+                        spellCheck="false"
+                        className="mousetrap"
+                        id={`${index}.name`}
+                        name={`${index}.name`}
+                        value={variable.name}
+                        placeholder={isLastEmptyRow ? 'Name' : ''}
+                        onChange={(e) => handleNameChange(index, e)}
+                      />
+                      <ErrorMessage name={`${index}.name`} index={index} />
+                    </div>
+                  </td>
+                  <td className="flex flex-row flex-nowrap items-center">
+                    <div className="overflow-hidden grow w-full relative">
+                      <MultiLineEditor
+                        theme={storedTheme}
+                        collection={_collection}
+                        name={`${index}.value`}
+                        value={variable.value}
+                        placeholder={isLastEmptyRow ? 'Value' : ''}
+                        isSecret={variable.secret}
+                        readOnly={typeof variable.value !== 'string'}
+                        onChange={(newValue) => formik.setFieldValue(`${index}.value`, newValue, true)}
+                      />
+                    </div>
+                    {typeof variable.value !== 'string' && (
+                      <span className="ml-2 flex items-center">
+                        <IconInfoCircle
+                          id={`${variable.uid}-disabled-info-icon`}
+                          className="text-muted"
+                          size={16}
+                        />
+                        <Tooltip
+                          anchorId={`${variable.uid}-disabled-info-icon`}
+                          content="Non-string values set via scripts are read-only and can only be updated through scripts."
+                          place="top"
+                        />
+                      </span>
+                    )}
+                  </td>
+                  <td className="text-center">
+                    {!isLastEmptyRow && (
+                      <input
+                        type="checkbox"
+                        className="mousetrap"
+                        name={`${index}.secret`}
+                        checked={variable.secret}
+                        onChange={formik.handleChange}
+                      />
+                    )}
+                  </td>
+                  <td>
+                    {!isLastEmptyRow && (
+                      <button onClick={() => handleRemoveVar(variable.uid)}>
+                        <IconTrash strokeWidth={1.5} size={18} />
+                      </button>
+                    )}
+                  </td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
+      </div>
+
+      <div className="button-container">
+        <div className="flex items-center">
+          <button type="button" className="submit" onClick={handleSave} data-testid="save-env">
+            Save
+          </button>
+          <button type="button" className="submit reset ml-2" onClick={handleReset} data-testid="reset-env">
+            Reset
+          </button>
+        </div>
+      </div>
+    </StyledWrapper>
+  );
+};
+export default EnvironmentVariables;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/index.js
new file mode 100644
index 000000000..230457af6
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/EnvironmentDetails/index.js
@@ -0,0 +1,316 @@
+import { IconCopy, IconEdit, IconTrash, IconCheck, IconX } from '@tabler/icons';
+import { useState, useRef } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { renameGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+import { validateName, validateNameError } from 'utils/common/regex';
+import toast from 'react-hot-toast';
+import styled from 'styled-components';
+import CopyEnvironment from '../../CopyEnvironment';
+import DeleteEnvironment from '../../DeleteEnvironment';
+import EnvironmentVariables from './EnvironmentVariables';
+
+const StyledWrapper = styled.div`
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  background: ${(props) => props.theme.bg};
+
+  .header {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px 20px 12px 20px;
+    flex-shrink: 0;
+    
+    .title {
+      font-size: 15px;
+      font-weight: 600;
+      color: ${(props) => props.theme.text};
+      margin: 0;
+    }
+    
+    .title-container {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      flex: 1;
+      
+      &.renaming {
+        .title-input {
+          flex: 1;
+          background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+          outline: none;
+          color: ${(props) => props.theme.text};
+          font-size: 15px;
+          font-weight: 600;
+          padding: 4px 8px;
+          border-radius: 5px;
+        }
+        
+        .inline-actions {
+          display: flex;
+          gap: 2px;
+        }
+        
+        .inline-action-btn {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 26px;
+          height: 26px;
+          padding: 0;
+          background: transparent;
+          border: none;
+          border-radius: 4px;
+          cursor: pointer;
+          transition: all 0.15s ease;
+          
+          &.save {
+            color: ${(props) => props.theme.textLink};
+            
+            &:hover {
+              background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+            }
+          }
+          
+          &.cancel {
+            color: ${(props) => props.theme.colors.text.muted};
+            
+            &:hover {
+              background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+              color: ${(props) => props.theme.text};
+            }
+          }
+        }
+      }
+    }
+    
+    .title-error {
+      position: absolute;
+      top: 100%;
+      left: 0;
+      margin-top: 4px;
+      padding: 4px 8px;
+      font-size: 11px;
+      color: ${(props) => props.theme.colors.text.danger};
+      background: ${(props) => `${props.theme.colors.text.danger}15`};
+      border-radius: 4px;
+      white-space: nowrap;
+    }
+    
+    .actions {
+      display: flex;
+      gap: 2px;
+      
+      button {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        width: 28px;
+        height: 28px;
+        padding: 0;
+        color: ${(props) => props.theme.colors.text.muted};
+        background: transparent;
+        border: none;
+        border-radius: 5px;
+        cursor: pointer;
+        transition: all 0.15s ease;
+        
+        &:hover {
+          background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+          color: ${(props) => props.theme.text};
+        }
+        
+        &:last-child:hover {
+          color: ${(props) => props.theme.colors.text.danger};
+        }
+      }
+    }
+  }
+  
+  .content {
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    padding: 0 20px 20px 20px;
+  }
+`;
+
+const EnvironmentDetails = ({ environment, setIsModified, collection }) => {
+  const dispatch = useDispatch();
+  const globalEnvs = useSelector((state) => state?.globalEnvironments?.globalEnvironments);
+
+  const [openDeleteModal, setOpenDeleteModal] = useState(false);
+  const [openCopyModal, setOpenCopyModal] = useState(false);
+  const [isRenaming, setIsRenaming] = useState(false);
+  const [newName, setNewName] = useState('');
+  const [nameError, setNameError] = useState('');
+  const inputRef = useRef(null);
+
+  const validateEnvironmentName = (name) => {
+    if (!name || name.trim() === '') {
+      return 'Name is required';
+    }
+
+    if (name.length < 1) {
+      return 'Must be at least 1 character';
+    }
+
+    if (name.length > 255) {
+      return 'Must be 255 characters or less';
+    }
+
+    if (!validateName(name)) {
+      return validateNameError(name);
+    }
+
+    const trimmedName = name.toLowerCase().trim();
+    const isDuplicate = (globalEnvs || []).some((env) =>
+      env?.uid !== environment.uid && env?.name?.toLowerCase().trim() === trimmedName);
+    if (isDuplicate) {
+      return 'Environment already exists';
+    }
+
+    return null;
+  };
+
+  const handleRenameClick = () => {
+    setIsRenaming(true);
+    setNewName(environment.name);
+    setNameError('');
+    setTimeout(() => {
+      inputRef.current?.focus();
+      inputRef.current?.select();
+    }, 50);
+  };
+
+  const handleSaveRename = () => {
+    const error = validateEnvironmentName(newName);
+    if (error) {
+      setNameError(error);
+      return;
+    }
+
+    dispatch(renameGlobalEnvironment({ name: newName, environmentUid: environment.uid }))
+      .then(() => {
+        toast.success('Environment renamed!');
+        setIsRenaming(false);
+        setNewName('');
+        setNameError('');
+      })
+      .catch(() => {
+        toast.error('An error occurred while renaming the environment');
+      });
+  };
+
+  const handleCancelRename = () => {
+    setIsRenaming(false);
+    setNewName('');
+    setNameError('');
+  };
+
+  const handleNameChange = (e) => {
+    setNewName(e.target.value);
+    if (nameError) {
+      setNameError('');
+    }
+  };
+
+  const handleNameBlur = () => {
+    if (newName.trim() === '') {
+      handleCancelRename();
+    } else {
+      const error = validateEnvironmentName(newName);
+      if (error) {
+        setNameError(error);
+      }
+    }
+  };
+
+  const handleNameKeyDown = (e) => {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      handleSaveRename();
+    } else if (e.key === 'Escape') {
+      e.preventDefault();
+      handleCancelRename();
+    }
+  };
+
+  return (
+    <StyledWrapper>
+      {openDeleteModal && (
+        <DeleteEnvironment
+          onClose={() => setOpenDeleteModal(false)}
+          environment={environment}
+        />
+      )}
+      {openCopyModal && (
+        <CopyEnvironment onClose={() => setOpenCopyModal(false)} environment={environment} />
+      )}
+
+      <div className="header">
+        <div className={`title-container ${isRenaming ? 'renaming' : ''}`}>
+          {isRenaming ? (
+            <>
+              <input
+                ref={inputRef}
+                type="text"
+                className="title-input"
+                value={newName}
+                onChange={handleNameChange}
+                onBlur={handleNameBlur}
+                onKeyDown={handleNameKeyDown}
+                autoComplete="off"
+                autoCorrect="off"
+                autoCapitalize="off"
+                spellCheck="false"
+              />
+              <div className="inline-actions">
+                <button
+                  className="inline-action-btn save"
+                  onClick={handleSaveRename}
+                  onMouseDown={(e) => e.preventDefault()}
+                  title="Save"
+                >
+                  <IconCheck size={14} strokeWidth={2} />
+                </button>
+                <button
+                  className="inline-action-btn cancel"
+                  onClick={handleCancelRename}
+                  onMouseDown={(e) => e.preventDefault()}
+                  title="Cancel"
+                >
+                  <IconX size={14} strokeWidth={2} />
+                </button>
+              </div>
+            </>
+          ) : (
+            <h2 className="title">{environment.name}</h2>
+          )}
+        </div>
+        {nameError && isRenaming && <div className="title-error">{nameError}</div>}
+        <div className="actions">
+          <button onClick={handleRenameClick} title="Rename">
+            <IconEdit size={15} strokeWidth={1.5} />
+          </button>
+          <button onClick={() => setOpenCopyModal(true)} title="Copy">
+            <IconCopy size={15} strokeWidth={1.5} />
+          </button>
+          <button onClick={() => setOpenDeleteModal(true)} title="Delete">
+            <IconTrash size={15} strokeWidth={1.5} />
+          </button>
+        </div>
+      </div>
+
+      <div className="content">
+        <EnvironmentVariables environment={environment} setIsModified={setIsModified} collection={collection} />
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default EnvironmentDetails;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/StyledWrapper.js
new file mode 100644
index 000000000..0f60f349a
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/StyledWrapper.js
@@ -0,0 +1,280 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  display: flex;
+  height: 100%;
+  background-color: ${(props) => props.theme.bg};
+  position: relative;
+
+  .environments-container {
+    display: flex;
+    height: 100%;
+    width: 100%;
+  }
+
+  .confirm-switch-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 10;
+    background: ${(props) => props.theme.bg};
+    padding: 12px;
+    border-bottom: 1px solid ${(props) => props.theme.sidebar.collection.item.indentBorder};
+  }
+
+  /* Left Sidebar */
+  .sidebar {
+    width: 240px;
+    min-width: 240px;
+    border-right: 1px solid ${(props) => props.theme.sidebar.collection.item.indentBorder};
+    display: flex;
+    flex-direction: column;
+  }
+
+  .sidebar-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px 16px 12px 16px;
+    
+    .title {
+      font-size: 13px;
+      font-weight: 600;
+      color: ${(props) => props.theme.text};
+      margin: 0;
+    }
+    
+    .btn-action {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 24px;
+      height: 24px;
+      padding: 0;
+      background: transparent;
+      border: none;
+      border-radius: 4px;
+      color: ${(props) => props.theme.colors.text.muted};
+      cursor: pointer;
+      transition: all 0.15s ease;
+      
+      &:hover {
+        background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+        color: ${(props) => props.theme.text};
+      }
+    }
+  }
+
+  .search-container {
+    position: relative;
+    padding: 0 12px 12px 12px;
+    
+    .search-icon {
+      position: absolute;
+      left: 20px;
+      top: 50%;
+      transform: translateY(-100%);
+      color: ${(props) => props.theme.colors.text.muted};
+      pointer-events: none;
+    }
+    
+    .search-input {
+      width: 100%;
+      padding: 6px 8px 6px 28px;
+      font-size: 12px;
+      background: transparent;
+      border: ${(props) => props.theme.sidebar.collection.item.indentBorder};
+      border-radius: 5px;
+      color: ${(props) => props.theme.text};
+      transition: all 0.15s ease;
+      
+      &::placeholder {
+        color: ${(props) => props.theme.colors.text.muted};
+      }
+      
+      &:focus {
+        outline: none;
+      }
+    }
+  }
+
+  .environments-list {
+    flex: 1;
+    overflow-y: auto;
+    padding: 0 8px;
+  }
+
+  .environment-item {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 8px;
+    margin-bottom: 1px;
+    font-size: 13px;
+    color: ${(props) => props.theme.text};
+    cursor: pointer;
+    border-radius: 5px;
+    transition: background 0.15s ease;
+    
+    .environment-name {
+      flex: 1;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .environment-actions {
+      display: flex;
+      align-items: center;
+      opacity: 0;
+      transition: opacity 0.15s ease;
+
+      .activate-btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 4px;
+        border: none;
+        background: transparent;
+        cursor: pointer;
+        color: ${(props) => props.theme.text.muted};
+        border-radius: 3px;
+        transition: all 0.15s ease;
+
+        &:hover {
+          background: ${(props) => props.theme.workspace.button.bg};
+          color: ${(props) => props.theme.colors.text.green};
+        }
+      }
+
+      .activated-checkmark {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 4px;
+        color: ${(props) => props.theme.colors.text.green};
+        opacity: 1;
+      }
+    }
+
+    &:hover .environment-actions {
+      opacity: 1;
+    }
+
+    &.activated .environment-actions {
+      opacity: 1;
+    }
+
+    &:hover {
+      background: ${(props) => props.theme.workspace.button.bg};
+    }
+    
+    &.active {
+      background: ${(props) => props.theme.workspace.environments.activeBg};
+      color: ${(props) => props.theme.text};
+    }
+    
+    &.renaming,
+    &.creating {
+      cursor: default;
+      padding: 4px 4px 4px 8px;
+      background: ${(props) => props.theme.sidebar.collection.item.hoverBg};
+      
+      &:hover {
+        background: ${(props) => props.theme.workspace.button.bg};
+      }
+    }
+
+    .rename-container {
+      display: flex;
+      align-items: center;
+      flex: 1;
+      
+      .environment-name-input {
+        flex: 1;
+        background: transparent;
+        border: none;
+        outline: none;
+        color: ${(props) => props.theme.text};
+        font-size: 13px;
+        padding: 2px 4px;
+        
+        &::placeholder {
+          color: ${(props) => props.theme.colors.text.muted};
+        }
+      }
+      
+      .inline-actions {
+        display: flex;
+        gap: 2px;
+        margin-left: 4px;
+      }
+    }
+
+    &.creating {
+      .environment-name-input {
+        flex: 1;
+        background: transparent;
+        border: none;
+        outline: none;
+        color: ${(props) => props.theme.text};
+        font-size: 13px;
+        padding: 2px 4px;
+        
+        &::placeholder {
+          color: ${(props) => props.theme.colors.text.muted};
+        }
+      }
+      
+      .inline-actions {
+        display: flex;
+        gap: 2px;
+        margin-left: 4px;
+      }
+      
+      .inline-action-btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 22px;
+        height: 22px;
+        padding: 0;
+        background: transparent;
+        border: none;
+        border-radius: 4px;
+        cursor: pointer;
+        transition: all 0.15s ease;
+        
+        &.save {
+          color: ${(props) => props.theme.textLink};
+          
+          &:hover {
+            background: ${(props) => props.theme.listItem.hoverBg};
+          }
+        }
+        
+        &.cancel {
+          color: ${(props) => props.theme.colors.text.muted};
+          
+          &:hover {
+            background: ${(props) => props.theme.listItem.hoverBg};
+            color: ${(props) => props.theme.text};
+          }
+        }
+      }
+    }
+  }
+  
+  .env-error {
+    padding: 4px 12px;
+    margin-top: 4px;
+    font-size: 11px;
+    color: ${(props) => props.theme.colors.text.danger};
+    background: ${(props) => `${props.theme.colors.text.danger}15`};
+    border-radius: 4px;
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/index.js
new file mode 100644
index 000000000..6c7197e1a
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/EnvironmentList/index.js
@@ -0,0 +1,426 @@
+import React, { useEffect, useState, useRef } from 'react';
+import usePrevious from 'hooks/usePrevious';
+import EnvironmentDetails from './EnvironmentDetails';
+import CreateEnvironment from '../CreateEnvironment';
+import { IconDownload, IconSearch, IconPlus, IconCheck, IconX } from '@tabler/icons';
+import StyledWrapper from './StyledWrapper';
+import ConfirmSwitchEnv from './ConfirmSwitchEnv';
+import ImportEnvironment from '../ImportEnvironment';
+import { isEqual } from 'lodash';
+import { useDispatch, useSelector } from 'react-redux';
+import { addGlobalEnvironment, renameGlobalEnvironment, selectGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+import { validateName, validateNameError } from 'utils/common/regex';
+import toast from 'react-hot-toast';
+
+const EnvironmentList = ({ environments, activeEnvironmentUid, selectedEnvironment, setSelectedEnvironment, isModified, setIsModified, collection }) => {
+  const dispatch = useDispatch();
+  const globalEnvs = useSelector((state) => state?.globalEnvironments?.globalEnvironments);
+
+  const [openCreateModal, setOpenCreateModal] = useState(false);
+  const [openImportModal, setOpenImportModal] = useState(false);
+  const [searchText, setSearchText] = useState('');
+  const [isCreatingInline, setIsCreatingInline] = useState(false);
+  const [renamingEnvUid, setRenamingEnvUid] = useState(null);
+  const [newEnvName, setNewEnvName] = useState('');
+  const [envNameError, setEnvNameError] = useState('');
+  const inputRef = useRef(null);
+  const renameContainerRef = useRef(null);
+  const createContainerRef = useRef(null);
+
+  const [switchEnvConfirmClose, setSwitchEnvConfirmClose] = useState(false);
+  const [originalEnvironmentVariables, setOriginalEnvironmentVariables] = useState([]);
+
+  const envUids = environments ? environments.map((env) => env.uid) : [];
+  const prevEnvUids = usePrevious(envUids);
+
+  useEffect(() => {
+    if (!environments?.length) {
+      setSelectedEnvironment(null);
+      setOriginalEnvironmentVariables([]);
+      return;
+    }
+
+    if (selectedEnvironment) {
+      let _selectedEnvironment = environments?.find((env) => env?.uid === selectedEnvironment?.uid);
+
+      if (!_selectedEnvironment) {
+        _selectedEnvironment = environments?.find((env) => env?.name === selectedEnvironment?.name);
+      }
+
+      if (!_selectedEnvironment) {
+        _selectedEnvironment = environments?.find((env) => env.uid === activeEnvironmentUid) || environments?.[0];
+      }
+
+      const hasSelectedEnvironmentChanged = !isEqual(selectedEnvironment, _selectedEnvironment);
+      if (hasSelectedEnvironmentChanged || selectedEnvironment.uid !== _selectedEnvironment?.uid) {
+        setSelectedEnvironment(_selectedEnvironment);
+      }
+      setOriginalEnvironmentVariables(_selectedEnvironment?.variables || []);
+      return;
+    }
+
+    const environment = environments?.find((env) => env.uid === activeEnvironmentUid) || environments?.[0];
+
+    setSelectedEnvironment(environment);
+    setOriginalEnvironmentVariables(environment?.variables || []);
+  }, [environments, activeEnvironmentUid, selectedEnvironment]);
+
+  useEffect(() => {
+    if (prevEnvUids && prevEnvUids.length && envUids.length > prevEnvUids.length) {
+      const newEnv = environments.find((env) => !prevEnvUids.includes(env.uid));
+      if (newEnv) {
+        setSelectedEnvironment(newEnv);
+      }
+    }
+
+    if (prevEnvUids && prevEnvUids.length && envUids.length < prevEnvUids.length) {
+      setSelectedEnvironment(environments && environments.length ? environments[0] : null);
+    }
+  }, [envUids, environments, prevEnvUids]);
+
+  useEffect(() => {
+    if (!renamingEnvUid) return;
+
+    const handleClickOutside = (event) => {
+      if (renameContainerRef.current && !renameContainerRef.current.contains(event.target)) {
+        handleCancelRename();
+      }
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [renamingEnvUid]);
+
+  useEffect(() => {
+    if (!isCreatingInline) return;
+
+    const handleClickOutside = (event) => {
+      if (createContainerRef.current && !createContainerRef.current.contains(event.target)) {
+        handleCancelCreate();
+      }
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [isCreatingInline]);
+
+  const handleEnvironmentClick = (env) => {
+    if (!isModified) {
+      setSelectedEnvironment(env);
+    } else {
+      setSwitchEnvConfirmClose(true);
+    }
+  };
+
+  const handleEnvironmentDoubleClick = (env) => {
+    setRenamingEnvUid(env.uid);
+    setNewEnvName(env.name);
+    setEnvNameError('');
+    setTimeout(() => {
+      inputRef.current?.focus();
+      inputRef.current?.select();
+    }, 50);
+  };
+
+  const handleActivateEnvironment = (e, env) => {
+    e.stopPropagation();
+    dispatch(selectGlobalEnvironment({ environmentUid: env.uid }))
+      .then(() => {
+        toast.success(`Environment "${env.name}" activated`);
+      })
+      .catch(() => {
+        toast.error('Failed to activate environment');
+      });
+  };
+
+  if (!selectedEnvironment) {
+    return null;
+  }
+
+  const validateEnvironmentName = (name, excludeUid = null) => {
+    if (!name || name.trim() === '') {
+      return 'Name is required';
+    }
+
+    if (!validateName(name)) {
+      return validateNameError(name);
+    }
+
+    const trimmedName = name.toLowerCase().trim();
+    const isDuplicate = globalEnvs.some((env) =>
+      env?.uid !== excludeUid && env?.name?.toLowerCase().trim() === trimmedName);
+    if (isDuplicate) {
+      return 'Environment already exists';
+    }
+
+    return null;
+  };
+
+  const handleCreateEnvClick = () => {
+    if (!isModified) {
+      setIsCreatingInline(true);
+      setNewEnvName('');
+      setEnvNameError('');
+      setTimeout(() => {
+        inputRef.current?.focus();
+      }, 50);
+    } else {
+      setSwitchEnvConfirmClose(true);
+    }
+  };
+
+  const handleCancelCreate = () => {
+    setIsCreatingInline(false);
+    setNewEnvName('');
+    setEnvNameError('');
+  };
+
+  const handleSaveNewEnv = () => {
+    const error = validateEnvironmentName(newEnvName);
+    if (error) {
+      setEnvNameError(error);
+      return;
+    }
+
+    dispatch(addGlobalEnvironment({ name: newEnvName }))
+      .then(() => {
+        toast.success('Environment created!');
+        setIsCreatingInline(false);
+        setNewEnvName('');
+        setEnvNameError('');
+      })
+      .catch(() => {
+        toast.error('An error occurred while creating the environment');
+      });
+  };
+
+  const handleEnvNameChange = (e) => {
+    const value = e.target.value;
+    setNewEnvName(value);
+
+    if (envNameError) {
+      setEnvNameError('');
+    }
+  };
+
+  const handleEnvNameKeyDown = (e) => {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      if (renamingEnvUid) {
+        handleSaveRename();
+      } else {
+        handleSaveNewEnv();
+      }
+    } else if (e.key === 'Escape') {
+      e.preventDefault();
+      if (renamingEnvUid) {
+        handleCancelRename();
+      } else {
+        handleCancelCreate();
+      }
+    }
+  };
+
+  const handleSaveRename = () => {
+    const error = validateEnvironmentName(newEnvName, renamingEnvUid);
+    if (error) {
+      setEnvNameError(error);
+      return;
+    }
+
+    dispatch(renameGlobalEnvironment({ name: newEnvName, environmentUid: renamingEnvUid }))
+      .then(() => {
+        toast.success('Environment renamed!');
+        setRenamingEnvUid(null);
+        setNewEnvName('');
+        setEnvNameError('');
+      })
+      .catch(() => {
+        toast.error('An error occurred while renaming the environment');
+      });
+  };
+
+  const handleCancelRename = () => {
+    setRenamingEnvUid(null);
+    setNewEnvName('');
+    setEnvNameError('');
+  };
+
+  const handleImportClick = () => {
+    if (!isModified) {
+      setOpenImportModal(true);
+    } else {
+      setSwitchEnvConfirmClose(true);
+    }
+  };
+
+  const handleConfirmSwitch = (saveChanges) => {
+    if (!saveChanges) {
+      setSwitchEnvConfirmClose(false);
+    }
+  };
+
+  const filteredEnvironments = environments?.filter((env) =>
+    env.name.toLowerCase().includes(searchText.toLowerCase())) || [];
+
+  return (
+    <StyledWrapper>
+      {openCreateModal && <CreateEnvironment onClose={() => setOpenCreateModal(false)} />}
+      {openImportModal && <ImportEnvironment onClose={() => setOpenImportModal(false)} />}
+
+      <div className="environments-container">
+        {switchEnvConfirmClose && (
+          <div className="confirm-switch-overlay">
+            <ConfirmSwitchEnv onCancel={() => handleConfirmSwitch(false)} />
+          </div>
+        )}
+
+        {/* Left Sidebar */}
+        <div className="sidebar">
+          <div className="sidebar-header">
+            <h2 className="title">Environments</h2>
+            <div className="flex items-center gap-2">
+              <button className="btn-action" onClick={() => handleCreateEnvClick()} title="Create environment">
+                <IconPlus size={16} strokeWidth={1.5} />
+              </button>
+              <button className="btn-action" onClick={() => handleImportClick()} title="Import environment">
+                <IconDownload size={16} strokeWidth={1.5} />
+              </button>
+            </div>
+          </div>
+
+          <div className="search-container">
+            <IconSearch size={14} strokeWidth={1.5} className="search-icon" />
+            <input
+              type="text"
+              placeholder="Search environments..."
+              value={searchText}
+              onChange={(e) => setSearchText(e.target.value)}
+              className="search-input"
+            />
+          </div>
+
+          <div className="environments-list">
+            {filteredEnvironments.map((env) => (
+              <div
+                key={env.uid}
+                id={env.uid}
+                className={`environment-item ${selectedEnvironment.uid === env.uid ? 'active' : ''} ${renamingEnvUid === env.uid ? 'renaming' : ''} ${activeEnvironmentUid === env.uid ? 'activated' : ''}`}
+                onClick={() => renamingEnvUid !== env.uid && handleEnvironmentClick(env)}
+                onDoubleClick={() => handleEnvironmentDoubleClick(env)}
+              >
+                {renamingEnvUid === env.uid ? (
+                  <div className="rename-container" ref={renameContainerRef}>
+                    <input
+                      ref={inputRef}
+                      type="text"
+                      className="environment-name-input"
+                      value={newEnvName}
+                      onChange={handleEnvNameChange}
+                      onKeyDown={handleEnvNameKeyDown}
+                      autoComplete="off"
+                      autoCorrect="off"
+                      autoCapitalize="off"
+                      spellCheck="false"
+                    />
+                    <div className="inline-actions">
+                      <button
+                        className="inline-action-btn save"
+                        onClick={handleSaveRename}
+                        onMouseDown={(e) => e.preventDefault()}
+                        title="Save"
+                      >
+                        <IconCheck size={14} strokeWidth={2} />
+                      </button>
+                      <button
+                        className="inline-action-btn cancel"
+                        onClick={handleCancelRename}
+                        onMouseDown={(e) => e.preventDefault()}
+                        title="Cancel"
+                      >
+                        <IconX size={14} strokeWidth={2} />
+                      </button>
+                    </div>
+                  </div>
+                ) : (
+                  <>
+                    <span className="environment-name">{env.name}</span>
+                    <div className="environment-actions">
+                      {activeEnvironmentUid === env.uid ? (
+                        <div className="activated-checkmark" title="Active environment">
+                          <IconCheck size={16} strokeWidth={2} />
+                        </div>
+                      ) : (
+                        <button
+                          className="activate-btn"
+                          onClick={(e) => handleActivateEnvironment(e, env)}
+                          title="Activate environment"
+                        >
+                          <IconCheck size={16} strokeWidth={2} />
+                        </button>
+                      )}
+                    </div>
+                  </>
+                )}
+              </div>
+            ))}
+
+            {isCreatingInline && (
+              <div className="environment-item creating" ref={createContainerRef}>
+                <input
+                  ref={inputRef}
+                  type="text"
+                  className="environment-name-input"
+                  value={newEnvName}
+                  onChange={handleEnvNameChange}
+                  onKeyDown={handleEnvNameKeyDown}
+                  placeholder="Environment name..."
+                  autoComplete="off"
+                  autoCorrect="off"
+                  autoCapitalize="off"
+                  spellCheck="false"
+                />
+                <div className="inline-actions">
+                  <button
+                    className="inline-action-btn save"
+                    onClick={handleSaveNewEnv}
+                    onMouseDown={(e) => e.preventDefault()}
+                    title="Save"
+                  >
+                    <IconCheck size={14} strokeWidth={2} />
+                  </button>
+                  <button
+                    className="inline-action-btn cancel"
+                    onClick={handleCancelCreate}
+                    onMouseDown={(e) => e.preventDefault()}
+                    title="Cancel"
+                  >
+                    <IconX size={14} strokeWidth={2} />
+                  </button>
+                </div>
+              </div>
+            )}
+
+            {envNameError && (isCreatingInline || renamingEnvUid) && (
+              <div className="env-error">{envNameError}</div>
+            )}
+          </div>
+        </div>
+
+        {/* Right Content */}
+        <EnvironmentDetails
+          environment={selectedEnvironment}
+          setIsModified={setIsModified}
+          originalEnvironmentVariables={originalEnvironmentVariables}
+          collection={collection}
+        />
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default EnvironmentList;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/ImportEnvironment/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/ImportEnvironment/index.js
new file mode 100644
index 000000000..e4f6544d9
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/ImportEnvironment/index.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import Portal from 'components/Portal';
+import Modal from 'components/Modal';
+import toast from 'react-hot-toast';
+import { useDispatch } from 'react-redux';
+import importPostmanEnvironment from 'utils/importers/postman-environment';
+import { toastError } from 'utils/common/error';
+import { IconDatabaseImport } from '@tabler/icons';
+import { addGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+
+const ImportEnvironment = ({ onClose, onEnvironmentCreated }) => {
+  const dispatch = useDispatch();
+
+  const handleImportPostmanEnvironment = () => {
+    importPostmanEnvironment()
+      .then((environments) => {
+        const importPromises = environments
+          .filter((env) =>
+            env.name && env.name !== 'undefined')
+          .map((environment) =>
+            dispatch(addGlobalEnvironment({ name: environment.name, variables: environment.variables }))
+              .then(() => {
+                toast.success('Environment imported successfully');
+              })
+              .catch((error) => {
+                toast.error('An error occurred while importing the environment');
+                console.error(error);
+              }));
+        return Promise.all(importPromises);
+      })
+      .then(() => {
+        onClose();
+        // Call the callback if provided
+        if (onEnvironmentCreated) {
+          onEnvironmentCreated();
+        }
+      })
+      .catch((err) => toastError(err, 'Postman Import environment failed'));
+  };
+
+  return (
+    <Portal>
+      <Modal size="sm" title="Import Environment" hideFooter={true} handleConfirm={onClose} handleCancel={onClose} dataTestId="import-environment-modal">
+        <button
+          type="button"
+          onClick={handleImportPostmanEnvironment}
+          className="flex justify-center flex-col items-center w-full dark:bg-zinc-700 rounded-lg border-2 border-dashed border-zinc-300 dark:border-zinc-400 p-12 text-center hover:border-zinc-400 focus:outline-none focus:ring-2 focus:ring-amber-500 focus:ring-offset-2"
+          data-testid="import-postman-environment"
+        >
+          <IconDatabaseImport size={64} />
+          <span className="mt-2 block text-sm font-semibold">Import your Postman environments</span>
+        </button>
+      </Modal>
+    </Portal>
+  );
+};
+
+export default ImportEnvironment;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/RenameEnvironment/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/RenameEnvironment/index.js
new file mode 100644
index 000000000..7d3ae3efe
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/RenameEnvironment/index.js
@@ -0,0 +1,102 @@
+import React, { useEffect, useRef } from 'react';
+import Portal from 'components/Portal/index';
+import Modal from 'components/Modal/index';
+import toast from 'react-hot-toast';
+import { useFormik } from 'formik';
+import * as Yup from 'yup';
+import { useDispatch } from 'react-redux';
+import { renameGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+import { validateName, validateNameError } from 'utils/common/regex';
+import { useSelector } from 'react-redux';
+
+const RenameEnvironment = ({ onClose, environment }) => {
+  const dispatch = useDispatch();
+  const globalEnvs = useSelector((state) => state?.globalEnvironments?.globalEnvironments);
+  const inputRef = useRef();
+
+  const validateEnvironmentName = (name) => {
+    const trimmedName = name?.toLowerCase().trim();
+    return (globalEnvs || []).every((env) =>
+      env.uid === environment.uid || env?.name?.toLowerCase().trim() !== trimmedName);
+  };
+
+  const formik = useFormik({
+    enableReinitialize: true,
+    initialValues: {
+      name: environment.name
+    },
+    validationSchema: Yup.object({
+      name: Yup.string()
+        .min(1, 'must be at least 1 character')
+        .max(255, 'Must be 255 characters or less')
+        .test('is-valid-filename', function (value) {
+          const isValid = validateName(value);
+          return isValid ? true : this.createError({ message: validateNameError(value) });
+        })
+        .required('name is required')
+        .test('duplicate-name', 'Environment already exists', validateEnvironmentName)
+    }),
+    onSubmit: (values) => {
+      if (values.name === environment.name) {
+        return;
+      }
+      dispatch(renameGlobalEnvironment({ name: values.name, environmentUid: environment.uid }))
+        .then(() => {
+          toast.success('Environment renamed successfully');
+          onClose();
+        })
+        .catch((error) => {
+          toast.error('An error occurred while renaming the environment');
+          console.error(error);
+        });
+    }
+  });
+
+  useEffect(() => {
+    if (inputRef && inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [inputRef]);
+
+  const onSubmit = () => {
+    formik.handleSubmit();
+  };
+
+  return (
+    <Portal>
+      <Modal
+        size="sm"
+        title="Rename Environment"
+        confirmText="Rename"
+        handleConfirm={onSubmit}
+        handleCancel={onClose}
+      >
+        <form className="bruno-form" onSubmit={(e) => e.preventDefault()}>
+          <div>
+            <label htmlFor="name" className="block font-semibold">
+              Environment Name
+            </label>
+            <input
+              id="environment-name"
+              type="text"
+              name="name"
+              ref={inputRef}
+              className="block textbox mt-2 w-full"
+              autoComplete="off"
+              autoCorrect="off"
+              autoCapitalize="off"
+              spellCheck="false"
+              onChange={formik.handleChange}
+              value={formik.values.name || ''}
+            />
+            {formik.touched.name && formik.errors.name ? (
+              <div className="text-red-500">{formik.errors.name}</div>
+            ) : null}
+          </div>
+        </form>
+      </Modal>
+    </Portal>
+  );
+};
+
+export default RenameEnvironment;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/StyledWrapper.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/StyledWrapper.js
new file mode 100644
index 000000000..7931f4e94
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/StyledWrapper.js
@@ -0,0 +1,52 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: ${(props) => props.theme.bg};
+  
+  .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    flex: 1;
+    color: ${(props) => props.theme.colors.text.muted};
+    
+    svg {
+      opacity: 0.3;
+      margin-bottom: 8px;
+    }
+    
+    .title {
+      font-size: 13px;
+      font-weight: 500;
+      margin-bottom: 12px;
+      color: ${(props) => props.theme.colors.text.muted};
+    }
+    
+    .actions {
+      display: flex;
+      gap: 8px;
+    }
+  }
+  
+  .shared-button {
+    padding: 5px 10px;
+    font-size: 12px;
+    border-radius: 5px;
+    border: 1px solid ${(props) => props.theme.sidebar.collection.item.indentBorder};
+    background: ${(props) => props.theme.sidebar.bg};
+    color: ${(props) => props.theme.text};
+    cursor: pointer;
+    transition: all 0.1s ease;
+    
+    &:hover {
+      background: ${(props) => props.theme.listItem.hoverBg};
+      border-color: ${(props) => props.theme.textLink};
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/index.js b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/index.js
new file mode 100644
index 000000000..fa409e839
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/WorkspaceEnvironments/index.js
@@ -0,0 +1,76 @@
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
+import CreateEnvironment from './CreateEnvironment';
+import EnvironmentList from './EnvironmentList';
+import StyledWrapper from './StyledWrapper';
+import { IconFileAlert } from '@tabler/icons';
+import ImportEnvironment from './ImportEnvironment';
+
+export const SharedButton = ({ children, className, onClick }) => {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      className={`rounded bg-transparent px-2.5 py-2 w-fit text-xs font-semibold text-zinc-900 dark:text-zinc-50 shadow-sm ring-1 ring-inset ring-zinc-300 dark:ring-zinc-500 hover:bg-gray-50 dark:hover:bg-zinc-700
+        ${className}`}
+    >
+      {children}
+    </button>
+  );
+};
+
+const DefaultTab = ({ setTab }) => {
+  return (
+    <div className="empty-state">
+      <IconFileAlert size={48} strokeWidth={1.5} />
+      <div className="title">No Environments</div>
+      <div className="actions">
+        <button className="shared-button" onClick={() => setTab('create')}>
+          Create Environment
+        </button>
+        <button className="shared-button" onClick={() => setTab('import')}>
+          Import Environment
+        </button>
+      </div>
+    </div>
+  );
+};
+
+const WorkspaceEnvironments = ({ workspace }) => {
+  const [isModified, setIsModified] = useState(false);
+  const [selectedEnvironment, setSelectedEnvironment] = useState(null);
+  const [tab, setTab] = useState('default');
+
+  const globalEnvironments = useSelector((state) => state.globalEnvironments.globalEnvironments);
+  const activeGlobalEnvironmentUid = useSelector((state) => state.globalEnvironments.activeGlobalEnvironmentUid);
+
+  if (!globalEnvironments || !globalEnvironments.length) {
+    return (
+      <StyledWrapper>
+        {tab === 'create' ? (
+          <CreateEnvironment onClose={() => setTab('default')} />
+        ) : tab === 'import' ? (
+          <ImportEnvironment onClose={() => setTab('default')} />
+        ) : (
+          <DefaultTab setTab={setTab} />
+        )}
+      </StyledWrapper>
+    );
+  }
+
+  return (
+    <StyledWrapper>
+      <EnvironmentList
+        environments={globalEnvironments}
+        activeEnvironmentUid={activeGlobalEnvironmentUid}
+        selectedEnvironment={selectedEnvironment}
+        setSelectedEnvironment={setSelectedEnvironment}
+        isModified={isModified}
+        setIsModified={setIsModified}
+        collection={null}
+      />
+    </StyledWrapper>
+  );
+};
+
+export default WorkspaceEnvironments;
diff --git a/packages/bruno-app/src/components/WorkspaceHome/index.js b/packages/bruno-app/src/components/WorkspaceHome/index.js
new file mode 100644
index 000000000..7f0c331c7
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceHome/index.js
@@ -0,0 +1,351 @@
+import React, { useEffect, useState, useRef } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { IconCategory, IconPlus, IconFolders, IconFileImport, IconDots, IconEdit, IconX, IconCheck, IconFolder } from '@tabler/icons';
+import { importCollectionInWorkspace, renameWorkspaceAction } from 'providers/ReduxStore/slices/workspaces/actions';
+import { showInFolder, openCollection } from 'providers/ReduxStore/slices/collections/actions';
+import toast from 'react-hot-toast';
+import CreateCollection from 'components/Sidebar/CreateCollection';
+import ImportCollection from 'components/Sidebar/ImportCollection';
+import CloseWorkspace from 'components/Sidebar/TitleBar/CloseWorkspace';
+import WorkspaceCollections from './WorkspaceCollections';
+import WorkspaceDocs from './WorkspaceDocs';
+import WorkspaceEnvironments from './WorkspaceEnvironments';
+import StyledWrapper from './StyledWrapper';
+import Dropdown from 'components/Dropdown';
+
+const WorkspaceHome = () => {
+  const dispatch = useDispatch();
+  const { workspaces, activeWorkspaceUid } = useSelector((state) => state.workspaces);
+  const [activeTab, setActiveTab] = useState('collections');
+
+  const [createCollectionModalOpen, setCreateCollectionModalOpen] = useState(false);
+  const [importCollectionModalOpen, setImportCollectionModalOpen] = useState(false);
+
+  const [isRenamingWorkspace, setIsRenamingWorkspace] = useState(false);
+  const [workspaceNameInput, setWorkspaceNameInput] = useState('');
+  const [workspaceNameError, setWorkspaceNameError] = useState('');
+  const [closeWorkspaceModalOpen, setCloseWorkspaceModalOpen] = useState(false);
+  const workspaceNameInputRef = useRef(null);
+  const workspaceRenameContainerRef = useRef(null);
+  const dropdownTippyRef = useRef();
+  const onDropdownCreate = (ref) => (dropdownTippyRef.current = ref);
+
+  const activeWorkspace = workspaces.find((w) => w.uid === activeWorkspaceUid);
+
+  useEffect(() => {
+    if (!isRenamingWorkspace) return;
+
+    const handleClickOutside = (event) => {
+      if (workspaceRenameContainerRef.current && !workspaceRenameContainerRef.current.contains(event.target)) {
+        handleCancelWorkspaceRename();
+      }
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [isRenamingWorkspace]);
+
+  if (!activeWorkspace) {
+    return null;
+  }
+
+  const handleCreateCollection = async () => {
+    try {
+      const { ipcRenderer } = window;
+      await ipcRenderer.invoke('renderer:ensure-collections-folder', activeWorkspace.pathname);
+      setCreateCollectionModalOpen(true);
+    } catch (error) {
+      console.error('Error ensuring collections folder exists:', error);
+      toast.error('Error preparing workspace for collection creation');
+    }
+  };
+
+  const handleOpenCollection = () => {
+    dispatch(openCollection())
+      .catch((err) => {
+        console.error(err);
+        toast.error('An error occurred while opening the collection');
+      });
+  };
+
+  const handleImportCollection = () => {
+    setImportCollectionModalOpen(true);
+  };
+
+  const handleImportCollectionSubmit = ({ rawData, type, environment, repositoryUrl }) => {
+    setImportCollectionModalOpen(false);
+    dispatch(importCollectionInWorkspace(rawData, activeWorkspace.uid, undefined, type))
+      .catch((err) => {
+        console.error(err);
+        toast.error('An error occurred while importing the collection');
+      });
+  };
+
+  // Workspace menu handlers
+  const handleRenameWorkspaceClick = () => {
+    setIsRenamingWorkspace(true);
+    setWorkspaceNameInput(activeWorkspace.name);
+    setWorkspaceNameError('');
+    setTimeout(() => {
+      workspaceNameInputRef.current?.focus();
+      workspaceNameInputRef.current?.select();
+    }, 50);
+  };
+
+  const handleCloseWorkspaceClick = () => {
+    dropdownTippyRef.current?.hide();
+    if (activeWorkspace.type === 'default') {
+      toast.error('Cannot close the default workspace');
+      return;
+    }
+    setCloseWorkspaceModalOpen(true);
+  };
+
+  const handleShowInFolder = () => {
+    dropdownTippyRef.current?.hide();
+    if (activeWorkspace.pathname) {
+      dispatch(showInFolder(activeWorkspace.pathname))
+        .catch((error) => {
+          console.error('Error opening the folder', error);
+          toast.error('Error opening the folder');
+        });
+    }
+  };
+
+  const validateWorkspaceName = (name) => {
+    if (!name || name.trim() === '') {
+      return 'Name is required';
+    }
+
+    if (name.length < 1) {
+      return 'Must be at least 1 character';
+    }
+
+    if (name.length > 255) {
+      return 'Must be 255 characters or less';
+    }
+
+    return null;
+  };
+
+  const handleSaveWorkspaceRename = () => {
+    const error = validateWorkspaceName(workspaceNameInput);
+    if (error) {
+      setWorkspaceNameError(error);
+      return;
+    }
+
+    dispatch(renameWorkspaceAction(activeWorkspace.uid, workspaceNameInput))
+      .then(() => {
+        toast.success('Workspace renamed!');
+        setIsRenamingWorkspace(false);
+        setWorkspaceNameInput('');
+        setWorkspaceNameError('');
+      })
+      .catch((err) => {
+        toast.error(err?.message || 'An error occurred while renaming the workspace');
+        setWorkspaceNameError(err?.message || 'Failed to rename workspace');
+      });
+  };
+
+  const handleCancelWorkspaceRename = () => {
+    setIsRenamingWorkspace(false);
+    setWorkspaceNameInput('');
+    setWorkspaceNameError('');
+  };
+
+  const handleWorkspaceNameChange = (e) => {
+    const value = e.target.value;
+    setWorkspaceNameInput(value);
+
+    if (workspaceNameError) {
+      setWorkspaceNameError('');
+    }
+  };
+
+  const handleWorkspaceNameKeyDown = (e) => {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      handleSaveWorkspaceRename();
+    } else if (e.key === 'Escape') {
+      e.preventDefault();
+      handleCancelWorkspaceRename();
+    }
+  };
+
+  if (!activeWorkspace) {
+    return null;
+  }
+
+  const tabs = [
+    {
+      id: 'collections',
+      label: 'Collections',
+      component: (
+        <WorkspaceCollections
+          workspace={activeWorkspace}
+          onImportCollection={handleImportCollection}
+        />
+      )
+    },
+    {
+      id: 'environments',
+      label: 'Environments',
+      component: <WorkspaceEnvironments workspace={activeWorkspace} />
+    },
+    {
+      id: 'documentation',
+      label: 'Documentation',
+      component: <WorkspaceDocs workspace={activeWorkspace} />
+    }
+  ];
+
+  return (
+    <StyledWrapper className="h-full">
+      <div className="h-full flex flex-col">
+        {createCollectionModalOpen && (
+          <CreateCollection
+            onClose={() => setCreateCollectionModalOpen(false)}
+          />
+        )}
+
+        {importCollectionModalOpen && (
+          <ImportCollection
+            onClose={() => setImportCollectionModalOpen(false)}
+            handleSubmit={handleImportCollectionSubmit}
+          />
+        )}
+
+        <div className="flex items-center gap-5 p-4 pb-2 workspace-header">
+          <div className="text-xl font-semibold flex items-center gap-2">
+            <IconCategory size={24} stroke={2} />
+            {isRenamingWorkspace ? (
+              <div className="workspace-rename-container" ref={workspaceRenameContainerRef}>
+                <input
+                  ref={workspaceNameInputRef}
+                  type="text"
+                  className="workspace-name-input"
+                  value={workspaceNameInput}
+                  onChange={handleWorkspaceNameChange}
+                  onKeyDown={handleWorkspaceNameKeyDown}
+                  autoComplete="off"
+                  autoCorrect="off"
+                  autoCapitalize="off"
+                  spellCheck="false"
+                />
+                <div className="inline-actions">
+                  <button
+                    className="inline-action-btn save"
+                    onClick={handleSaveWorkspaceRename}
+                    onMouseDown={(e) => e.preventDefault()}
+                    title="Save"
+                  >
+                    <IconCheck size={14} strokeWidth={2} />
+                  </button>
+                  <button
+                    className="inline-action-btn cancel"
+                    onClick={handleCancelWorkspaceRename}
+                    onMouseDown={(e) => e.preventDefault()}
+                    title="Cancel"
+                  >
+                    <IconX size={14} strokeWidth={2} />
+                  </button>
+                </div>
+              </div>
+            ) : (
+              <span>{activeWorkspace.name}</span>
+            )}
+          </div>
+
+          {!isRenamingWorkspace && activeWorkspace.type !== 'default' && (
+            <Dropdown
+              style="new"
+              placement="bottom-end"
+              onCreate={onDropdownCreate}
+              icon={<IconDots size={20} strokeWidth={1.5} className="cursor-pointer" />}
+            >
+              <div className="workspace-menu-dropdown">
+                <div className="dropdown-item" onClick={handleRenameWorkspaceClick}>
+                  <IconEdit size={16} strokeWidth={1.5} />
+                  <span>Rename</span>
+                </div>
+                <div className="dropdown-item" onClick={handleShowInFolder}>
+                  <IconFolder size={16} strokeWidth={1.5} />
+                  <span>Show in Folder</span>
+                </div>
+                <div className="dropdown-item" onClick={handleCloseWorkspaceClick}>
+                  <IconX size={16} strokeWidth={1.5} />
+                  <span>Close</span>
+                </div>
+              </div>
+            </Dropdown>
+          )}
+
+          {workspaceNameError && isRenamingWorkspace && (
+            <div className="workspace-error">{workspaceNameError}</div>
+          )}
+        </div>
+
+        {closeWorkspaceModalOpen && (
+          <CloseWorkspace
+            workspaceUid={activeWorkspace.uid}
+            onClose={() => setCloseWorkspaceModalOpen(false)}
+          />
+        )}
+
+        <div className="flex items-center justify-between px-4 tabs-container">
+          <div className="flex gap-5">
+            {tabs.map((tab) => {
+              return (
+                <button
+                  key={tab.id}
+                  onClick={() => setActiveTab(tab.id)}
+                  className={`flex items-center gap-2 py-2 text-sm border-b-2 transition-colors tab-item ${activeTab === tab.id ? 'active' : ''}`}
+                >
+                  {tab.label}
+                </button>
+              );
+            })}
+          </div>
+
+          {activeTab === 'collections' && (
+            <div className="flex items-center gap-1 workspace-action-buttons">
+              <button
+                onClick={handleCreateCollection}
+                className="workspace-button"
+                title="Create Collection"
+              >
+                <IconPlus size={16} stroke={1.5} />
+                Create
+              </button>
+              <button
+                onClick={handleOpenCollection}
+                className="workspace-button"
+                title="Add Collection"
+              >
+                <IconFolders size={16} stroke={1.5} />
+                Add
+              </button>
+              <button
+                onClick={handleImportCollection}
+                className="workspace-button"
+                title="Import Collection"
+              >
+                <IconFileImport size={16} stroke={1.5} />
+                Import
+              </button>
+            </div>
+          )}
+        </div>
+
+        <div className="flex-1 overflow-hidden">
+          {tabs.find((tab) => tab.id === activeTab)?.component}
+        </div>
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default WorkspaceHome;
diff --git a/packages/bruno-app/src/components/WorkspaceSidebar/CreateWorkspace/index.js b/packages/bruno-app/src/components/WorkspaceSidebar/CreateWorkspace/index.js
new file mode 100644
index 000000000..1d24ac168
--- /dev/null
+++ b/packages/bruno-app/src/components/WorkspaceSidebar/CreateWorkspace/index.js
@@ -0,0 +1,144 @@
+import React, { useRef, useEffect, useState } from 'react';
+import { useFormik } from 'formik';
+import { useDispatch, useSelector } from 'react-redux';
+import * as Yup from 'yup';
+import toast from 'react-hot-toast';
+import Modal from 'components/Modal';
+import { createWorkspaceAction } from 'providers/ReduxStore/slices/workspaces/actions';
+import { browseDirectory } from 'providers/ReduxStore/slices/collections/actions';
+import { multiLineMsg } from 'utils/common/index';
+import { formatIpcError } from 'utils/common/error';
+
+const CreateWorkspace = ({ onClose }) => {
+  const inputRef = useRef();
+  const dispatch = useDispatch();
+  const workspaces = useSelector((state) => state.workspaces.workspaces);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const formik = useFormik({
+    enableReinitialize: true,
+    initialValues: {
+      workspaceName: '',
+      workspaceLocation: ''
+    },
+    validationSchema: Yup.object({
+      workspaceName: Yup.string()
+        .min(1, 'must be at least 1 character')
+        .max(255, 'must be 255 characters or less')
+        .required('workspace name is required')
+        .test('unique-name', 'A workspace with this name already exists', function (value) {
+          if (!value) return true;
+
+          return !workspaces.some((w) =>
+            w.name.toLowerCase() === value.toLowerCase());
+        }),
+      workspaceLocation: Yup.string().min(1, 'location is required').required('location is required')
+    }),
+    onSubmit: async (values) => {
+      if (isSubmitting) return;
+
+      try {
+        setIsSubmitting(true);
+
+        await dispatch(createWorkspaceAction(values.workspaceName, values.workspaceName, values.workspaceLocation));
+        toast.success('Workspace created!');
+        onClose();
+      } catch (error) {
+        toast.error(multiLineMsg('An error occurred while creating the workspace', formatIpcError(error)));
+      } finally {
+        setIsSubmitting(false);
+      }
+    }
+  });
+
+  const browse = () => {
+    dispatch(browseDirectory())
+      .then((dirPath) => {
+        if (typeof dirPath === 'string') {
+          formik.setFieldValue('workspaceLocation', dirPath);
+        }
+      })
+      .catch((error) => {
+        formik.setFieldValue('workspaceLocation', '');
+        console.error(error);
+      });
+  };
+
+  useEffect(() => {
+    if (inputRef && inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [inputRef]);
+
+  return (
+    <Modal
+      size="md"
+      title="Create Workspace"
+      description="Give your new workspace a name and choose its type to get started."
+      confirmText={isSubmitting ? 'Creating...' : 'Create Workspace'}
+      handleConfirm={formik.handleSubmit}
+      handleCancel={onClose}
+      style="new"
+      confirmDisabled={isSubmitting}
+    >
+      <div>
+        <form className="bruno-form" onSubmit={formik.handleSubmit}>
+          <div className="mb-4">
+            <label htmlFor="workspaceName" className="block font-semibold mb-2">
+              Name
+            </label>
+            <input
+              id="workspace-name"
+              type="text"
+              name="workspaceName"
+              ref={inputRef}
+              className="block textbox w-full"
+              autoComplete="off"
+              autoCorrect="off"
+              autoCapitalize="off"
+              spellCheck="false"
+              onChange={formik.handleChange}
+              value={formik.values.workspaceName || ''}
+            />
+            {formik.touched.workspaceName && formik.errors.workspaceName ? (
+              <div className="text-red-500 text-sm mt-1">{formik.errors.workspaceName}</div>
+            ) : null}
+          </div>
+
+          <div className="mb-4">
+            <label htmlFor="workspaceLocation" className="block font-semibold mb-2">
+              Location
+              <span className="ml-1 text-gray-500 text-sm">
+                <svg className="inline w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
+                  <path fillRule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clipRule="evenodd" />
+                </svg>
+              </span>
+            </label>
+            <div className="flex gap-2">
+              <input
+                id="workspace-location"
+                type="text"
+                name="workspaceLocation"
+                readOnly={true}
+                className="block textbox flex-1 bg-gray-50"
+                autoComplete="off"
+                autoCorrect="off"
+                autoCapitalize="off"
+                spellCheck="false"
+                value={formik.values.workspaceLocation || ''}
+              />
+              <button type="button" className="btn btn-sm btn-secondary" onClick={browse}>
+                Browse
+              </button>
+            </div>
+            {formik.touched.workspaceLocation && formik.errors.workspaceLocation ? (
+              <div className="text-red-500 text-sm mt-1">{formik.errors.workspaceLocation}</div>
+            ) : null}
+          </div>
+        </form>
+      </div>
+    </Modal>
+  );
+};
+
+export default CreateWorkspace;
diff --git a/packages/bruno-app/src/globalStyles.js b/packages/bruno-app/src/globalStyles.js
index 7d820c41f..5e3e98491 100644
--- a/packages/bruno-app/src/globalStyles.js
+++ b/packages/bruno-app/src/globalStyles.js
@@ -1,6 +1,11 @@
 import { createGlobalStyle } from 'styled-components';
 
 const GlobalStyle = createGlobalStyle`
+
+  body {
+    font-size: ${(props) => props.theme.font.size.base};
+  }
+
   .CodeMirror-gutters {
     background-color: ${(props) => props.theme.codemirror.gutter.bg} !important;
     border-right: solid 1px ${(props) => props.theme.codemirror.border};
@@ -237,23 +242,32 @@ const GlobalStyle = createGlobalStyle`
     .cm-variable-invalid {
       color: ${(props) => props.theme.codemirror.variable.invalid};
     }
+    .cm-variable-prompt {
+      color: ${(props) => props.theme.codemirror.variable.prompt};
+    }
   }
   .CodeMirror-brunoVarInfo {
     color: ${(props) => props.theme.codemirror.variable.info.color};
     background: ${(props) => props.theme.codemirror.variable.info.bg};
-    border-radius: 2px;
+    border: 0.0625rem solid ${(props) => props.theme.codemirror.variable.info.border};
+    border-radius: 0.375rem;
     box-shadow: ${(props) => props.theme.codemirror.variable.info.boxShadow};
     box-sizing: border-box;
-    font-size: 13px;
-    line-height: 16px;
-    margin: 8px -8px;
-    max-width: 800px;
+    font-size: ${(props) => props.theme.font.size.base};
+    line-height: 1.25rem;
+    margin: 0;
+    min-width: 18.1875rem;
+    max-width: 18.1875rem;
     opacity: 0;
-    overflow: hidden;
-    padding: 8px 8px;
+    overflow: visible;
+    padding: 0.5rem;
     position: fixed;
     transition: opacity 0.15s;
-    z-index: 50;
+    z-index: 10;
+  }
+
+  .CodeMirror-hints {
+    z-index: 50 !important;
   }
 
   .CodeMirror-brunoVarInfo :first-child {
@@ -268,10 +282,213 @@ const GlobalStyle = createGlobalStyle`
     margin: 1em 0;
   }
 
+  /* Header */
+  .CodeMirror-brunoVarInfo .var-info-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.375rem;
+    gap: 0.375rem;
+  }
+
+  .CodeMirror-brunoVarInfo .var-name {
+    font-size: ${(props) => props.theme.font.size.base};
+    color: ${(props) => props.theme.codemirror.variable.info.color};
+    font-weight: 500;
+  }
+
+  /* Scope Badge */
+  .CodeMirror-brunoVarInfo .var-scope-badge {
+    display: inline-block;
+    padding: 0.125rem 0.375rem;
+    background: #D977061A;
+    border-radius: 0.25rem;
+    font-size: ${(props) => props.theme.font.size.sm};
+    color: #D97706;
+    letter-spacing: 0.03125rem;
+  }
+
+  /* Value Container */
+  .CodeMirror-brunoVarInfo .var-value-container {
+    position: relative;
+    border: 0.0625rem solid ${(props) => props.theme.codemirror.variable.info.editorBorder};
+    border-radius: 0.375rem;
+    background: ${(props) => props.theme.codemirror.variable.info.editorBg};
+    overflow-y: auto;
+    overflow-x: hidden;
+    min-width: 17.3125rem;
+    max-height: 13.1875rem;
+  }
+
+  /* Value Display (Read-only) */
+  .CodeMirror-brunoVarInfo .var-value-display {
+    padding: 0.375rem 1.5rem 0.375rem 0.5rem;
+    font-size: ${(props) => props.theme.font.size.base};
+    font-family: Inter, sans-serif;
+    font-weight: 400;
+    word-break: break-word;
+    line-height: 1.25rem;
+    color: ${(props) => props.theme.codemirror.variable.info.color};
+    min-height: 1.75rem;
+    max-width: 13.1875rem;
+  }
+
+  /* Value Editor (CodeMirror) */
+  .CodeMirror-brunoVarInfo .var-value-editor {
+    width: 100%;
+    min-width: 17.1875rem;
+    max-width: 17.1875rem;
+    max-height: 11.125rem;
+    position: relative;
+  }
+
+  .CodeMirror-brunoVarInfo .var-value-editor .CodeMirror {
+    height: 100%;
+    min-height: 1.75rem;
+    max-height: 11.125rem;
+    font-size: ${(props) => props.theme.font.size.base};
+    font-family: Inter, sans-serif;
+    font-weight: 400;
+    line-height: 1.25rem;
+    border: 0.0625rem solid ${(props) => props.theme.codemirror.variable.info.editorBorder};
+    border-radius: 0.375rem;
+    background: ${(props) => props.theme.codemirror.variable.info.editorBg};
+    color: ${(props) => props.theme.codemirror.variable.info.color};
+    transition: border-color 0.15s;
+  }
+
+  .CodeMirror-brunoVarInfo .var-value-editor .CodeMirror-scroll {
+    min-height: 1.75rem;
+    max-height: 11.125rem;
+    overflow-y: auto !important;
+    overflow-x: hidden !important;
+  }
+
+  .CodeMirror-brunoVarInfo .var-value-editor .CodeMirror-focused {
+    background: ${(props) => props.theme.codemirror.variable.info.editorBg};
+    border-color: ${(props) => props.theme.codemirror.variable.info.editorFocusBorder};
+  }
+
+  .CodeMirror-brunoVarInfo .var-value-editor .CodeMirror-lines {
+    padding: 0.375rem 1.5rem 0.375rem 0.5rem;
+    max-width: 13.1875rem;
+    font-family: Inter, sans-serif;
+    font-weight: 400;
+    line-height: 1.25rem;
+    word-break: break-all;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+  }
+
+  .CodeMirror-brunoVarInfo .var-value-editor .CodeMirror pre {
+    font-size: ${(props) => props.theme.font.size.base};
+    font-family: Inter, sans-serif;
+    font-weight: 400;
+    line-height: 1.25rem;
+    word-break: break-all;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    white-space: pre-wrap;
+    color: ${(props) => props.theme.codemirror.variable.info.color};
+  }
+
+  .CodeMirror-brunoVarInfo .var-value-editor .CodeMirror-line {
+    padding: 0;
+    max-width: 13.1875rem;
+    line-height: 1.25rem;
+    font-size: ${(props) => props.theme.font.size.base};
+    font-family: Inter, sans-serif;
+    font-weight: 400;
+    word-break: break-all;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    color: ${(props) => props.theme.codemirror.variable.info.color};
+  }
+
+  .CodeMirror-brunoVarInfo .var-value-editor .CodeMirror-sizer {
+    margin-left: 0 !important;
+    margin-bottom: 0 !important;
+    max-width: 13.1875rem !important;
+  }
+
+  /* Editable value display (shows interpolated value, click to edit) */
+  .CodeMirror-brunoVarInfo .var-value-editable-display {
+    width: 17.1875rem;
+    max-width: 13.1875rem;
+    padding: 0.375rem 1.5rem 0.375rem 0.5rem;
+    font-size: ${(props) => props.theme.font.size.base};
+    font-family: Inter, sans-serif;
+    font-weight: 400;
+    word-break: break-all;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    white-space: pre-wrap;
+    line-height: 1.25rem;
+    color: ${(props) => props.theme.codemirror.variable.info.color};
+    min-height: 1.75rem;
+    cursor: text;
+    border-radius: 0.375rem;
+  }
+
+  /* Icons Container */
+  .CodeMirror-brunoVarInfo .var-icons {
+    position: absolute;
+    top: 0.375rem;
+    right: 0.5rem;
+    display: flex;
+    gap: 0.25rem;
+    z-index: 10;
+  }
+
+  .CodeMirror-brunoVarInfo .secret-toggle-button,
+  .CodeMirror-brunoVarInfo .copy-button {
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    padding: 0.125rem;
+    opacity: 1;
+    transition: opacity 0.2s;
+    color: ${(props) => props.theme.codemirror.variable.info.iconColor};
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .CodeMirror-brunoVarInfo .secret-toggle-button:hover,
+  .CodeMirror-brunoVarInfo .copy-button:hover {
+    opacity: 0.7;
+  }
+
+  .CodeMirror-brunoVarInfo .copy-success {
+    color: #22c55e !important;
+  }
+
+  /* Read-only Note */
+  .CodeMirror-brunoVarInfo .var-readonly-note {
+    font-size: ${(props) => props.theme.font.size.xs};
+    color: ${(props) => props.theme.colors.text.muted};
+    opacity: 0.6;
+    margin-top: 0.25rem;
+  }
+
+  .CodeMirror-brunoVarInfo .var-warning-note {
+    font-size: 0.75rem;
+    color: #ef4444;
+    margin-top: 0.375rem;
+    line-height: 1.25rem;
+  }
+
   .CodeMirror-hint-active {
     background: #08f !important;
     color: #fff !important;
   }
+  
+  .hovered-link.CodeMirror-link {
+    text-decoration: underline !important;
+  }
+  .cmd-ctrl-pressed .hovered-link.CodeMirror-link[data-url] {
+    cursor: pointer;
+    color: ${(props) => props.theme.textLink} !important;
+  }
 `;
 
 export default GlobalStyle;
diff --git a/packages/bruno-app/src/hooks/useFocusTrap/index.js b/packages/bruno-app/src/hooks/useFocusTrap/index.js
index 760603d21..f4fd0577f 100644
--- a/packages/bruno-app/src/hooks/useFocusTrap/index.js
+++ b/packages/bruno-app/src/hooks/useFocusTrap/index.js
@@ -1,20 +1,19 @@
 import { useEffect, useRef } from 'react';
 
 const useFocusTrap = (modalRef) => {
-
   // refer to this implementation for modal focus: https://stackoverflow.com/a/38865836
   const focusableSelector = 'a[href], area[href], input:not([disabled]):not([type="hidden"]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, *[tabindex]:not([tabindex="-1"]), *[contenteditable]';
-  
+
   useEffect(() => {
     const modalElement = modalRef.current;
     if (!modalElement) return;
 
     const focusableElements = Array.from(document.querySelectorAll(focusableSelector));
     const modalFocusableElements = Array.from(modalElement.querySelectorAll(focusableSelector));
-    const elementsToHide = focusableElements.filter(el => !modalFocusableElements.includes(el));
+    const elementsToHide = focusableElements.filter((el) => !modalFocusableElements.includes(el));
 
     // Hide elements outside the modal
-    elementsToHide.forEach(el => {
+    elementsToHide.forEach((el) => {
       const originalTabIndex = el.getAttribute('tabindex');
       el.setAttribute('data-tabindex', originalTabIndex || 'inline');
       el.setAttribute('tabindex', -1);
@@ -42,7 +41,7 @@ const useFocusTrap = (modalRef) => {
       modalElement.removeEventListener('keydown', handleKeyDown);
 
       // Restore original tabindex values
-      elementsToHide.forEach(el => {
+      elementsToHide.forEach((el) => {
         const originalTabIndex = el.getAttribute('data-tabindex');
         el.setAttribute('tabindex', originalTabIndex === 'inline' ? '' : originalTabIndex);
       });
diff --git a/packages/bruno-app/src/hooks/usePrevious/index.js b/packages/bruno-app/src/hooks/usePrevious/index.js
index 41a072238..c71547858 100644
--- a/packages/bruno-app/src/hooks/usePrevious/index.js
+++ b/packages/bruno-app/src/hooks/usePrevious/index.js
@@ -4,10 +4,10 @@ function usePrevious(value) {
   const ref = useRef();
 
   useEffect(() => {
-    ref.current = value; //assign the value of ref to the argument
-  }, [value]); //this code will run when the value of 'value' changes
+    ref.current = value; // assign the value of ref to the argument
+  }, [value]); // this code will run when the value of 'value' changes
 
-  return ref.current; //in the end, return the current ref value.
+  return ref.current; // in the end, return the current ref value.
 }
 
 export default usePrevious;
diff --git a/packages/bruno-app/src/hooks/useTabPaneBoundaries/index.js b/packages/bruno-app/src/hooks/useTabPaneBoundaries/index.js
new file mode 100644
index 000000000..e4036761e
--- /dev/null
+++ b/packages/bruno-app/src/hooks/useTabPaneBoundaries/index.js
@@ -0,0 +1,44 @@
+import find from 'lodash/find';
+import { updateRequestPaneTabHeight, updateRequestPaneTabWidth } from 'providers/ReduxStore/slices/tabs';
+import { useDispatch, useSelector } from 'react-redux';
+
+const MIN_TOP_PANE_HEIGHT = 150;
+
+export function useTabPaneBoundaries(activeTabUid) {
+  const DEFAULT_PANE_WIDTH_DIVISOR = 2.2;
+
+  const tabs = useSelector((state) => state.tabs.tabs);
+  const focusedTab = find(tabs, (t) => t.uid === activeTabUid);
+  const screenWidth = useSelector((state) => state.app.screenWidth);
+  let asideWidth = useSelector((state) => state.app.leftSidebarWidth);
+  const left = focusedTab && focusedTab.requestPaneWidth ? focusedTab.requestPaneWidth : (screenWidth - asideWidth) / DEFAULT_PANE_WIDTH_DIVISOR;
+  const top = focusedTab?.requestPaneHeight;
+  const dispatch = useDispatch();
+
+  return {
+    left,
+    top,
+    setLeft(value) {
+      dispatch(updateRequestPaneTabWidth({
+        uid: activeTabUid,
+        requestPaneWidth: value
+      }));
+    },
+    setTop(value) {
+      dispatch(updateRequestPaneTabHeight({
+        uid: activeTabUid,
+        requestPaneHeight: value
+      }));
+    },
+    reset() {
+      dispatch(updateRequestPaneTabHeight({
+        uid: activeTabUid,
+        requestPaneHeight: MIN_TOP_PANE_HEIGHT
+      }));
+      dispatch(updateRequestPaneTabWidth({
+        uid: activeTabUid,
+        requestPaneWidth: (screenWidth - asideWidth) / DEFAULT_PANE_WIDTH_DIVISOR
+      }));
+    }
+  };
+}
diff --git a/packages/bruno-app/src/i18n/index.js b/packages/bruno-app/src/i18n/index.js
index 26e89695f..0696d740c 100644
--- a/packages/bruno-app/src/i18n/index.js
+++ b/packages/bruno-app/src/i18n/index.js
@@ -4,8 +4,8 @@ import translationEn from './translation/en.json';
 
 const resources = {
   en: {
-    translation: translationEn,
-  },
+    translation: translationEn
+  }
 };
 
 i18n
diff --git a/packages/bruno-app/src/pages/Bruno/StyledWrapper.js b/packages/bruno-app/src/pages/Bruno/StyledWrapper.js
index c570cbf0b..403aacaac 100644
--- a/packages/bruno-app/src/pages/Bruno/StyledWrapper.js
+++ b/packages/bruno-app/src/pages/Bruno/StyledWrapper.js
@@ -19,7 +19,7 @@ const Wrapper = styled.div`
   }
 
   .fw-600 {
-    font-weight: 600;
+    font-weight: 500;
   }
 `;
 
diff --git a/packages/bruno-app/src/pages/Bruno/index.js b/packages/bruno-app/src/pages/Bruno/index.js
index 0a4002640..de4e387c8 100644
--- a/packages/bruno-app/src/pages/Bruno/index.js
+++ b/packages/bruno-app/src/pages/Bruno/index.js
@@ -1,6 +1,6 @@
-import React, { useState, useCallback, useRef, useEffect } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import classnames from 'classnames';
-import Welcome from 'components/Welcome';
+import WorkspaceHome from 'components/WorkspaceHome';
 import RequestTabs from 'components/RequestTabs';
 import RequestTabPanel from 'components/RequestTabPanel';
 import Sidebar from 'components/Sidebar';
@@ -106,26 +106,26 @@ export default function Main() {
         data-app-state="loading"
         style={{
           height: isConsoleOpen ? `calc(100vh - 22px - ${isConsoleOpen ? '300px' : '0px'})` : 'calc(100vh - 22px)'
-          }}
-        >
-          <StyledWrapper className={className} style={{ height: '100%', zIndex: 1 }}>
-            <Sidebar />
-            <section className="flex flex-grow flex-col overflow-hidden">
-              {showHomePage ? (
-                <Welcome />
-              ) : (
-                <>
-                  <RequestTabs />
-                  <RequestTabPanel key={activeTabUid} />
-                </>
-              )}
-            </section>
-          </StyledWrapper>
-        </div>
-
-        <Devtools mainSectionRef={mainSectionRef} />
-        <StatusBar />
+        }}
+      >
+        <StyledWrapper className={className} style={{ height: '100%', zIndex: 1 }}>
+          <Sidebar />
+          <section className="flex flex-grow flex-col overflow-hidden">
+            {showHomePage ? (
+              <WorkspaceHome />
+            ) : (
+              <>
+                <RequestTabs />
+                <RequestTabPanel key={activeTabUid} />
+              </>
+            )}
+          </section>
+        </StyledWrapper>
       </div>
+
+      <Devtools mainSectionRef={mainSectionRef} />
+      <StatusBar />
+    </div>
     // </ErrorCapture>
   );
 }
diff --git a/packages/bruno-app/src/pages/ErrorBoundary/index.js b/packages/bruno-app/src/pages/ErrorBoundary/index.js
index e0550bf48..944cb5d9d 100644
--- a/packages/bruno-app/src/pages/ErrorBoundary/index.js
+++ b/packages/bruno-app/src/pages/ErrorBoundary/index.js
@@ -8,12 +8,14 @@ class ErrorBoundary extends React.Component {
 
     this.state = { hasError: false };
   }
+
   componentDidMount() {
     // Add a global error event listener to capture client-side errors
     window.onerror = (message, source, lineno, colno, error) => {
       this.setState({ hasError: true, error });
     };
   }
+
   componentDidCatch(error, errorInfo) {
     console.log({ error, errorInfo });
     this.setState({ hasError: true, error, errorInfo });
@@ -40,7 +42,7 @@ class ErrorBoundary extends React.Component {
               <Bruno width={256} />
             </div>
 
-            <h1 className="text-2xl font-semibold text-red-600 mb-2">Oops! Something went wrong</h1>
+            <h1 className="text-2xl font-medium text-red-600 mb-2">Oops! Something went wrong</h1>
             <p className="text-red-500 mb-2">
               If you are using an official production build: the above error is most likely a bug!
               <br />
diff --git a/packages/bruno-app/src/pages/Main.js b/packages/bruno-app/src/pages/Main.js
index ba7b3289e..40acfa4cd 100644
--- a/packages/bruno-app/src/pages/Main.js
+++ b/packages/bruno-app/src/pages/Main.js
@@ -3,6 +3,7 @@ import { Provider } from 'react-redux';
 import { AppProvider } from 'providers/App';
 import { ToastProvider } from 'providers/Toaster';
 import { HotkeysProvider } from 'providers/Hotkeys';
+import { PromptVariablesProvider } from 'providers/PromptVariables';
 
 import ReduxStore from 'providers/ReduxStore';
 import ThemeProvider from 'providers/Theme/index';
@@ -44,11 +45,13 @@ function Main({ children }) {
       <Provider store={ReduxStore}>
         <ThemeProvider>
           <ToastProvider>
-            <AppProvider>
-              <HotkeysProvider>
-                {children}
-              </HotkeysProvider>
-            </AppProvider>
+            <PromptVariablesProvider>
+              <AppProvider>
+                <HotkeysProvider>
+                  {children}
+                </HotkeysProvider>
+              </AppProvider>
+            </PromptVariablesProvider>
           </ToastProvider>
         </ThemeProvider>
       </Provider>
@@ -57,5 +60,3 @@ function Main({ children }) {
 }
 
 export default Main;
-
-
diff --git a/packages/bruno-app/src/providers/App/ConfirmAppClose/SaveRequestsModal.js b/packages/bruno-app/src/providers/App/ConfirmAppClose/SaveRequestsModal.js
index fe532e006..b4d1d2014 100644
--- a/packages/bruno-app/src/providers/App/ConfirmAppClose/SaveRequestsModal.js
+++ b/packages/bruno-app/src/providers/App/ConfirmAppClose/SaveRequestsModal.js
@@ -124,7 +124,7 @@ const SaveRequestsModal = ({ onClose }) => {
     >
       <div className="flex items-center">
         <IconAlertTriangle size={32} strokeWidth={1.5} className="text-yellow-600" />
-        <h1 className="ml-2 text-lg font-semibold">Hold on..</h1>
+        <h1 className="ml-2 text-lg font-medium">Hold on..</h1>
       </div>
       <p className="mt-4">
         Do you want to save the changes you made to the following{' '}
diff --git a/packages/bruno-app/src/providers/App/index.js b/packages/bruno-app/src/providers/App/index.js
index 8c7d2a4e4..2fa3edd85 100644
--- a/packages/bruno-app/src/providers/App/index.js
+++ b/packages/bruno-app/src/providers/App/index.js
@@ -21,7 +21,7 @@ export const AppProvider = (props) => {
 
   useEffect(() => {
     const platform = get(navigator, 'platform', '');
-    if(platform && platform.toLowerCase().indexOf('mac') > -1) {
+    if (platform && platform.toLowerCase().indexOf('mac') > -1) {
       document.body.classList.add('os-mac');
     }
   }, []);
diff --git a/packages/bruno-app/src/providers/App/useIpcEvents.js b/packages/bruno-app/src/providers/App/useIpcEvents.js
index 7ee1b8e02..a0ca0523d 100644
--- a/packages/bruno-app/src/providers/App/useIpcEvents.js
+++ b/packages/bruno-app/src/providers/App/useIpcEvents.js
@@ -15,11 +15,14 @@ import {
   collectionUnlinkEnvFileEvent,
   collectionUnlinkFileEvent,
   processEnvUpdateEvent,
+  requestCancelled,
   runFolderEvent,
   runRequestEvent,
-  scriptEnvironmentUpdateEvent
+  scriptEnvironmentUpdateEvent,
+  streamDataReceived
 } from 'providers/ReduxStore/slices/collections';
 import { collectionAddEnvFileEvent, openCollectionEvent, hydrateCollectionWithUiStateSnapshot, mergeAndPersistEnvironment } from 'providers/ReduxStore/slices/collections/actions';
+import { workspaceOpenedEvent, workspaceConfigUpdatedEvent } from 'providers/ReduxStore/slices/workspaces/actions';
 import toast from 'react-hot-toast';
 import { useDispatch } from 'react-redux';
 import { isElectron } from 'utils/common/platform';
@@ -96,6 +99,68 @@ const useIpcEvents = () => {
       dispatch(openCollectionEvent(uid, pathname, brunoConfig));
     });
 
+    const removeOpenWorkspaceListener = ipcRenderer.on('main:workspace-opened', (workspacePath, workspaceUid, workspaceConfig) => {
+      dispatch(workspaceOpenedEvent(workspacePath, workspaceUid, workspaceConfig));
+    });
+
+    const removeWorkspaceConfigUpdatedListener = ipcRenderer.on('main:workspace-config-updated', (workspacePath, workspaceUid, workspaceConfig) => {
+      dispatch(workspaceConfigUpdatedEvent(workspacePath, workspaceUid, workspaceConfig));
+    });
+
+    const removeWorkspaceEnvironmentAddedListener = ipcRenderer.on('main:workspace-environment-added', (workspaceUid, file) => {
+      const state = window.__store__.getState();
+      const activeWorkspaceUid = state.workspaces?.activeWorkspaceUid;
+      if (activeWorkspaceUid === workspaceUid) {
+        const workspace = state.workspaces?.workspaces?.find((w) => w.uid === workspaceUid);
+        if (workspace) {
+          ipcRenderer.invoke('renderer:get-global-environments', {
+            workspaceUid,
+            workspacePath: workspace.pathname
+          }).then((result) => {
+            dispatch(updateGlobalEnvironments(result));
+          }).catch((error) => {
+            console.error('Error refreshing global environments:', error);
+          });
+        }
+      }
+    });
+
+    const removeWorkspaceEnvironmentChangedListener = ipcRenderer.on('main:workspace-environment-changed', (workspaceUid, file) => {
+      const state = window.__store__.getState();
+      const activeWorkspaceUid = state.workspaces?.activeWorkspaceUid;
+      if (activeWorkspaceUid === workspaceUid) {
+        const workspace = state.workspaces?.workspaces?.find((w) => w.uid === workspaceUid);
+        if (workspace) {
+          ipcRenderer.invoke('renderer:get-global-environments', {
+            workspaceUid,
+            workspacePath: workspace.pathname
+          }).then((result) => {
+            dispatch(updateGlobalEnvironments(result));
+          }).catch((error) => {
+            console.error('Error refreshing global environments:', error);
+          });
+        }
+      }
+    });
+
+    const removeWorkspaceEnvironmentDeletedListener = ipcRenderer.on('main:workspace-environment-deleted', (workspaceUid, environmentUid) => {
+      const state = window.__store__.getState();
+      const activeWorkspaceUid = state.workspaces?.activeWorkspaceUid;
+      if (activeWorkspaceUid === workspaceUid) {
+        const workspace = state.workspaces?.workspaces?.find((w) => w.uid === workspaceUid);
+        if (workspace) {
+          ipcRenderer.invoke('renderer:get-global-environments', {
+            workspaceUid,
+            workspacePath: workspace.pathname
+          }).then((result) => {
+            dispatch(updateGlobalEnvironments(result));
+          }).catch((error) => {
+            console.error('Error refreshing global environments:', error);
+          });
+        }
+      }
+    });
+
     const removeCollectionAlreadyOpenedListener = ipcRenderer.on('main:collection-already-opened', (pathname) => {
       toast.success('Collection is already opened');
     });
@@ -137,8 +202,8 @@ const useIpcEvents = () => {
       dispatch(processEnvUpdateEvent(val));
     });
 
-    const removeConsoleLogListener = ipcRenderer.on('main:console-log', (val) => { 
-      console[val.type](...val.args);    
+    const removeConsoleLogListener = ipcRenderer.on('main:console-log', (val) => {
+      console[val.type](...val.args);
       dispatch(addLog({
         type: val.type,
         args: val.args,
@@ -188,6 +253,14 @@ const useIpcEvents = () => {
       dispatch(collectionAddOauth2CredentialsByUrl(payload));
     });
 
+    const removeHttpStreamNewDataListener = ipcRenderer.on('main:http-stream-new-data', (val) => {
+      dispatch(streamDataReceived(val));
+    });
+
+    const removeHttpStreamEndListener = ipcRenderer.on('main:http-stream-end', (val) => {
+      dispatch(requestCancelled(val));
+    });
+
     const removeCollectionLoadingStateListener = ipcRenderer.on('main:collection-loading-state-updated', (val) => {
       dispatch(updateCollectionLoadingState(val));
     });
@@ -195,6 +268,11 @@ const useIpcEvents = () => {
     return () => {
       removeCollectionTreeUpdateListener();
       removeOpenCollectionListener();
+      removeOpenWorkspaceListener();
+      removeWorkspaceConfigUpdatedListener();
+      removeWorkspaceEnvironmentAddedListener();
+      removeWorkspaceEnvironmentChangedListener();
+      removeWorkspaceEnvironmentDeletedListener();
       removeCollectionAlreadyOpenedListener();
       removeDisplayErrorListener();
       removeScriptEnvUpdateListener();
@@ -212,6 +290,8 @@ const useIpcEvents = () => {
       removeGlobalEnvironmentsUpdatesListener();
       removeSnapshotHydrationListener();
       removeCollectionOauth2CredentialsUpdatesListener();
+      removeHttpStreamNewDataListener();
+      removeHttpStreamEndListener();
       removeCollectionLoadingStateListener();
       removePersistentEnvVariablesUpdateListener();
       removeSystemResourcesListener();
diff --git a/packages/bruno-app/src/providers/Hotkeys/index.js b/packages/bruno-app/src/providers/Hotkeys/index.js
index 48f1b6e90..841dc200a 100644
--- a/packages/bruno-app/src/providers/Hotkeys/index.js
+++ b/packages/bruno-app/src/providers/Hotkeys/index.js
@@ -82,19 +82,18 @@ export const HotkeysProvider = (props) => {
         if (collection) {
           const item = findItemInCollection(collection, activeTab.uid);
           if (item) {
-
-            if(item.type === 'grpc-request') {
+            if (item.type === 'grpc-request') {
               const request = item.draft ? item.draft.request : item.request;
-              if(!request.url) {
+              if (!request.url) {
                 toast.error('Please enter a valid gRPC server URL');
                 return;
               }
-              if(!request.method) {
+              if (!request.method) {
                 toast.error('Please select a gRPC method');
                 return;
               }
             }
-            
+
             dispatch(sendRequest(item, collection.uid)).catch((err) =>
               toast.custom((t) => <NetworkError onClose={() => toast.dismiss(t.id)} />, {
                 duration: 5000
diff --git a/packages/bruno-app/src/providers/PromptVariables/index.js b/packages/bruno-app/src/providers/PromptVariables/index.js
new file mode 100644
index 000000000..a0b02da97
--- /dev/null
+++ b/packages/bruno-app/src/providers/PromptVariables/index.js
@@ -0,0 +1,52 @@
+import PromptVariablesModal from 'components/RequestPane/PromptVariables/PromptVariablesModal';
+import React, { createContext, useCallback, useState } from 'react';
+
+const PromptVariablesContext = createContext();
+
+export function PromptVariablesProvider({ children }) {
+  const [modalState, setModalState] = useState({ open: false, prompts: [], resolve: null, reject: null });
+
+  const prompt = useCallback((prompts) => {
+    return new Promise((resolve, reject) => {
+      setModalState({ open: true, prompts, resolve, reject });
+    });
+  }, []);
+
+  // Expose globally for non-component code (e.g., Redux thunks)
+  if (typeof window !== 'undefined') {
+    window.promptForVariables = async (prompts) => {
+      try {
+        return await prompt(prompts);
+      } catch (err) {
+        if (err !== 'cancelled') console.error('window.promptForVariables encountered an error:', err);
+        throw err;
+      }
+    };
+  }
+
+  const handleSubmit = (values) => {
+    modalState.resolve(values);
+    setModalState({ open: false, prompts: [], resolve: null, reject: null });
+  };
+
+  const handleCancel = () => {
+    modalState.reject('cancelled');
+    setModalState({ open: false, prompts: [], resolve: null, reject: null });
+  };
+
+  return (
+    <PromptVariablesContext.Provider value={{ prompt }}>
+      {children}
+      {modalState.open && (
+        <PromptVariablesModal
+          title="Input Required"
+          prompts={modalState.prompts}
+          onSubmit={handleSubmit}
+          onCancel={handleCancel}
+        />
+      )}
+    </PromptVariablesContext.Provider>
+  );
+}
+
+export default PromptVariablesProvider;
diff --git a/packages/bruno-app/src/providers/ReduxStore/index.js b/packages/bruno-app/src/providers/ReduxStore/index.js
index b86305011..97def82f7 100644
--- a/packages/bruno-app/src/providers/ReduxStore/index.js
+++ b/packages/bruno-app/src/providers/ReduxStore/index.js
@@ -8,13 +8,15 @@ import notificationsReducer from './slices/notifications';
 import globalEnvironmentsReducer from './slices/global-environments';
 import logsReducer from './slices/logs';
 import performanceReducer from './slices/performance';
+import workspacesReducer from './slices/workspaces';
 import { draftDetectMiddleware } from './middlewares/draft/middleware';
+import { autosaveMiddleware } from './middlewares/autosave/middleware';
 
 const isDevEnv = () => {
   return import.meta.env.MODE === 'development';
 };
 
-let middleware = [tasksMiddleware.middleware, draftDetectMiddleware];
+let middleware = [tasksMiddleware.middleware, draftDetectMiddleware, autosaveMiddleware];
 if (isDevEnv()) {
   middleware = [...middleware, debugMiddleware.middleware];
 }
@@ -27,7 +29,8 @@ export const store = configureStore({
     notifications: notificationsReducer,
     globalEnvironments: globalEnvironmentsReducer,
     logs: logsReducer,
-    performance: performanceReducer
+    performance: performanceReducer,
+    workspaces: workspacesReducer
   },
   middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(middleware)
 });
diff --git a/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js b/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js
new file mode 100644
index 000000000..ab939fee5
--- /dev/null
+++ b/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js
@@ -0,0 +1,169 @@
+import { saveRequest, saveCollectionSettings, saveFolderRoot } from '../../slices/collections/actions';
+import { flattenItems, isItemARequest, isItemAFolder } from 'utils/collections';
+
+const actionsToIntercept = [
+  // Request-level actions
+  'collections/requestUrlChanged',
+  'collections/updateAuth',
+  'collections/addQueryParam',
+  'collections/moveQueryParam',
+  'collections/updateQueryParam',
+  'collections/deleteQueryParam',
+  'collections/updatePathParam',
+  'collections/addRequestHeader',
+  'collections/updateRequestHeader',
+  'collections/deleteRequestHeader',
+  'collections/moveRequestHeader',
+  'collections/addFormUrlEncodedParam',
+  'collections/updateFormUrlEncodedParam',
+  'collections/deleteFormUrlEncodedParam',
+  'collections/moveFormUrlEncodedParam',
+  'collections/addMultipartFormParam',
+  'collections/updateMultipartFormParam',
+  'collections/deleteMultipartFormParam',
+  'collections/moveMultipartFormParam',
+  'collections/updateRequestAuthMode',
+  'collections/updateRequestBodyMode',
+  'collections/updateRequestBody',
+  'collections/updateRequestGraphqlQuery',
+  'collections/updateRequestGraphqlVariables',
+  'collections/updateRequestScript',
+  'collections/updateResponseScript',
+  'collections/updateRequestTests',
+  'collections/updateRequestMethod',
+  'collections/addAssertion',
+  'collections/updateAssertion',
+  'collections/deleteAssertion',
+  'collections/moveAssertion',
+  'collections/addVar',
+  'collections/updateVar',
+  'collections/deleteVar',
+  'collections/moveVar',
+  'collections/updateRequestDocs',
+  'collections/runRequestEvent',
+
+  // Folder-level actions
+  'collections/addFolderHeader',
+  'collections/updateFolderHeader',
+  'collections/deleteFolderHeader',
+  'collections/addFolderVar',
+  'collections/updateFolderVar',
+  'collections/deleteFolderVar',
+  'collections/updateFolderRequestScript',
+  'collections/updateFolderResponseScript',
+  'collections/updateFolderTests',
+  'collections/updateFolderAuth',
+  'collections/updateFolderAuthMode',
+  'collections/updateFolderDocs',
+
+  // Collection-level actions
+  'collections/addCollectionHeader',
+  'collections/updateCollectionHeader',
+  'collections/deleteCollectionHeader',
+  'collections/addCollectionVar',
+  'collections/updateCollectionVar',
+  'collections/deleteCollectionVar',
+  'collections/updateCollectionAuth',
+  'collections/updateCollectionAuthMode',
+  'collections/updateCollectionRequestScript',
+  'collections/updateCollectionResponseScript',
+  'collections/updateCollectionTests',
+  'collections/updateCollectionDocs',
+  'collections/updateCollectionClientCertificates',
+  'collections/updateCollectionProtobuf',
+  'collections/updateCollectionProxy'
+];
+
+// Simple object to track pending save timers
+const pendingTimers = {};
+
+// Helper to schedule autosave for an item
+const scheduleAutoSave = (key, save, interval) => {
+  // Clear any existing timer for this entity
+  clearTimeout(pendingTimers[key]);
+
+  // Schedule a new save
+  pendingTimers[key] = setTimeout(() => {
+    save();
+    delete pendingTimers[key];
+  }, interval);
+};
+
+// Helper to find and schedule saves for all existing drafts
+const saveExistingDrafts = (dispatch, getState, interval) => {
+  const collections = getState().collections.collections;
+
+  collections.forEach((collection) => {
+    // Check collection-level draft
+    if (collection.draft) {
+      const key = `collection-${collection.uid}`;
+      scheduleAutoSave(key, () => dispatch(saveCollectionSettings(collection.uid, null, true)), interval);
+    }
+
+    // Check all items (requests and folders) for drafts
+    const allItems = flattenItems(collection.items);
+    allItems.forEach((item) => {
+      if (item.draft) {
+        if (isItemARequest(item)) {
+          const key = `request-${item.uid}`;
+          scheduleAutoSave(key, () => dispatch(saveRequest(item.uid, collection.uid, true)), interval);
+        } else if (isItemAFolder(item)) {
+          const key = `folder-${item.uid}`;
+          scheduleAutoSave(key, () => dispatch(saveFolderRoot(collection.uid, item.uid, true)), interval);
+        }
+      }
+    });
+  });
+};
+
+export const autosaveMiddleware = ({ dispatch, getState }) => (next) => (action) => {
+  // Let the action update the state first
+  const result = next(action);
+
+  // Check if autosave is enabled
+  const { autoSave } = getState().app.preferences;
+  if (!autoSave?.enabled) return result;
+
+  // When autosave is enabled (or settings change), save any existing drafts
+  if (action.type === 'app/updatePreferences' && action.payload?.autoSave?.enabled) {
+    saveExistingDrafts(dispatch, getState, autoSave.interval);
+    return result;
+  }
+
+  if (action.type === 'app/updatePreferences' && action.payload?.autoSave?.enabled === false) {
+    Object.keys(pendingTimers).forEach((key) => {
+      clearTimeout(pendingTimers[key]);
+      delete pendingTimers[key];
+    });
+    return result;
+  }
+
+  // Only handle actions that create dirty state
+  if (!actionsToIntercept.includes(action.type)) return result;
+
+  const { itemUid, folderUid, collectionUid } = action.payload;
+  const interval = autoSave.interval;
+
+  // Determine what to save based on what IDs are present
+  let key, save;
+
+  if (itemUid) {
+    // Request change
+    key = `request-${itemUid}`;
+    save = () => dispatch(saveRequest(itemUid, collectionUid, true));
+  } else if (folderUid) {
+    // Folder change
+    key = `folder-${folderUid}`;
+    save = () => dispatch(saveFolderRoot(collectionUid, folderUid, true));
+  } else if (collectionUid) {
+    // Collection change
+    key = `collection-${collectionUid}`;
+    save = () => dispatch(saveCollectionSettings(collectionUid, null, true));
+  }
+
+  if (key && save) {
+    scheduleAutoSave(key, save, interval);
+  }
+
+  return result;
+};
diff --git a/packages/bruno-app/src/providers/ReduxStore/middlewares/draft/middleware.js b/packages/bruno-app/src/providers/ReduxStore/middlewares/draft/middleware.js
index a21b21768..a0f8b185c 100644
--- a/packages/bruno-app/src/providers/ReduxStore/middlewares/draft/middleware.js
+++ b/packages/bruno-app/src/providers/ReduxStore/middlewares/draft/middleware.js
@@ -1,4 +1,4 @@
-import { handleMakeTabParmanent } from "./utils";
+import { handleMakeTabParmanent } from './utils';
 
 const actionsToIntercept = [
   // Request-level actions
diff --git a/packages/bruno-app/src/providers/ReduxStore/middlewares/draft/utils.js b/packages/bruno-app/src/providers/ReduxStore/middlewares/draft/utils.js
index ede864893..fffedc088 100644
--- a/packages/bruno-app/src/providers/ReduxStore/middlewares/draft/utils.js
+++ b/packages/bruno-app/src/providers/ReduxStore/middlewares/draft/utils.js
@@ -1,5 +1,5 @@
-import { makeTabPermanent } from "providers/ReduxStore/slices/tabs";
-import { findCollectionByUid, findItemInCollection } from "utils/collections/index";
+import { makeTabPermanent } from 'providers/ReduxStore/slices/tabs';
+import { findCollectionByUid, findItemInCollection } from 'utils/collections/index';
 import find from 'lodash/find';
 
 function handleMakeTabParmanent(state, action, dispatch) {
@@ -24,9 +24,7 @@ function handleMakeTabParmanent(state, action, dispatch) {
     if (item) {
       dispatch(makeTabPermanent({ uid: itemUid }));
     }
-  }
-  // Handle folder-level changes (folder settings tab)
-  else if (folderUid) {
+  } else if (folderUid) { // Handle folder-level changes (folder settings tab)
     const folder = findItemInCollection(collection, folderUid);
     if (folder) {
       dispatch(makeTabPermanent({ uid: folderUid }));
@@ -39,4 +37,4 @@ function handleMakeTabParmanent(state, action, dispatch) {
 
 export {
   handleMakeTabParmanent
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/app.js b/packages/bruno-app/src/providers/ReduxStore/slices/app.js
index cb3f1f74a..df6ab3587 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/app.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/app.js
@@ -28,6 +28,10 @@ const initialState = {
     },
     general: {
       defaultCollectionLocation: ''
+    },
+    autoSave: {
+      enabled: false,
+      interval: 1000
     }
   },
   generateCode: {
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
index 9e58f15f8..d828797e3 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -1,5 +1,6 @@
 import { collectionSchema, environmentSchema, itemSchema } from '@usebruno/schema';
-import { parseQueryParams } from '@usebruno/common/utils';
+import { parseQueryParams, extractPromptVariables } from '@usebruno/common/utils';
+import { REQUEST_TYPES } from 'utils/common/constants';
 import cloneDeep from 'lodash/cloneDeep';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
@@ -17,6 +18,7 @@ import {
   isItemAFolder,
   refreshUidsInItem,
   isItemARequest,
+  getAllVariables,
   transformRequestToSaveToFilesystem,
   transformCollectionRootToSave
 } from 'utils/collections';
@@ -46,13 +48,20 @@ import {
   saveRequest as _saveRequest,
   saveEnvironment as _saveEnvironment,
   saveCollectionDraft,
-  saveFolderDraft
+  saveFolderDraft,
+  addVar,
+  updateVar,
+  addFolderVar,
+  updateFolderVar,
+  addCollectionVar,
+  updateCollectionVar
 } from './index';
 
 import { each } from 'lodash';
 import { closeAllCollectionTabs, updateResponsePaneScrollPosition } from 'providers/ReduxStore/slices/tabs';
+import { removeCollectionFromWorkspace } from 'providers/ReduxStore/slices/workspaces';
 import { resolveRequestFilename } from 'utils/common/platform';
-import { parsePathParams, splitOnFirst } from 'utils/url/index';
+import { interpolateUrl, parsePathParams, splitOnFirst } from 'utils/url/index';
 import { sendCollectionOauth2Request as _sendCollectionOauth2Request } from 'utils/network/index';
 import {
   getGlobalEnvironmentVariables,
@@ -62,13 +71,53 @@ import {
   resetSequencesInFolder,
   getReorderedItemsInSourceDirectory,
   calculateDraggedItemNewPathname,
-  transformFolderRootToSave
+  transformFolderRootToSave,
+  getTreePathFromCollectionToItem,
+  mergeHeaders
 } from 'utils/collections/index';
 import { sanitizeName } from 'utils/common/regex';
 import { buildPersistedEnvVariables } from 'utils/environments';
 import { safeParseJSON, safeStringifyJSON } from 'utils/common/index';
+import { resolveInheritedAuth } from 'utils/auth';
 import { addTab } from 'providers/ReduxStore/slices/tabs';
 import { updateSettingsSelectedTab } from './index';
+import { saveGlobalEnvironment } from 'providers/ReduxStore/slices/global-environments';
+
+// generate a unique names
+const generateUniqueName = (originalName, existingItems, isFolder) => {
+  // Extract base name by removing any existing " (number)" suffix
+  const baseName = originalName.replace(/\s*\(\d+\)$/, '');
+  const baseFilename = sanitizeName(baseName);
+
+  // Get normalized filenames for items of the same type
+  const existingFilenames = existingItems
+    .filter((item) => isFolder ? item.type === 'folder' : item.type !== 'folder')
+    .map((item) => {
+      let filename = trim(item.filename);
+      // For requests, remove file extension (.bru, .yml, .yaml)
+      return isFolder ? filename : filename.replace(/\.(bru|yml|yaml)$/, '');
+    });
+
+  // Check if base name conflicts with existing items
+  if (!existingFilenames.includes(baseFilename)) {
+    return { newName: baseName, newFilename: baseFilename };
+  }
+
+  // Find highest counter among conflicting names
+  const counters = existingFilenames
+    .filter((filename) => filename === baseFilename || filename.startsWith(`${baseFilename} (`))
+    .map((filename) => {
+      if (filename === baseFilename) return 0;
+      const match = filename.match(/\((\d+)\)$/);
+      return match ? parseInt(match[1], 10) : 0;
+    });
+
+  const nextCounter = Math.max(0, ...counters) + 1;
+  return {
+    newName: `${baseName} (${nextCounter})`,
+    newFilename: `${baseFilename} (${nextCounter})`
+  };
+};
 
 export const renameCollection = (newName, collectionUid) => (dispatch, getState) => {
   const state = getState();
@@ -83,7 +132,7 @@ export const renameCollection = (newName, collectionUid) => (dispatch, getState)
   });
 };
 
-export const saveRequest = (itemUid, collectionUid, saveSilently) => (dispatch, getState) => {
+export const saveRequest = (itemUid, collectionUid, silent = false) => (dispatch, getState) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
 
@@ -103,9 +152,9 @@ export const saveRequest = (itemUid, collectionUid, saveSilently) => (dispatch,
 
     itemSchema
       .validate(itemToSave)
-      .then(() => ipcRenderer.invoke('renderer:save-request', item.pathname, itemToSave))
+      .then(() => ipcRenderer.invoke('renderer:save-request', item.pathname, itemToSave, collection.format))
       .then(() => {
-        if (!saveSilently) {
+        if (!silent) {
           toast.success('Request saved successfully');
         }
         dispatch(
@@ -137,7 +186,8 @@ export const saveMultipleRequests = (items) => (dispatch, getState) => {
         if (itemIsValid) {
           itemsToSave.push({
             item: itemToSave,
-            pathname: item.pathname
+            pathname: item.pathname,
+            format: collection.format
           });
         }
       }
@@ -171,7 +221,7 @@ export const saveCollectionRoot = (collectionUid) => (dispatch, getState) => {
     const { ipcRenderer } = window;
 
     ipcRenderer
-      .invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave)
+      .invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave, collectionCopy.brunoConfig)
       .then(() => {
         toast.success('Collection Settings saved successfully');
         dispatch(saveCollectionDraft({ collectionUid }));
@@ -184,7 +234,7 @@ export const saveCollectionRoot = (collectionUid) => (dispatch, getState) => {
   });
 };
 
-export const saveFolderRoot = (collectionUid, folderUid) => (dispatch, getState) => {
+export const saveFolderRoot = (collectionUid, folderUid, silent = false) => (dispatch, getState) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
   const folder = findItemInCollection(collection, folderUid);
@@ -205,14 +255,17 @@ export const saveFolderRoot = (collectionUid, folderUid) => (dispatch, getState)
 
     const folderData = {
       name: folder.name,
-      pathname: folder.pathname,
+      folderPathname: folder.pathname,
+      collectionPathname: collection.pathname,
       root: folderRootToSave
     };
 
     ipcRenderer
       .invoke('renderer:save-folder-root', folderData)
       .then(() => {
-        toast.success('Folder Settings saved successfully');
+        if (!silent) {
+          toast.success('Folder Settings saved successfully');
+        }
         // If there was a draft, save it to root and clear the draft
         if (folder.draft) {
           dispatch(saveFolderDraft({ collectionUid, folderUid }));
@@ -242,10 +295,10 @@ export const saveMultipleCollections = (collectionDrafts) => (dispatch, getState
 
         let savePromises = [];
 
-        savePromises.push(ipcRenderer.invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave));
+        savePromises.push(ipcRenderer.invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave, collectionCopy.brunoConfig));
 
         if (collectionCopy.draft?.brunoConfig) {
-          savePromises.push(ipcRenderer.invoke('renderer:update-bruno-config', collectionCopy.draft.brunoConfig, collectionCopy.pathname, collectionDraft.collectionUid));
+          savePromises.push(ipcRenderer.invoke('renderer:update-bruno-config', collectionCopy.draft.brunoConfig, collectionCopy.pathname, collectionCopy.root));
         }
 
         Promise.all(savePromises)
@@ -283,7 +336,8 @@ export const saveMultipleFolders = (folderDrafts) => (dispatch, getState) => {
         const folderRootToSave = transformFolderRootToSave(folder);
         const folderData = {
           name: folder.name,
-          pathname: folder.pathname,
+          folderPathname: folder.pathname,
+          collectionPathname: collection.pathname,
           root: folderRootToSave
         };
 
@@ -379,6 +433,76 @@ export const wsConnectOnly = (item, collectionUid) => (dispatch, getState) => {
   });
 };
 
+/**
+ * Extract prompt variables from a request, collection, and environment variables.
+ * Tries to respect the hierarchy of the variables and avoid unnecessary prompts as much as possible
+ *
+ * @param {*} item
+ * @param {*} collection
+ * @returns {Promise<Object>} A promise that resolves with the prompt variables or null if no prompt variables are found
+ */
+const extractPromptVariablesForRequest = async (item, collection) => {
+  return new Promise(async (resolve, reject) => {
+    // Ensure window contains promptForVariables function
+    if (typeof window === 'undefined' || typeof window.promptForVariables !== 'function') {
+      console.error('Failed to initialize prompt variables: window.promptForVariables is not available. '
+        + 'This may indicate an initialization issue with the app environment.');
+      return resolve(null);
+    }
+
+    const prompts = [];
+    const request = item.draft?.request ?? item.request ?? {};
+    const allVariables = getAllVariables(collection, item);
+    const clientCertConfig = get(collection, 'brunoConfig.clientCertificates.certs', []);
+    const requestTreePath = getTreePathFromCollectionToItem(collection, item);
+    // Get active headers from collection, folders, and request by priority order
+    const headers = mergeHeaders(collection, request, requestTreePath);
+    // Get request auth or inherited auth
+    const resolvedAuthRequest = resolveInheritedAuth(item, collection);
+
+    for (let clientCert of clientCertConfig) {
+      const domain = interpolateUrl({ url: clientCert?.domain, variables: allVariables });
+
+      if (domain) {
+        const hostRegex = '^(https:\\/\\/|grpc:\\/\\/|grpcs:\\/\\/)?' + domain.replaceAll('.', '\\.').replaceAll('*', '.*');
+        const requestUrl = interpolateUrl({ url: request.url, variables: allVariables });
+        if (requestUrl.match(hostRegex)) {
+          prompts.push(...extractPromptVariables(clientCert));
+        }
+      }
+    }
+
+    // Attempt to extract unique prompt variables from anywhere in the request and environment variables.
+    prompts.push(...extractPromptVariables(allVariables));
+    prompts.push(...extractPromptVariables(request.body?.[request.body.mode]));
+    prompts.push(...extractPromptVariables(headers));
+    prompts.push(...extractPromptVariables(request.params));
+    prompts.push(...extractPromptVariables(resolvedAuthRequest.auth));
+
+    // Remove duplicates
+    const uniquePrompts = Array.from(new Set(prompts));
+
+    // If no prompt variables are found, return null
+    if (!uniquePrompts?.length) {
+      return resolve(null);
+    }
+
+    try {
+      // Prompt user for values if any prompt variables are found
+      const userValues = await window.promptForVariables(uniquePrompts);
+      const promptVariables = {};
+      // Populate runtimeVariables with user input for prompt variables
+      for (const prompt of uniquePrompts) {
+        promptVariables[`?${prompt}`] = userValues[prompt] ?? '';
+      }
+
+      return resolve(promptVariables);
+    } catch (error) {
+      return reject(error);
+    }
+  });
+};
+
 export const sendRequest = (item, collectionUid) => (dispatch, getState) => {
   const state = getState();
   const { globalEnvironments, activeGlobalEnvironmentUid } = state.globalEnvironments;
@@ -394,9 +518,26 @@ export const sendRequest = (item, collectionUid) => (dispatch, getState) => {
 
     const itemCopy = cloneDeep(item);
 
+    // add selected global env variables to the collection object
+    const globalEnvironmentVariables = getGlobalEnvironmentVariables({
+      globalEnvironments,
+      activeGlobalEnvironmentUid
+    });
+    collectionCopy.globalEnvironmentVariables = globalEnvironmentVariables;
+
     const requestUid = uuid();
     itemCopy.requestUid = requestUid;
 
+    try {
+      const promptVariables = await extractPromptVariablesForRequest(itemCopy, collectionCopy);
+      collectionCopy.promptVariables = promptVariables ?? {};
+    } catch (error) {
+      if (error === 'cancelled') {
+        return resolve(); // Resolve without error if user cancels prompt
+      }
+      return reject(error);
+    }
+
     await dispatch(
       updateResponsePaneScrollPosition({
         uid: state.tabs.activeTabUid,
@@ -412,13 +553,6 @@ export const sendRequest = (item, collectionUid) => (dispatch, getState) => {
       })
     );
 
-    // add selected global env variables to the collection object
-    const globalEnvironmentVariables = getGlobalEnvironmentVariables({
-      globalEnvironments,
-      activeGlobalEnvironmentUid
-    });
-    collectionCopy.globalEnvironmentVariables = globalEnvironmentVariables;
-
     const environment = findEnvironmentInCollection(collectionCopy, collectionCopy.activeEnvironmentUid);
     const isGrpcRequest = itemCopy.type === 'grpc-request';
     const isWsRequest = itemCopy.type === 'ws-request';
@@ -456,7 +590,7 @@ export const sendRequest = (item, collectionUid) => (dispatch, getState) => {
         })
         .then(resolve)
         .catch((err) => {
-          if (err && err.message === "Error invoking remote method 'send-http-request': Error: Request cancelled") {
+          if (err && err.message === 'Error invoking remote method \'send-http-request\': Error: Request cancelled') {
             dispatch(
               responseReceived({
                 itemUid,
@@ -504,8 +638,8 @@ export const cancelRunnerExecution = (cancelTokenUid) => (dispatch) => {
   cancelNetworkRequest(cancelTokenUid).catch((err) => console.log(err));
 };
 
-export const runCollectionFolder =
-  (collectionUid, folderUid, recursive, delay, tags, selectedRequestUids) => (dispatch, getState) => {
+export const runCollectionFolder
+  = (collectionUid, folderUid, recursive, delay, tags, selectedRequestUids) => (dispatch, getState) => {
     const state = getState();
     const { globalEnvironments, activeGlobalEnvironmentUid } = state.globalEnvironments;
     const collection = findCollectionByUid(state.collections.collections, collectionUid);
@@ -598,7 +732,7 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
         const fullName = path.join(collection.pathname, directoryName);
         const { ipcRenderer } = window;
 
-        const folderBruJsonData = {
+        const folderData = {
           meta: {
             name: folderName,
             seq: items?.length + 1
@@ -611,7 +745,7 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
         };
 
         ipcRenderer
-          .invoke('renderer:new-folder', { pathname: fullName, folderBruJsonData })
+          .invoke('renderer:new-folder', { pathname: fullName, folderData, format: collection.format })
           .then(resolve)
           .catch((error) => {
             toast.error('Failed to create a new folder!');
@@ -631,7 +765,7 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
           const fullName = path.join(currentItem.pathname, directoryName);
           const { ipcRenderer } = window;
 
-          const folderBruJsonData = {
+          const folderData = {
             meta: {
               name: folderName,
               seq: items?.length + 1
@@ -644,7 +778,7 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
           };
 
           ipcRenderer
-            .invoke('renderer:new-folder', { pathname: fullName, folderBruJsonData })
+            .invoke('renderer:new-folder', { pathname: fullName, folderData, format: collection.format })
             .then(resolve)
             .catch((error) => {
               toast.error('Failed to create a new folder!');
@@ -660,68 +794,68 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
   });
 };
 
-export const renameItem =
-  ({ newName, newFilename, itemUid, collectionUid }) =>
-  (dispatch, getState) => {
-    const state = getState();
-    const collection = findCollectionByUid(state.collections.collections, collectionUid);
+export const renameItem
+  = ({ newName, newFilename, itemUid, collectionUid }) =>
+    (dispatch, getState) => {
+      const state = getState();
+      const collection = findCollectionByUid(state.collections.collections, collectionUid);
 
-    return new Promise((resolve, reject) => {
-      if (!collection) {
-        return reject(new Error('Collection not found'));
-      }
-
-      const collectionCopy = cloneDeep(collection);
-      const item = findItemInCollection(collectionCopy, itemUid);
-      if (!item) {
-        return reject(new Error('Unable to locate item'));
-      }
-
-      const { ipcRenderer } = window;
-
-      const renameName = async () => {
-        return ipcRenderer.invoke('renderer:rename-item-name', { itemPath: item.pathname, newName }).catch((err) => {
-          toast.error('Failed to rename the item name');
-          console.error(err);
-          throw new Error('Failed to rename the item name');
-        });
-      };
-
-      const renameFile = async () => {
-        const dirname = path.dirname(item.pathname);
-        let newPath = '';
-        if (item.type === 'folder') {
-          newPath = path.join(dirname, trim(newFilename));
-        } else {
-          const filename = resolveRequestFilename(newFilename);
-          newPath = path.join(dirname, filename);
+      return new Promise((resolve, reject) => {
+        if (!collection) {
+          return reject(new Error('Collection not found'));
         }
 
-        return ipcRenderer
-          .invoke('renderer:rename-item-filename', { oldPath: item.pathname, newPath, newName, newFilename })
-          .catch((err) => {
-            toast.error('Failed to rename the file');
+        const collectionCopy = cloneDeep(collection);
+        const item = findItemInCollection(collectionCopy, itemUid);
+        if (!item) {
+          return reject(new Error('Unable to locate item'));
+        }
+
+        const { ipcRenderer } = window;
+
+        const renameName = async () => {
+          return ipcRenderer.invoke('renderer:rename-item-name', { itemPath: item.pathname, newName, collectionPathname: collection.pathname }).catch((err) => {
+            toast.error('Failed to rename the item name');
             console.error(err);
-            throw new Error('Failed to rename the file');
+            throw new Error('Failed to rename the item name');
           });
-      };
+        };
 
-      let renameOperation = null;
-      if (newName) renameOperation = renameName;
-      if (newFilename) renameOperation = renameFile;
+        const renameFile = async () => {
+          const dirname = path.dirname(item.pathname);
+          let newPath = '';
+          if (item.type === 'folder') {
+            newPath = path.join(dirname, trim(newFilename));
+          } else {
+            const filename = resolveRequestFilename(newFilename, collection.format);
+            newPath = path.join(dirname, filename);
+          }
 
-      if (!renameOperation) {
-        resolve();
-      }
+          return ipcRenderer
+            .invoke('renderer:rename-item-filename', { oldPath: item.pathname, newPath, newName, newFilename, collectionPathname: collection.pathname })
+            .catch((err) => {
+              toast.error('Failed to rename the file');
+              console.error(err);
+              throw new Error('Failed to rename the file');
+            });
+        };
 
-      renameOperation()
-        .then(() => {
-          toast.success('Item renamed successfully');
+        let renameOperation = null;
+        if (newName) renameOperation = renameName;
+        if (newFilename) renameOperation = renameFile;
+
+        if (!renameOperation) {
           resolve();
-        })
-        .catch((err) => reject(err));
-    });
-  };
+        }
+
+        renameOperation()
+          .then(() => {
+            toast.success('Item renamed successfully');
+            resolve();
+          })
+          .catch((err) => reject(err));
+      });
+    };
 
 export const cloneItem = (newName, newFilename, itemUid, collectionUid) => (dispatch, getState) => {
   const state = getState();
@@ -757,12 +891,12 @@ export const cloneItem = (newName, newFilename, itemUid, collectionUid) => (disp
       const collectionPath = path.join(parentFolder.pathname, newFilename);
 
       const { ipcRenderer } = window;
-      ipcRenderer.invoke('renderer:clone-folder', item, collectionPath).then(resolve).catch(reject);
+      ipcRenderer.invoke('renderer:clone-folder', item, collectionPath, collection.pathname).then(resolve).catch(reject);
       return;
     }
 
     const parentItem = findParentItemInCollection(collectionCopy, itemUid);
-    const filename = resolveRequestFilename(newFilename);
+    const filename = resolveRequestFilename(newFilename, collection.format);
     const itemToSave = refreshUidsInItem(transformRequestToSaveToFilesystem(item));
     set(itemToSave, 'name', trim(newName));
     set(itemToSave, 'filename', trim(filename));
@@ -847,11 +981,6 @@ export const pasteItem = (targetCollectionUid, targetItemUid = null) => (dispatc
       for (const clipboardItem of clipboardResult.items) {
         const copiedItem = cloneDeep(clipboardItem);
 
-        // Only allow pasting requests (not folders)
-        if (isItemAFolder(copiedItem)) {
-          return reject(new Error('Pasting folders is not supported'));
-        }
-
         const targetCollectionCopy = cloneDeep(targetCollection);
         let targetItem = null;
         let targetParentPathname = targetCollection.pathname;
@@ -868,39 +997,47 @@ export const pasteItem = (targetCollectionUid, targetItemUid = null) => (dispatc
           targetParentPathname = targetItem.pathname;
         }
 
-        // Generate a unique filename for the pasted item
-        let newName = copiedItem.name;
-        let newFilename = sanitizeName(copiedItem.name);
-        let counter = 1;
-
         const existingItems = targetItem ? targetItem.items : targetCollection.items;
 
-        // Check for duplicate names and append counter if needed
-        while (find(existingItems, (i) => i.type !== 'folder' && trim(i.filename) === trim(resolveRequestFilename(newFilename)))) {
-          newName = `${copiedItem.name} (${counter})`;
-          newFilename = `${sanitizeName(copiedItem.name)} (${counter})`;
-          counter++;
+        // Handle folder pasting
+        if (isItemAFolder(copiedItem)) {
+          // Generate unique name for folder
+          const { newName, newFilename } = generateUniqueName(copiedItem.name, existingItems, true);
+
+          set(copiedItem, 'name', newName);
+          set(copiedItem, 'filename', newFilename);
+          set(copiedItem, 'root.meta.name', newName);
+          set(copiedItem, 'root.meta.seq', (existingItems?.length ?? 0) + 1);
+
+          const fullPathname = path.join(targetParentPathname, newFilename);
+          const { ipcRenderer } = window;
+
+          await ipcRenderer.invoke('renderer:clone-folder', copiedItem, fullPathname, targetCollection.pathname);
+        } else {
+          // Handle request pasting
+          // Generate unique name for request
+          const { newName, newFilename } = generateUniqueName(copiedItem.name, existingItems, false);
+
+          const filename = resolveRequestFilename(newFilename, targetCollection.format);
+          const itemToSave = refreshUidsInItem(transformRequestToSaveToFilesystem(copiedItem));
+          set(itemToSave, 'name', trim(newName));
+          set(itemToSave, 'filename', trim(filename));
+
+          const fullPathname = path.join(targetParentPathname, filename);
+          const { ipcRenderer } = window;
+          const requestItems = filter(existingItems, (i) => i.type !== 'folder');
+          itemToSave.seq = requestItems ? requestItems.length + 1 : 1;
+
+          await itemSchema.validate(itemToSave);
+          await ipcRenderer.invoke('renderer:new-request', fullPathname, itemToSave, targetCollection.format);
+
+          dispatch(insertTaskIntoQueue({
+            uid: uuid(),
+            type: 'OPEN_REQUEST',
+            collectionUid: targetCollectionUid,
+            itemPathname: fullPathname
+          }));
         }
-
-        const filename = resolveRequestFilename(newFilename);
-        const itemToSave = refreshUidsInItem(transformRequestToSaveToFilesystem(copiedItem));
-        set(itemToSave, 'name', trim(newName));
-        set(itemToSave, 'filename', trim(filename));
-
-        const fullPathname = path.join(targetParentPathname, filename);
-        const { ipcRenderer } = window;
-        const requestItems = filter(existingItems, (i) => i.type !== 'folder');
-        itemToSave.seq = requestItems ? requestItems.length + 1 : 1;
-
-        await itemSchema.validate(itemToSave);
-        await ipcRenderer.invoke('renderer:new-request', fullPathname, itemToSave);
-
-        dispatch(insertTaskIntoQueue({
-          uid: uuid(),
-          type: 'OPEN_REQUEST',
-          collectionUid: targetCollectionUid,
-          itemPathname: fullPathname
-        }));
       }
 
       resolve();
@@ -921,16 +1058,30 @@ export const deleteItem = (itemUid, collectionUid) => (dispatch, getState) => {
 
     const item = findItemInCollection(collection, itemUid);
     if (item) {
+      const parentDirectoryItem = findParentItemInCollection(collection, itemUid) || collection;
       const { ipcRenderer } = window;
 
       ipcRenderer
-        .invoke('renderer:delete-item', item.pathname, item.type)
-        .then(() => {
+        .invoke('renderer:delete-item', item.pathname, item.type, collection.pathname)
+        .then(async () => {
+          // Reorder items in parent directory after deletion
+          if (parentDirectoryItem.items) {
+            const requestAndFolderTypes = [...REQUEST_TYPES, 'folder'];
+            const directoryItemsWithOnlyRequestAndFolders = parentDirectoryItem.items.filter((i) => requestAndFolderTypes.includes(i.type));
+            const directoryItemsWithoutDeletedItem = directoryItemsWithOnlyRequestAndFolders.filter((i) => i.uid !== itemUid);
+            const reorderedSourceItems = getReorderedItemsInSourceDirectory({
+              items: directoryItemsWithoutDeletedItem
+            });
+            if (reorderedSourceItems?.length) {
+              await dispatch(updateItemsSequences({ itemsToResequence: reorderedSourceItems, collectionUid }));
+            }
+          }
           resolve();
         })
         .catch((error) => reject(error));
+    } else {
+      return reject(new Error('Unable to locate item'));
     }
-    return;
   });
 };
 
@@ -938,145 +1089,148 @@ export const sortCollections = (payload) => (dispatch) => {
   dispatch(_sortCollections(payload));
 };
 
-export const moveItem =
-  ({ targetDirname, sourcePathname }) =>
-  (dispatch, getState) => {
-    return new Promise((resolve, reject) => {
-      const { ipcRenderer } = window;
+export const moveItem
+  = ({ targetDirname, sourcePathname }) =>
+    (dispatch, getState) => {
+      return new Promise((resolve, reject) => {
+        const { ipcRenderer } = window;
 
-      ipcRenderer.invoke('renderer:move-item', { targetDirname, sourcePathname }).then(resolve).catch(reject);
-    });
-  };
+        ipcRenderer.invoke('renderer:move-item', { targetDirname, sourcePathname }).then(resolve).catch(reject);
+      });
+    };
 
-export const handleCollectionItemDrop =
-  ({ targetItem, draggedItem, dropType, collectionUid }) =>
-  (dispatch, getState) => {
-    const state = getState();
-    const collection = findCollectionByUid(state.collections.collections, collectionUid);
-    // if its withincollection set the source to current collection,
-    // if its cross collection set the source to the source collection
-    const sourceCollectionUid = draggedItem.sourceCollectionUid
-    const isCrossCollectionMove = sourceCollectionUid && collectionUid !== sourceCollectionUid;
-    const sourceCollection = isCrossCollectionMove ? findCollectionByUid(state.collections.collections, sourceCollectionUid) : collection;
-    const { uid: draggedItemUid, pathname: draggedItemPathname } = draggedItem;
-    const { uid: targetItemUid, pathname: targetItemPathname } = targetItem;
-    const targetItemDirectory = findParentItemInCollection(collection, targetItemUid) || collection;
-    const targetItemDirectoryItems = cloneDeep(targetItemDirectory.items);
-    const draggedItemDirectory = findParentItemInCollection(sourceCollection, draggedItemUid) || sourceCollection;
-    const draggedItemDirectoryItems = cloneDeep(draggedItemDirectory.items);
+export const handleCollectionItemDrop
+  = ({ targetItem, draggedItem, dropType, collectionUid }) =>
+    (dispatch, getState) => {
+      const state = getState();
+      const collection = findCollectionByUid(state.collections.collections, collectionUid);
+      // if its withincollection set the source to current collection,
+      // if its cross collection set the source to the source collection
+      const sourceCollectionUid = draggedItem.sourceCollectionUid;
+      const isCrossCollectionMove = sourceCollectionUid && collectionUid !== sourceCollectionUid;
+      const sourceCollection = isCrossCollectionMove ? findCollectionByUid(state.collections.collections, sourceCollectionUid) : collection;
+      const { uid: draggedItemUid, pathname: draggedItemPathname } = draggedItem;
+      const { uid: targetItemUid, pathname: targetItemPathname } = targetItem;
+      const targetItemDirectory = findParentItemInCollection(collection, targetItemUid) || collection;
+      const targetItemDirectoryItems = cloneDeep(targetItemDirectory.items);
+      const draggedItemDirectory = findParentItemInCollection(sourceCollection, draggedItemUid) || sourceCollection;
+      const draggedItemDirectoryItems = cloneDeep(draggedItemDirectory.items);
 
-    const handleMoveToNewLocation = async ({
-      draggedItem,
-      draggedItemDirectoryItems,
-      targetItem,
-      targetItemDirectoryItems,
-      newPathname,
-      dropType
-    }) => {
-      const { uid: targetItemUid } = targetItem;
-      const { pathname: draggedItemPathname, uid: draggedItemUid } = draggedItem;
+      const handleMoveToNewLocation = async ({
+        draggedItem,
+        draggedItemDirectoryItems,
+        targetItem,
+        targetItemDirectoryItems,
+        newPathname,
+        dropType
+      }) => {
+        const { uid: targetItemUid } = targetItem;
+        const { pathname: draggedItemPathname, uid: draggedItemUid } = draggedItem;
 
-      const newDirname = path.dirname(newPathname);
-      await dispatch(
-        moveItem({
+        const newDirname = path.dirname(newPathname);
+        await dispatch(moveItem({
           targetDirname: newDirname,
           sourcePathname: draggedItemPathname
-        })
-      );
+        }));
 
-      // Update sequences in the source directory
-      if (draggedItemDirectoryItems?.length) {
-        // reorder items in the source directory
-        const draggedItemDirectoryItemsWithoutDraggedItem = draggedItemDirectoryItems.filter(
-          (i) => i.uid !== draggedItemUid
-        );
-        const reorderedSourceItems = getReorderedItemsInSourceDirectory({
-          items: draggedItemDirectoryItemsWithoutDraggedItem
-        });
-        if (reorderedSourceItems?.length) {
-          await dispatch(updateItemsSequences({ itemsToResequence: reorderedSourceItems }));
+        // Update sequences in the source directory
+        if (draggedItemDirectoryItems?.length) {
+          // reorder items in the source directory
+          const draggedItemDirectoryItemsWithoutDraggedItem = draggedItemDirectoryItems.filter((i) => i.uid !== draggedItemUid);
+          const reorderedSourceItems = getReorderedItemsInSourceDirectory({
+            items: draggedItemDirectoryItemsWithoutDraggedItem
+          });
+          if (reorderedSourceItems?.length) {
+            await dispatch(updateItemsSequences({ itemsToResequence: reorderedSourceItems, collectionUid: sourceCollectionUid || collectionUid }));
+          }
         }
-      }
 
-      // Update sequences in the target directory (if dropping adjacent)
-      if (dropType === 'adjacent') {
-        const targetItemSequence = targetItemDirectoryItems.findIndex((i) => i.uid === targetItemUid)?.seq;
+        // Update sequences in the target directory (if dropping adjacent)
+        if (dropType === 'adjacent') {
+          const targetItemSequence = targetItemDirectoryItems.findIndex((i) => i.uid === targetItemUid)?.seq;
 
-        const draggedItemWithNewPathAndSequence = {
-          ...draggedItem,
-          pathname: newPathname,
-          seq: targetItemSequence
-        };
+          const draggedItemWithNewPathAndSequence = {
+            ...draggedItem,
+            pathname: newPathname,
+            seq: targetItemSequence
+          };
 
-        // draggedItem is added to the targetItem's directory
-        const reorderedTargetItems = getReorderedItemsInTargetDirectory({
-          items: [...targetItemDirectoryItems, draggedItemWithNewPathAndSequence],
+          // draggedItem is added to the targetItem's directory
+          const reorderedTargetItems = getReorderedItemsInTargetDirectory({
+            items: [...targetItemDirectoryItems, draggedItemWithNewPathAndSequence],
+            targetItemUid,
+            draggedItemUid
+          });
+
+          if (reorderedTargetItems?.length) {
+            await dispatch(updateItemsSequences({ itemsToResequence: reorderedTargetItems, collectionUid }));
+          }
+        }
+      };
+
+      const handleReorderInSameLocation = async ({ draggedItem, targetItem, targetItemDirectoryItems }) => {
+        const { uid: targetItemUid } = targetItem;
+        const { uid: draggedItemUid } = draggedItem;
+
+        // reorder items in the targetItem's directory
+        const reorderedItems = getReorderedItemsInTargetDirectory({
+          items: targetItemDirectoryItems,
           targetItemUid,
           draggedItemUid
         });
 
-        if (reorderedTargetItems?.length) {
-          await dispatch(updateItemsSequences({ itemsToResequence: reorderedTargetItems }));
+        if (reorderedItems?.length) {
+          await dispatch(updateItemsSequences({ itemsToResequence: reorderedItems, collectionUid }));
         }
-      }
-    };
+      };
 
-    const handleReorderInSameLocation = async ({ draggedItem, targetItem, targetItemDirectoryItems }) => {
-      const { uid: targetItemUid } = targetItem;
-      const { uid: draggedItemUid } = draggedItem;
-
-      // reorder items in the targetItem's directory
-      const reorderedItems = getReorderedItemsInTargetDirectory({
-        items: targetItemDirectoryItems,
-        targetItemUid,
-        draggedItemUid
-      });
-
-      if (reorderedItems?.length) {
-        await dispatch(updateItemsSequences({ itemsToResequence: reorderedItems }));
-      }
-    };
-
-    return new Promise(async (resolve, reject) => {
-      try {
-        const newPathname = calculateDraggedItemNewPathname({
-          draggedItem,
-          targetItem,
-          dropType,
-          collectionPathname: collection.pathname
-        });
-        if (!newPathname) return;
-        if (targetItemPathname?.startsWith(draggedItemPathname)) return;
-        if (newPathname !== draggedItemPathname) {
-          await handleMoveToNewLocation({
-            targetItem,
-            targetItemDirectoryItems,
+      return new Promise(async (resolve, reject) => {
+        try {
+          const newPathname = calculateDraggedItemNewPathname({
             draggedItem,
-            draggedItemDirectoryItems,
-            newPathname,
-            dropType
+            targetItem,
+            dropType,
+            collectionPathname: collection.pathname
           });
-        } else {
-          await handleReorderInSameLocation({ draggedItem, targetItemDirectoryItems, targetItem });
+          if (!newPathname) return;
+          if (targetItemPathname?.startsWith(draggedItemPathname)) return;
+          if (newPathname !== draggedItemPathname) {
+            await handleMoveToNewLocation({
+              targetItem,
+              targetItemDirectoryItems,
+              draggedItem,
+              draggedItemDirectoryItems,
+              newPathname,
+              dropType
+            });
+          } else {
+            await handleReorderInSameLocation({ draggedItem, targetItemDirectoryItems, targetItem });
+          }
+          resolve();
+        } catch (error) {
+          console.error(error);
+          toast.error(error?.message);
+          reject(error);
         }
-        resolve();
-      } catch (error) {
-        console.error(error);
-        toast.error(error?.message);
-        reject(error);
-      }
-    });
-  };
+      });
+    };
 
-export const updateItemsSequences =
-  ({ itemsToResequence }) =>
-  (dispatch, getState) => {
-    return new Promise((resolve, reject) => {
-      const { ipcRenderer } = window;
+export const updateItemsSequences
+  = ({ itemsToResequence, collectionUid }) =>
+    (dispatch, getState) => {
+      return new Promise((resolve, reject) => {
+        const state = getState();
+        const collection = findCollectionByUid(state.collections.collections, collectionUid);
 
-      ipcRenderer.invoke('renderer:resequence-items', itemsToResequence).then(resolve).catch(reject);
-    });
-  };
+        if (!collection) {
+          return reject(new Error('Collection not found'));
+        }
+
+        const { ipcRenderer } = window;
+
+        ipcRenderer.invoke('renderer:resequence-items', itemsToResequence, collection.pathname).then(resolve).catch(reject);
+      });
+    };
 
 export const newHttpRequest = (params) => (dispatch, getState) => {
   const {
@@ -1131,10 +1285,15 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
           text: null,
           xml: null,
           sparql: null,
-          multipartForm: null,
-          formUrlEncoded: null,
-          file: null
+          multipartForm: [],
+          formUrlEncoded: [],
+          file: []
         },
+        vars: {
+          req: [],
+          res: []
+        },
+        assertions: [],
         auth: auth ?? {
           mode: 'inherit'
         }
@@ -1145,7 +1304,7 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
     };
 
     // itemUid is null when we are creating a new request at the root level
-    const resolvedFilename = resolveRequestFilename(filename);
+    const resolvedFilename = resolveRequestFilename(filename, collection.format);
     if (!itemUid) {
       const reqWithSameNameExists = find(
         collection.items,
@@ -1242,13 +1401,23 @@ export const newGrpcRequest = (params) => (dispatch, getState) => {
         },
         auth: auth ?? {
           mode: 'inherit'
-        }
+        },
+        vars: {
+          req: [],
+          res: []
+        },
+        script: {
+          req: null,
+          res: null
+        },
+        assertions: [],
+        tests: null
       }
     };
 
     // itemUid is null when we are creating a new request at the root level
     const parentItem = itemUid ? findItemInCollection(collection, itemUid) : collection;
-    const resolvedFilename = resolveRequestFilename(filename);
+    const resolvedFilename = resolveRequestFilename(filename, collection.format);
 
     if (!parentItem) {
       return reject(new Error('Parent item not found'));
@@ -1300,6 +1469,7 @@ export const newWsRequest = (params) => (dispatch, getState) => {
       request: {
         url: requestUrl,
         method: requestMethod,
+        params: [],
         body: body ?? {
           mode: 'ws',
           ws: [
@@ -1312,13 +1482,23 @@ export const newWsRequest = (params) => (dispatch, getState) => {
         },
         auth: auth ?? {
           mode: 'inherit'
-        }
+        },
+        vars: {
+          req: [],
+          res: []
+        },
+        script: {
+          req: null,
+          res: null
+        },
+        assertions: [],
+        tests: null
       }
     };
 
     // itemUid is null when we are creating a new request at the root level
     const parentItem = itemUid ? findItemInCollection(collection, itemUid) : collection;
-    const resolvedFilename = resolveRequestFilename(filename);
+    const resolvedFilename = resolveRequestFilename(filename, collection.format);
 
     if (!parentItem) {
       return reject(new Error('Parent item not found'));
@@ -1356,7 +1536,7 @@ export const loadGrpcMethodsFromReflection = (item, collectionUid, url) => async
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
   const { globalEnvironments, activeGlobalEnvironmentUid } = state.globalEnvironments;
 
-  return new Promise((resolve, reject) => {
+  return new Promise(async (resolve, reject) => {
     if (!collection) {
       return reject(new Error('Collection not found'));
     }
@@ -1373,6 +1553,18 @@ export const loadGrpcMethodsFromReflection = (item, collectionUid, url) => async
     const environment = findEnvironmentInCollection(collectionCopy, collectionCopy.activeEnvironmentUid);
     const runtimeVariables = collectionCopy.runtimeVariables;
 
+    try {
+      const promptVariables = await extractPromptVariablesForRequest(itemCopy, collectionCopy);
+      if (promptVariables) {
+        collectionCopy.promptVariables = promptVariables;
+      }
+    } catch (error) {
+      if (error === 'cancelled') {
+        return resolve(); // Resolve without error if user cancels prompt
+      }
+      return reject(error);
+    }
+
     const { ipcRenderer } = window;
     ipcRenderer
       .invoke('grpc:load-methods-reflection', {
@@ -1603,59 +1795,292 @@ export const saveEnvironment = (variables, environmentUid, collectionUid) => (di
   });
 };
 
-export const mergeAndPersistEnvironment =
-  ({ persistentEnvVariables, collectionUid }) =>
-  (_dispatch, getState) => {
-    return new Promise((resolve, reject) => {
-      const state = getState();
-      const collection = findCollectionByUid(state.collections.collections, collectionUid);
+/**
+ * Update a variable value directly in the file without affecting draft state
+ * @param {string} pathname - File path
+ * @param {Object} variable - Variable object with uid, name, value, type, enabled
+ * @param {string} scopeType - Type of scope ('request', 'folder', 'collection')
+ * @param {string} collectionUid - Collection UID
+ * @param {string} itemUid - Item/Folder UID (for request/folder)
+ */
+const updateVariableInFile = (pathname, variable, scopeType, collectionUid, itemUid) => (dispatch, getState) => {
+  return new Promise((resolve, reject) => {
+    const { ipcRenderer } = window;
 
-      if (!collection) {
+    const state = getState();
+    const collection = findCollectionByUid(state.collections.collections, collectionUid);
+    if (!collection) {
+      return reject(new Error('Collection not found'));
+    }
+
+    const collectionCopy = cloneDeep(collection);
+
+    ipcRenderer
+      .invoke('renderer:update-variable-in-file', pathname, variable, scopeType, collectionCopy.root, collectionCopy.format)
+      .then(() => {
+        // Update Redux state to reflect the change
+        if (scopeType === 'request') {
+          dispatch({
+            type: 'collections/updateRequestVarValue',
+            payload: { collectionUid, itemUid, variable }
+          });
+        } else if (scopeType === 'folder') {
+          dispatch({
+            type: 'collections/updateFolderVarValue',
+            payload: { collectionUid, folderUid: itemUid, variable }
+          });
+        } else if (scopeType === 'collection') {
+          dispatch({
+            type: 'collections/updateCollectionVarValue',
+            payload: { collectionUid, variable }
+          });
+        }
+
+        resolve();
+      })
+      .catch(reject);
+  });
+};
+
+/**
+ * Helper: Execute update action with toast notification
+ * @param {Function} action - The action to dispatch
+ * @param {string} successMessage - Success toast message
+ * @returns {Promise}
+ */
+const executeVariableUpdate = (dispatch, action, successMessage) => {
+  return dispatch(action)
+    .then(() => {
+      toast.success(successMessage);
+    });
+};
+
+/**
+ * Update a variable value in its detected scope (inline editing)
+ * @param {string} variableName - Name of the variable to update
+ * @param {string} newValue - New value for the variable
+ * @param {Object} scopeInfo - Scope information from getVariableScope()
+ * @param {string} collectionUid - Collection UID
+ */
+export const updateVariableInScope = (variableName, newValue, scopeInfo, collectionUid) => (dispatch, getState) => {
+  return new Promise((resolve, reject) => {
+    if (!scopeInfo || !variableName) {
+      return reject(new Error('Invalid scope information or variable name'));
+    }
+
+    const state = getState();
+    const collection = findCollectionByUid(state.collections.collections, collectionUid);
+
+    try {
+      const { type, data } = scopeInfo;
+
+      // Handle read-only variables early
+      if (type === 'process.env') {
+        toast.error('Process environment variables cannot be edited');
+        return reject(new Error('Process environment variables are read-only'));
+      }
+
+      if (type === 'runtime') {
+        toast.error('Runtime variables are set by scripts and cannot be edited');
+        return reject(new Error('Runtime variables are read-only'));
+      }
+
+      // Validate collection for non-global scopes
+      if (type !== 'global' && !collection) {
         return reject(new Error('Collection not found'));
       }
 
-      const environmentUid = collection.activeEnvironmentUid;
-      if (!environmentUid) {
-        return reject(new Error('No active environment found'));
-      }
+      switch (type) {
+        case 'environment': {
+          const { environment, variable } = data;
 
-      const collectionCopy = cloneDeep(collection);
-      const environment = findEnvironmentInCollection(collectionCopy, environmentUid);
-      if (!environment) {
-        return reject(new Error('Environment not found'));
-      }
+          if (!variable) {
+            return reject(new Error('Variable not found'));
+          }
 
-      // Only proceed if there are persistent variables to save
-      if (!persistentEnvVariables || Object.keys(persistentEnvVariables).length === 0) {
-        return resolve();
-      }
+          const updatedVariables = environment.variables.map((v) => (v.uid === variable.uid ? { ...v, value: newValue } : v));
 
-      let existingVars = environment.variables || [];
-
-      let normalizedNewVars = Object.entries(persistentEnvVariables).map(([name, value]) => ({
-        uid: uuid(),
-        name,
-        value,
-        type: 'text',
-        enabled: true,
-        secret: false
-      }));
-
-      const merged = existingVars.map((v) => {
-        const found = normalizedNewVars.find((nv) => nv.name === v.name);
-        if (found) {
-          return { ...v, value: found.value };
+          return dispatch(saveEnvironment(updatedVariables, environment.uid, collectionUid))
+            .then(() => {
+              toast.success(`Variable "${variableName}" updated`);
+            })
+            .then(resolve)
+            .catch(reject);
         }
-        return v;
-      });
-      normalizedNewVars.forEach((nv) => {
-        if (!merged.some((v) => v.name === nv.name)) {
-          merged.push(nv);
+
+        case 'collection': {
+          const { variable } = data;
+
+          if (variable) {
+            // Update existing variable in draft
+            dispatch(updateCollectionVar({
+              collectionUid,
+              type: 'request',
+              var: { ...variable, value: newValue }
+            }));
+          } else {
+            // Create new variable in draft with actual values
+            dispatch(addCollectionVar({
+              collectionUid,
+              type: 'request',
+              var: { name: variableName, value: newValue, enabled: true }
+            }));
+          }
+
+          // Save collection root to persist the changes
+          return dispatch(saveCollectionRoot(collectionUid))
+            .then(resolve)
+            .catch(reject);
         }
-      });
+
+        case 'folder': {
+          const { folder, variable } = data;
+
+          if (variable) {
+            // Update existing variable in draft
+            dispatch(updateFolderVar({
+              collectionUid,
+              folderUid: folder.uid,
+              type: 'request',
+              var: { ...variable, value: newValue }
+            }));
+          } else {
+            // Create new variable in draft with actual values
+            dispatch(addFolderVar({
+              collectionUid,
+              folderUid: folder.uid,
+              type: 'request',
+              var: { name: variableName, value: newValue, enabled: true }
+            }));
+          }
+
+          // Save folder root to persist the changes
+          return dispatch(saveFolderRoot(collectionUid, folder.uid))
+            .then(resolve)
+            .catch(reject);
+        }
+
+        case 'request': {
+          const { item, variable } = data;
+
+          if (variable) {
+            // Update existing variable in draft
+            dispatch(updateVar({
+              collectionUid,
+              itemUid: item.uid,
+              type: 'request',
+              var: { ...variable, value: newValue }
+            }));
+          } else {
+            // Create new variable in draft with actual values
+            dispatch(addVar({
+              collectionUid,
+              itemUid: item.uid,
+              type: 'request',
+              var: { name: variableName, value: newValue, local: false, enabled: true }
+            }));
+          }
+
+          // Save request to persist the changes
+          return dispatch(saveRequest(item.uid, collectionUid, true))
+            .then(resolve)
+            .catch(reject);
+        }
+
+        case 'global': {
+          const globalEnvironments = state.globalEnvironments?.globalEnvironments || [];
+          const activeGlobalEnvUid = state.globalEnvironments?.activeGlobalEnvironmentUid;
+
+          if (!activeGlobalEnvUid) {
+            return reject(new Error('No active global environment'));
+          }
+
+          const environment = globalEnvironments.find((env) => env.uid === activeGlobalEnvUid);
+
+          if (!environment) {
+            return reject(new Error('Global environment not found'));
+          }
+
+          const variable = environment.variables.find((v) => v.name === variableName && v.enabled);
+
+          if (!variable) {
+            return reject(new Error('Variable not found'));
+          }
+
+          const updatedVariables = environment.variables.map((v) =>
+            v.uid === variable.uid ? { ...v, value: newValue } : v);
+
+          return dispatch(saveGlobalEnvironment({ variables: updatedVariables, environmentUid: activeGlobalEnvUid }))
+            .then(() => {
+              toast.success(`Variable "${variableName}" updated`);
+            })
+            .then(resolve)
+            .catch(reject);
+        }
+
+        default:
+          return reject(new Error(`Unknown scope type: ${type}`));
+      }
+    } catch (error) {
+      toast.error(`Failed to update variable: ${error.message}`);
+      reject(error);
+    }
+  });
+};
+
+export const mergeAndPersistEnvironment
+  = ({ persistentEnvVariables, collectionUid }) =>
+    (_dispatch, getState) => {
+      return new Promise((resolve, reject) => {
+        const state = getState();
+        const collection = findCollectionByUid(state.collections.collections, collectionUid);
+
+        if (!collection) {
+          return reject(new Error('Collection not found'));
+        }
+
+        const environmentUid = collection.activeEnvironmentUid;
+        if (!environmentUid) {
+          return reject(new Error('No active environment found'));
+        }
+
+        const collectionCopy = cloneDeep(collection);
+        const environment = findEnvironmentInCollection(collectionCopy, environmentUid);
+        if (!environment) {
+          return reject(new Error('Environment not found'));
+        }
+
+        // Only proceed if there are persistent variables to save
+        if (!persistentEnvVariables || Object.keys(persistentEnvVariables).length === 0) {
+          return resolve();
+        }
+
+        let existingVars = environment.variables || [];
+
+        let normalizedNewVars = Object.entries(persistentEnvVariables).map(([name, value]) => ({
+          uid: uuid(),
+          name,
+          value,
+          type: 'text',
+          enabled: true,
+          secret: false
+        }));
+
+        const merged = existingVars.map((v) => {
+          const found = normalizedNewVars.find((nv) => nv.name === v.name);
+          if (found) {
+            return { ...v, value: found.value };
+          }
+          return v;
+        });
+        normalizedNewVars.forEach((nv) => {
+          if (!merged.some((v) => v.name === nv.name)) {
+            merged.push(nv);
+          }
+        });
 
         // Save all non-ephemeral vars and all variables that were previously persisted
-      const persistedNames = new Set(Object.keys(persistentEnvVariables));
+        const persistedNames = new Set(Object.keys(persistentEnvVariables));
 
         // Add all existing non-ephemeral variables to persistedNames so they are preserved
         existingVars.forEach((v) => {
@@ -1664,17 +2089,17 @@ export const mergeAndPersistEnvironment =
           }
         });
 
-      const environmentToSave = cloneDeep(environment);
-      environmentToSave.variables = buildPersistedEnvVariables(merged, { mode: 'merge', persistedNames });
+        const environmentToSave = cloneDeep(environment);
+        environmentToSave.variables = buildPersistedEnvVariables(merged, { mode: 'merge', persistedNames });
 
-      const { ipcRenderer } = window;
-      environmentSchema
-        .validate(environmentToSave)
-        .then(() => ipcRenderer.invoke('renderer:save-environment', collection.pathname, environmentToSave))
-        .then(resolve)
-        .catch(reject);
-    });
-  };
+        const { ipcRenderer } = window;
+        environmentSchema
+          .validate(environmentToSave)
+          .then(() => ipcRenderer.invoke('renderer:save-environment', collection.pathname, environmentToSave))
+          .then(resolve)
+          .catch(reject);
+      });
+    };
 
 export const selectEnvironment = (environmentUid, collectionUid) => (dispatch, getState) => {
   return new Promise((resolve, reject) => {
@@ -1711,18 +2136,48 @@ export const removeCollection = (collectionUid) => (dispatch, getState) => {
       return reject(new Error('Collection not found'));
     }
     const { ipcRenderer } = window;
+
+    // Get active workspace to determine which workspace we're removing from
+    const { workspaces } = state;
+    const activeWorkspace = workspaces.workspaces.find((w) => w.uid === workspaces.activeWorkspaceUid);
+
+    let workspaceId = 'default';
+    if (activeWorkspace) {
+      if (activeWorkspace.pathname) {
+        workspaceId = activeWorkspace.pathname;
+      } else {
+        workspaceId = activeWorkspace.uid;
+      }
+    }
+
     ipcRenderer
-      .invoke('renderer:remove-collection', collection.pathname, collectionUid)
+      .invoke('renderer:remove-collection', collection.pathname, collectionUid, workspaceId)
       .then(() => {
-        dispatch(closeAllCollectionTabs({ collectionUid }));
+        // Check if the collection still exists in other workspaces
+        return ipcRenderer.invoke('renderer:get-collection-workspaces', collection.pathname);
       })
-      .then(waitForNextTick)
-      .then(() => {
-        dispatch(
-          _removeCollection({
-            collectionUid: collectionUid
-          })
-        );
+      .then((remainingWorkspaces) => {
+        // Close tabs for this collection
+        dispatch(closeAllCollectionTabs({ collectionUid }));
+
+        // Remove collection from workspace in Redux state
+        if (activeWorkspace) {
+          dispatch(removeCollectionFromWorkspace({
+            workspaceUid: activeWorkspace.uid,
+            collectionLocation: collection.pathname
+          }));
+        }
+
+        // Only remove from Redux if no workspaces remain
+        if (!remainingWorkspaces || remainingWorkspaces.length === 0) {
+          return waitForNextTick().then(() => {
+            dispatch(_removeCollection({
+              collectionUid: collectionUid
+            }));
+          });
+        } else {
+          // Collection still exists in other workspaces
+        }
       })
       .then(resolve)
       .catch(reject);
@@ -1745,7 +2200,7 @@ export const browseFiles = (filters, properties) => (_dispatch, _getState) => {
   });
 };
 
-export const saveCollectionSettings = (collectionUid, brunoConfig = null) => (dispatch, getState) => {
+export const saveCollectionSettings = (collectionUid, brunoConfig = null, silent = false) => (dispatch, getState) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
 
@@ -1763,17 +2218,19 @@ export const saveCollectionSettings = (collectionUid, brunoConfig = null) => (di
     const savePromises = [];
 
     // Save collection.bru file
-    savePromises.push(ipcRenderer.invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave));
+    savePromises.push(ipcRenderer.invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave, collectionCopy.brunoConfig));
 
     // Save bruno.json if brunoConfig is provided or if there's a brunoConfig draft
     const brunoConfigToSave = brunoConfig || (collectionCopy.draft && collectionCopy.draft.brunoConfig);
     if (brunoConfigToSave) {
-      savePromises.push(ipcRenderer.invoke('renderer:update-bruno-config', brunoConfigToSave, collectionCopy.pathname, collectionUid));
+      savePromises.push(ipcRenderer.invoke('renderer:update-bruno-config', brunoConfigToSave, collectionCopy.pathname, collectionCopy.root));
     }
 
     Promise.all(savePromises)
       .then(() => {
-        toast.success('Collection Settings saved successfully');
+        if (!silent) {
+          toast.success('Collection Settings saved successfully');
+        }
         dispatch(saveCollectionDraft({ collectionUid }));
       })
       .then(resolve)
@@ -1796,7 +2253,7 @@ export const updateBrunoConfig = (brunoConfig, collectionUid) => (dispatch, getS
 
     const { ipcRenderer } = window;
     ipcRenderer
-      .invoke('renderer:update-bruno-config', brunoConfig, collection.pathname, collectionUid)
+      .invoke('renderer:update-bruno-config', brunoConfig, collection.pathname, collection.root)
       .then(resolve)
       .catch(reject);
   });
@@ -1826,6 +2283,28 @@ export const openCollectionEvent = (uid, pathname, brunoConfig) => (dispatch, ge
           if (state.app.sidebarCollapsed) {
             dispatch(toggleSidebarCollapse());
           }
+
+          const activeWorkspace = state.workspaces.workspaces.find((w) => w.uid === state.workspaces.activeWorkspaceUid);
+          if (activeWorkspace) {
+            const isAlreadyInWorkspace = activeWorkspace.collections?.some((c) => c.path === pathname);
+
+            if (!isAlreadyInWorkspace) {
+              const workspaceCollection = {
+                name: brunoConfig.name,
+                path: pathname
+              };
+
+              // The electron handler will automatically trigger workspace config update
+              // which will cause the app to react and reload collections
+              ipcRenderer
+                .invoke('renderer:add-collection-to-workspace', activeWorkspace.pathname, workspaceCollection)
+                .catch((err) => {
+                  console.error('Failed to add collection to workspace', err);
+                  toast.error('Failed to add collection to workspace');
+                });
+            }
+          }
+
           resolve();
         })
         .catch(reject);
@@ -1833,12 +2312,23 @@ export const openCollectionEvent = (uid, pathname, brunoConfig) => (dispatch, ge
   });
 };
 
-export const createCollection = (collectionName, collectionFolderName, collectionLocation) => () => {
+export const createCollection = (collectionName, collectionFolderName, collectionLocation, options = {}) => (dispatch, getState) => {
   const { ipcRenderer } = window;
 
+  if (!options.workspaceId) {
+    const { workspaces } = getState();
+    const activeWorkspace = workspaces.workspaces.find((w) => w.uid === workspaces.activeWorkspaceUid);
+
+    if (activeWorkspace && activeWorkspace.pathname) {
+      options.workspaceId = activeWorkspace.pathname;
+    } else {
+      options.workspaceId = 'default';
+    }
+  }
+
   return new Promise((resolve, reject) => {
     ipcRenderer
-      .invoke('renderer:create-collection', collectionName, collectionFolderName, collectionLocation)
+      .invoke('renderer:create-collection', collectionName, collectionFolderName, collectionLocation, options)
       .then(resolve)
       .catch(reject);
   });
@@ -1854,11 +2344,34 @@ export const cloneCollection = (collectionName, collectionFolderName, collection
     previousPath
   );
 };
-export const openCollection = () => () => {
+export const openCollection = (options = {}) => (dispatch, getState) => {
   return new Promise((resolve, reject) => {
     const { ipcRenderer } = window;
 
-    ipcRenderer.invoke('renderer:open-collection').then(resolve).catch(reject);
+    const state = getState();
+    const activeWorkspace = state.workspaces.workspaces.find((w) => w.uid === state.workspaces.activeWorkspaceUid);
+
+    if (!options.workspaceId) {
+      options.workspaceId = activeWorkspace?.pathname || 'default';
+    }
+
+    ipcRenderer.invoke('renderer:open-collection', options)
+      .then((result) => {
+        resolve(result);
+      })
+      .catch(reject);
+  });
+};
+
+export const openMultipleCollections = (collectionPaths, options = {}) => () => {
+  return new Promise((resolve, reject) => {
+    const { ipcRenderer } = window;
+
+    ipcRenderer.invoke('renderer:open-multiple-collections', collectionPaths, options)
+      .then(resolve)
+      .catch((err) => {
+        reject();
+      });
   });
 };
 
@@ -1887,28 +2400,38 @@ export const collectionAddEnvFileEvent = (payload) => (dispatch, getState) => {
   });
 };
 
-export const importCollection = (collection, collectionLocation) => (dispatch, getState) => {
-  return new Promise((resolve, reject) => {
+export const importCollection = (collection, collectionLocation, options = {}) => (dispatch, getState) => {
+  return new Promise(async (resolve, reject) => {
     const { ipcRenderer } = window;
 
-    ipcRenderer.invoke('renderer:import-collection', collection, collectionLocation).then(resolve).catch(reject);
+    try {
+      const state = getState();
+      const activeWorkspace = state.workspaces.workspaces.find((w) => w.uid === state.workspaces.activeWorkspaceUid);
+
+      const collectionPath = await ipcRenderer.invoke('renderer:import-collection', collection, collectionLocation);
+
+      if (activeWorkspace && activeWorkspace.pathname && activeWorkspace.type !== 'default') {
+        const workspaceCollection = {
+          name: collection.name,
+          path: collectionPath
+        };
+
+        await ipcRenderer.invoke('renderer:add-collection-to-workspace', activeWorkspace.pathname, workspaceCollection);
+      }
+
+      resolve(collectionPath);
+    } catch (error) {
+      reject(error);
+    }
   });
 };
 
-export const moveCollectionAndPersist =
-  ({ draggedItem, targetItem }) =>
-  (dispatch, getState) => {
-    dispatch(moveCollection({ draggedItem, targetItem }));
-
-    return new Promise((resolve, reject) => {
-      const { ipcRenderer } = window;
-      const state = getState();
-
-      const collectionPaths = state.collections.collections.map((collection) => collection.pathname);
-
-      ipcRenderer.invoke('renderer:update-collection-paths', collectionPaths).then(resolve).catch(reject);
-    });
-  };
+export const moveCollectionAndPersist
+  = ({ draggedItem, targetItem }) =>
+    (dispatch, getState) => {
+      dispatch(moveCollection({ draggedItem, targetItem }));
+      return Promise.resolve();
+    };
 
 export const saveCollectionSecurityConfig = (collectionUid, securityConfig) => (dispatch, getState) => {
   return new Promise((resolve, reject) => {
@@ -2027,48 +2550,48 @@ export const clearOauth2Cache = (payload) => async (dispatch, getState) => {
 };
 
 // todo: could be removed
-export const loadRequestViaWorker =
-  ({ collectionUid, pathname }) =>
-  (dispatch, getState) => {
-    return new Promise(async (resolve, reject) => {
-      const { ipcRenderer } = window;
-      ipcRenderer.invoke('renderer:load-request-via-worker', { collectionUid, pathname }).then(resolve).catch(reject);
-    });
-  };
+export const loadRequestViaWorker
+  = ({ collectionUid, pathname }) =>
+    (dispatch, getState) => {
+      return new Promise(async (resolve, reject) => {
+        const { ipcRenderer } = window;
+        ipcRenderer.invoke('renderer:load-request-via-worker', { collectionUid, pathname }).then(resolve).catch(reject);
+      });
+    };
 
 // todo: could be removed
-export const loadRequest =
-  ({ collectionUid, pathname }) =>
-  (dispatch, getState) => {
-    return new Promise(async (resolve, reject) => {
-      const { ipcRenderer } = window;
-      ipcRenderer.invoke('renderer:load-request', { collectionUid, pathname }).then(resolve).catch(reject);
-    });
-  };
+export const loadRequest
+  = ({ collectionUid, pathname }) =>
+    (dispatch, getState) => {
+      return new Promise(async (resolve, reject) => {
+        const { ipcRenderer } = window;
+        ipcRenderer.invoke('renderer:load-request', { collectionUid, pathname }).then(resolve).catch(reject);
+      });
+    };
 
-export const loadLargeRequest =
-  ({ collectionUid, pathname }) =>
-  (dispatch, getState) => {
-    return new Promise(async (resolve, reject) => {
-      const { ipcRenderer } = window;
-      ipcRenderer.invoke('renderer:load-large-request', { collectionUid, pathname }).then(resolve).catch(reject);
-    });
-  };
+export const loadLargeRequest
+  = ({ collectionUid, pathname }) =>
+    (dispatch, getState) => {
+      return new Promise(async (resolve, reject) => {
+        const { ipcRenderer } = window;
+        ipcRenderer.invoke('renderer:load-large-request', { collectionUid, pathname }).then(resolve).catch(reject);
+      });
+    };
 
-export const mountCollection =
-  ({ collectionUid, collectionPathname, brunoConfig }) =>
-  (dispatch, getState) => {
-    dispatch(updateCollectionMountStatus({ collectionUid, mountStatus: 'mounting' }));
-    return new Promise(async (resolve, reject) => {
-      callIpc('renderer:mount-collection', { collectionUid, collectionPathname, brunoConfig })
-        .then(() => dispatch(updateCollectionMountStatus({ collectionUid, mountStatus: 'mounted' })))
-        .then(resolve)
-        .catch(() => {
-          dispatch(updateCollectionMountStatus({ collectionUid, mountStatus: 'unmounted' }));
-          reject();
-        });
-    });
-  };
+export const mountCollection
+  = ({ collectionUid, collectionPathname, brunoConfig }) =>
+    (dispatch, getState) => {
+      dispatch(updateCollectionMountStatus({ collectionUid, mountStatus: 'mounting' }));
+      return new Promise(async (resolve, reject) => {
+        callIpc('renderer:mount-collection', { collectionUid, collectionPathname, brunoConfig })
+          .then(() => dispatch(updateCollectionMountStatus({ collectionUid, mountStatus: 'mounted' })))
+          .then(resolve)
+          .catch(() => {
+            dispatch(updateCollectionMountStatus({ collectionUid, mountStatus: 'unmounted' }));
+            reject();
+          });
+      });
+    };
 
 export const showInFolder = (collectionPath) => () => {
   return new Promise((resolve, reject) => {
@@ -2077,8 +2600,8 @@ export const showInFolder = (collectionPath) => () => {
   });
 };
 
-export const updateRunnerConfiguration =
-  (collectionUid, selectedRequestItems, requestItemsOrder, delay) => (dispatch) => {
+export const updateRunnerConfiguration
+  = (collectionUid, selectedRequestItems, requestItemsOrder, delay) => (dispatch) => {
     dispatch(
       _updateRunnerConfiguration({
         collectionUid,
@@ -2093,32 +2616,28 @@ export const updateActiveConnectionsInStore = (activeConnectionIds) => (dispatch
   dispatch(updateActiveConnections(activeConnectionIds));
 };
 
-export const openCollectionSettings =
-  (collectionUid, tabName = 'overview') =>
-  (dispatch, getState) => {
-    const state = getState();
-    const collection = findCollectionByUid(state.collections.collections, collectionUid);
+export const openCollectionSettings
+  = (collectionUid, tabName = 'overview') =>
+    (dispatch, getState) => {
+      const state = getState();
+      const collection = findCollectionByUid(state.collections.collections, collectionUid);
 
-    return new Promise((resolve, reject) => {
-      if (!collection) {
-        return reject(new Error('Collection not found'));
-      }
+      return new Promise((resolve, reject) => {
+        if (!collection) {
+          return reject(new Error('Collection not found'));
+        }
 
-      dispatch(
-        updateSettingsSelectedTab({
+        dispatch(updateSettingsSelectedTab({
           collectionUid: collection.uid,
           tab: tabName
-        })
-      );
+        }));
 
-      dispatch(
-        addTab({
+        dispatch(addTab({
           uid: collection.uid,
           collectionUid: collection.uid,
           type: 'collection-settings'
-        })
-      );
+        }));
 
-      resolve();
-    });
-  };
+        resolve();
+      });
+    };
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
index e6c7ae880..233c8b7de 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
@@ -2,6 +2,7 @@ import { parseQueryParams, buildQueryString as stringifyQueryParams } from '@use
 import { uuid } from 'utils/common';
 import { find, map, forOwn, concat, filter, each, cloneDeep, get, set, findIndex } from 'lodash';
 import { createSlice } from '@reduxjs/toolkit';
+import { hexy as hexdump } from 'hexy';
 import {
   addDepth,
   areItemsTheSameExceptSeqUpdate,
@@ -83,8 +84,8 @@ const initiatedGrpcResponse = {
   isError: false,
   duration: 0,
   responses: [],
-  timestamp: Date.now(),
-}
+  timestamp: Date.now()
+};
 
 const initiatedWsResponse = {
   status: 'PENDING',
@@ -119,6 +120,14 @@ export const collectionsSlice = createSlice({
       // values can be 'unmounted', 'mounting', 'mounted'
       collection.mountStatus = 'unmounted';
 
+      // Add format property from brunoConfig for easy access
+      // YAML collections have 'opencollection' field, BRU collections have 'version' field
+      if (collection.brunoConfig?.opencollection) {
+        collection.format = 'yml';
+      } else {
+        collection.format = collection.brunoConfig?.format || 'bru';
+      }
+
       // TODO: move this to use the nextAction approach
       // last action is used to track the last action performed on the collection
       // this is optional
@@ -181,7 +190,7 @@ export const collectionsSlice = createSlice({
     },
     sortCollections: (state, action) => {
       state.collectionSortOrder = action.payload.order;
-      const collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
+      const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
       switch (action.payload.order) {
         case 'default':
           state.collections = state.collections.sort((a, b) => a.importedAt - b.importedAt);
@@ -380,36 +389,44 @@ export const collectionsSlice = createSlice({
       if (collection) {
         const item = findItemInCollection(collection, itemUid);
         if (item) {
-          item.response = null;
+          if (item.response?.stream?.running) {
+            item.response.stream.running = null;
+
+            const startTimestamp = item.requestSent.timestamp;
+            item.response.duration = startTimestamp ? Date.now() - startTimestamp : item.response.duration;
+            item.response.data = [{ type: 'info', timestamp: Date.now(), message: 'Connection Closed' }].concat(item.response.data);
+          } else {
+            item.response = null;
+            item.requestUid = null;
+          }
           item.cancelTokenUid = null;
-          item.requestUid = null;
           item.requestStartTime = null;
         }
       }
     },
     responseReceived: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
-    
+
       if (collection) {
         const item = findItemInCollection(collection, action.payload.itemUid);
         if (item) {
           item.requestState = 'received';
           item.response = action.payload.response;
-          item.cancelTokenUid = null;
+          item.cancelTokenUid = item.response.stream?.running ? item.cancelTokenUid : null;
           item.requestStartTime = null;
 
           if (!collection.timeline) {
             collection.timeline = [];
           }
-    
+
           // Ensure timestamp is a number (milliseconds since epoch)
-          const timestamp = item?.requestSent?.timestamp instanceof Date 
-            ? item.requestSent.timestamp.getTime() 
+          const timestamp = item?.requestSent?.timestamp instanceof Date
+            ? item.requestSent.timestamp.getTime()
             : item?.requestSent?.timestamp || Date.now();
 
           // Append the new timeline entry with numeric timestamp
           collection.timeline.push({
-            type: "request",
+            type: 'request',
             collectionUid: collection.uid,
             folderUid: null,
             itemUid: item.uid,
@@ -417,7 +434,7 @@ export const collectionsSlice = createSlice({
             data: {
               request: item.requestSent || item.request,
               response: action.payload.response,
-              timestamp: timestamp,
+              timestamp: timestamp
             }
           });
         }
@@ -427,7 +444,7 @@ export const collectionsSlice = createSlice({
       const { itemUid, collectionUid, eventType, eventData } = action.payload;
       const collection = findCollectionByUid(state.collections, collectionUid);
       if (!collection) return;
-      
+
       const item = findItemInCollection(collection, itemUid);
       if (!item) return;
       const request = item.draft ? item.draft.request : item.request;
@@ -447,7 +464,7 @@ export const collectionsSlice = createSlice({
       }
 
       collection.timeline.push({
-        type: "request",
+        type: 'request',
         eventType: eventType, // Add the specific gRPC event type
         collectionUid: collection.uid,
         folderUid: null,
@@ -456,36 +473,34 @@ export const collectionsSlice = createSlice({
         data: {
           request: eventData || item.requestSent || item.request,
           timestamp: Date.now(),
-          eventData: eventData,
+          eventData: eventData
         }
       });
-      
     },
     grpcResponseReceived: (state, action) => {
       const { itemUid, collectionUid, eventType, eventData } = action.payload;
       const collection = findCollectionByUid(state.collections, collectionUid);
-    
+
       if (!collection) return;
 
       const item = findItemInCollection(collection, itemUid);
 
       if (!item) return;
-      
+
       // Get current response state or create initial state
-      const currentResponse = item.response || initiatedGrpcResponse
+      const currentResponse = item.response || initiatedGrpcResponse;
       const timestamp = item?.requestSent?.timestamp;
       let updatedResponse = { ...currentResponse, duration: Date.now() - (timestamp || Date.now()) };
 
-      
       // Process based on event type
       switch (eventType) {
         case 'response':
           const { error, res } = eventData;
-          
+
           //  Handle error if present
           if (error) {
             const errorCode = error.code || 2; // Default to UNKNOWN if no code
-            
+
             updatedResponse.error = error.details || 'gRPC error occurred';
             updatedResponse.statusCode = errorCode;
             updatedResponse.statusText = grpcStatusCodes[errorCode] || 'UNKNOWN';
@@ -494,72 +509,72 @@ export const collectionsSlice = createSlice({
           }
 
           // Add response to list
-          updatedResponse.responses = res 
-            ? [...(currentResponse?.responses || []), res] 
+          updatedResponse.responses = res
+            ? [...(currentResponse?.responses || []), res]
             : [...(currentResponse?.responses || [])];
           break;
-          
+
         case 'metadata':
           updatedResponse.headers = eventData.metadata;
           updatedResponse.metadata = eventData.metadata;
           break;
-          
+
         case 'status':
           // Extract status info
           const statusCode = eventData.status?.code;
           const statusDetails = eventData.status?.details;
           const statusMetadata = eventData.status?.metadata;
-          
+
           // Set status based on actual code and details
           updatedResponse.statusCode = statusCode;
           updatedResponse.statusText = grpcStatusCodes[statusCode] || 'UNKNOWN';
           updatedResponse.statusDescription = statusDetails;
           updatedResponse.statusDetails = eventData.status;
-          
+
           // Store trailers (status metadata)
           if (statusMetadata) {
             updatedResponse.trailers = statusMetadata;
           }
-          
+
           // Handle error status (non-zero code)
           if (statusCode !== 0) {
             updatedResponse.isError = true;
             updatedResponse.error = statusDetails || `gRPC error with code ${statusCode} (${updatedResponse.statusText})`;
           }
-          
+
           break;
-          
+
         case 'error':
           // Extract error details
           const errorCode = eventData.error?.code || 2; // Default to UNKNOWN if no code
           const errorDetails = eventData.error?.details || eventData.error?.message;
           const errorMetadata = eventData.error?.metadata;
-          
+
           updatedResponse.isError = true;
           updatedResponse.error = errorDetails || 'Unknown gRPC error';
           updatedResponse.statusCode = errorCode;
           updatedResponse.statusText = grpcStatusCodes[errorCode] || 'UNKNOWN';
           updatedResponse.statusDescription = errorDetails;
-          
+
           // Store error metadata as trailers if present
           if (errorMetadata) {
             updatedResponse.trailers = errorMetadata;
           }
-          
+
           break;
-          
+
         case 'end':
-          state.activeConnections = state.activeConnections.filter(id => id !== itemUid);
+          state.activeConnections = state.activeConnections.filter((id) => id !== itemUid);
           break;
-          
+
         case 'cancel':
           updatedResponse.statusCode = 1; // CANCELLED
           updatedResponse.statusText = 'CANCELLED';
           updatedResponse.statusDescription = 'Stream cancelled by client or server';
-          state.activeConnections = state.activeConnections.filter(id => id !== itemUid);
+          state.activeConnections = state.activeConnections.filter((id) => id !== itemUid);
           break;
       }
-      
+
       item.requestState = 'received';
       item.response = updatedResponse;
 
@@ -570,7 +585,7 @@ export const collectionsSlice = createSlice({
 
       // Append the new timeline entry with specific gRPC event type
       collection.timeline.push({
-        type: "request",
+        type: 'request',
         eventType: eventType, // Add the specific gRPC event type
         collectionUid: collection.uid,
         folderUid: null,
@@ -580,7 +595,7 @@ export const collectionsSlice = createSlice({
           request: item.requestSent || item.request,
           response: updatedResponse,
           eventData: eventData, // Store the original event data
-          timestamp: Date.now(),
+          timestamp: Date.now()
         }
       });
     },
@@ -590,6 +605,11 @@ export const collectionsSlice = createSlice({
       if (collection) {
         const item = findItemInCollection(collection, action.payload.itemUid);
         if (item) {
+          if (item.response && item.response.stream?.running) {
+            item.response.data = '';
+            item.response.size = 0;
+            return;
+          }
           item.response = null;
         }
       }
@@ -607,7 +627,7 @@ export const collectionsSlice = createSlice({
 
       if (collection) {
         if (itemUid) {
-          collection.timeline = collection?.timeline?.filter(t => t?.itemUid !== itemUid);
+          collection.timeline = collection?.timeline?.filter((t) => t?.itemUid !== itemUid);
         }
       }
     },
@@ -758,6 +778,8 @@ export const collectionsSlice = createSlice({
             item.draft = cloneDeep(item);
           }
           item.draft.request.url = action.payload.url;
+          item.draft.request.params = item?.draft?.request?.params ?? [];
+          item.request.params = item?.request?.params ?? [];
 
           const parts = splitOnFirst(item?.draft?.request?.url, '?');
           const urlQueryParams = parseQueryParams(parts[1]);
@@ -861,7 +883,7 @@ export const collectionsSlice = createSlice({
             case 'ntlm':
               item.draft.request.auth.mode = 'ntlm';
               item.draft.request.auth.ntlm = action.payload.content;
-              break;              
+              break;
             case 'oauth2':
               item.draft.request.auth.mode = 'oauth2';
               item.draft.request.auth.oauth2 = action.payload.content;
@@ -916,7 +938,7 @@ export const collectionsSlice = createSlice({
       if (!item.draft) {
         item.draft = cloneDeep(item);
       }
-      const existingOtherParams = item.draft.request.params?.filter(p => p.type !== 'query') || [];
+      const existingOtherParams = item.draft.request.params?.filter((p) => p.type !== 'query') || [];
       const newQueryParams = map(params, ({ name = '', value = '', enabled = true }) => ({
         uid: uuid(),
         name,
@@ -960,13 +982,13 @@ export const collectionsSlice = createSlice({
 
           const queryParams = params.filter((param) => param.type === 'query');
           const pathParams = params.filter((param) => param.type === 'path');
-    
+
           // Reorder only query params based on updateReorderedItem
           const reorderedQueryParams = updateReorderedItem.map((uid) => {
             return queryParams.find((param) => param.uid === uid);
           });
           item.draft.request.params = [...reorderedQueryParams, ...pathParams];
-    
+
           // Update request URL
           const parts = splitOnFirst(item.draft.request.url, '?');
           const query = stringifyQueryParams(filter(item.draft.request.params, (p) => p.enabled && p.type === 'query'));
@@ -1163,7 +1185,7 @@ export const collectionsSlice = createSlice({
       if (!item.draft) {
         item.draft = cloneDeep(item);
       }
-      item.draft.request.headers = map(action.payload.headers, ({name = '', value = '', enabled = true}) => ({
+      item.draft.request.headers = map(action.payload.headers, ({ name = '', value = '', enabled = true }) => ({
         uid: uuid(),
         name: name,
         value: value,
@@ -1205,8 +1227,8 @@ export const collectionsSlice = createSlice({
       if (!folder || !isItemAFolder(folder)) {
         return;
       }
-      
-      folder.root.request.headers = map(headers, ({name = '', value = '', enabled = true}) => ({
+
+      folder.root.request.headers = map(headers, ({ name = '', value = '', enabled = true }) => ({
         uid: uuid(),
         name: name,
         value: value,
@@ -1380,16 +1402,16 @@ export const collectionsSlice = createSlice({
     },
     addFile: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
-    
+
       if (collection) {
         const item = findItemInCollection(collection, action.payload.itemUid);
-    
+
         if (item && isItemARequest(item)) {
           if (!item.draft) {
             item.draft = cloneDeep(item);
           }
           item.draft.request.body.file = item.draft.request.body.file || [];
-    
+
           item.draft.request.body.file.push({
             uid: uuid(),
             filePath: '',
@@ -1401,23 +1423,23 @@ export const collectionsSlice = createSlice({
     },
     updateFile: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
-    
+
       if (collection) {
         const item = findItemInCollection(collection, action.payload.itemUid);
-    
+
         if (item && isItemARequest(item)) {
           if (!item.draft) {
             item.draft = cloneDeep(item);
           }
-    
+
           const param = find(item.draft.request.body.file, (p) => p.uid === action.payload.param.uid);
-    
+
           if (param) {
             const contentType = mime.contentType(path.extname(action.payload.param.filePath));
             param.filePath = action.payload.param.filePath;
             param.contentType = action.payload.param.contentType || contentType || '';
             param.selected = action.payload.param.selected;
-    
+
             item.draft.request.body.file = item.draft.request.body.file.map((p) => {
               p.selected = p.uid === param.uid;
               return p;
@@ -1428,20 +1450,20 @@ export const collectionsSlice = createSlice({
     },
     deleteFile: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
-      
+
       if (collection) {
         const item = findItemInCollection(collection, action.payload.itemUid);
-        
+
         if (item && isItemARequest(item)) {
           if (!item.draft) {
             item.draft = cloneDeep(item);
           }
-          
+
           item.draft.request.body.file = filter(
             item.draft.request.body.file,
             (p) => p.uid !== action.payload.paramUid
           );
-    
+
           if (item.draft.request.body.file.length > 0) {
             item.draft.request.body.file[0].selected = true;
           }
@@ -1487,7 +1509,7 @@ export const collectionsSlice = createSlice({
           if (!item.draft) {
             item.draft = cloneDeep(item);
           }
-          
+
           switch (item.draft.request.body.mode) {
             case 'json': {
               item.draft.request.body.json = action.payload.content;
@@ -1624,7 +1646,7 @@ export const collectionsSlice = createSlice({
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
 
       if (collection) {
-        const item = findItemInCollection(collection, action.payload.itemUid);    
+        const item = findItemInCollection(collection, action.payload.itemUid);
 
         if (item && isItemARequest(item)) {
           if (!item.draft) {
@@ -1714,6 +1736,7 @@ export const collectionsSlice = createSlice({
     addVar: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
       const type = action.payload.type;
+      const varData = action.payload.var || {};
 
       if (collection) {
         const item = findItemInCollection(collection, action.payload.itemUid);
@@ -1727,10 +1750,10 @@ export const collectionsSlice = createSlice({
             item.draft.request.vars.req = item.draft.request.vars.req || [];
             item.draft.request.vars.req.push({
               uid: uuid(),
-              name: '',
-              value: '',
-              local: false,
-              enabled: true
+              name: varData.name || '',
+              value: varData.value || '',
+              local: varData.local === true,
+              enabled: varData.enabled !== false
             });
           } else if (type === 'response') {
             item.draft.request.vars = item.draft.request.vars || {};
@@ -1820,17 +1843,17 @@ export const collectionsSlice = createSlice({
 
           // Extract payload data
           const { updateReorderedItem } = action.payload;
-          if(type == "request"){
+          if (type == 'request') {
             const params = item.draft.request.vars.req;
 
             item.draft.request.vars.req = updateReorderedItem.map((uid) => {
-            return params.find((param) => param.uid === uid);
-          });
+              return params.find((param) => param.uid === uid);
+            });
           } else if (type === 'response') {
             const params = item.draft.request.vars.res;
 
             item.draft.request.vars.res = updateReorderedItem.map((uid) => {
-            return params.find((param) => param.uid === uid);
+              return params.find((param) => param.uid === uid);
             });
           }
         }
@@ -1875,7 +1898,7 @@ export const collectionsSlice = createSlice({
             break;
           case 'ntlm':
             set(collection, 'draft.root.request.auth.ntlm', action.payload.content);
-            break;            
+            break;
           case 'oauth2':
             set(collection, 'draft.root.request.auth.oauth2', action.payload.content);
             break;
@@ -1968,22 +1991,6 @@ export const collectionsSlice = createSlice({
         set(collection, 'draft.brunoConfig.clientCertificates', action.payload.clientCertificates);
       }
     },
-    updateCollectionPresets: (state, action) => {
-      const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
-
-      if (collection) {
-        if (!collection.draft) {
-          collection.draft = {
-            root: cloneDeep(collection.root),
-            brunoConfig: cloneDeep(collection.brunoConfig)
-          };
-        }
-        if (!collection.draft.brunoConfig) {
-          collection.draft.brunoConfig = cloneDeep(collection.brunoConfig);
-        }
-        set(collection, 'draft.brunoConfig.presets', action.payload.presets);
-      }
-    },
     updateCollectionProtobuf: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
 
@@ -2051,6 +2058,7 @@ export const collectionsSlice = createSlice({
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
       const folder = collection ? findItemInCollection(collection, action.payload.folderUid) : null;
       const type = action.payload.type;
+      const varData = action.payload.var || {};
       if (folder) {
         if (!folder.draft) {
           folder.draft = cloneDeep(folder.root);
@@ -2059,9 +2067,9 @@ export const collectionsSlice = createSlice({
           const vars = get(folder, 'draft.request.vars.req', []);
           vars.push({
             uid: uuid(),
-            name: '',
-            value: '',
-            enabled: true
+            name: varData.name || '',
+            value: varData.value || '',
+            enabled: varData.enabled !== false
           });
           set(folder, 'draft.request.vars.req', vars);
         } else if (type === 'response') {
@@ -2256,6 +2264,7 @@ export const collectionsSlice = createSlice({
     addCollectionVar: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
       const type = action.payload.type;
+      const varData = action.payload.var || {};
       if (collection) {
         if (!collection.draft) {
           collection.draft = {
@@ -2266,9 +2275,9 @@ export const collectionsSlice = createSlice({
           const vars = get(collection, 'draft.root.request.vars.req', []);
           vars.push({
             uid: uuid(),
-            name: '',
-            value: '',
-            enabled: true
+            name: varData.name || '',
+            value: varData.value || '',
+            enabled: varData.enabled !== false
           });
           set(collection, 'draft.root.request.vars.req', vars);
         } else if (type === 'response') {
@@ -2277,6 +2286,7 @@ export const collectionsSlice = createSlice({
             uid: uuid(),
             name: '',
             value: '',
+            local: false,
             enabled: true
           });
           set(collection, 'draft.root.request.vars.res', vars);
@@ -2377,7 +2387,7 @@ export const collectionsSlice = createSlice({
               name: directoryName,
               collapsed: true,
               type: 'folder',
-              items: [],
+              items: []
             };
             currentSubItems.push(childItem);
           }
@@ -2548,6 +2558,7 @@ export const collectionsSlice = createSlice({
 
         if (existingEnv) {
           const prevEphemerals = (existingEnv.variables || []).filter((v) => v.ephemeral);
+          existingEnv.name = environment.name;
           existingEnv.variables = environment.variables;
           /*
            Apply temporary (ephemeral) values only to variables that actually exist in the file. This prevents deleted temporaries from “popping back” after a save. If a variable is present in the file, we temporarily override the UI value while also remembering the on-disk value in persistedValue for future saves.
@@ -2604,7 +2615,7 @@ export const collectionsSlice = createSlice({
       const { requestUid, itemUid, collectionUid } = action.payload;
       const collection = findCollectionByUid(state.collections, collectionUid);
       if (!collection) return;
-      
+
       const item = findItemInCollection(collection, itemUid);
       if (!item) return;
 
@@ -2633,11 +2644,11 @@ export const collectionsSlice = createSlice({
             item.preRequestScriptErrorMessage = action.payload.errorMessage;
           }
 
-          if(type === 'post-response-script-execution') {
+          if (type === 'post-response-script-execution') {
             item.postResponseScriptErrorMessage = action.payload.errorMessage;
           }
 
-          if(type === 'test-script-execution') {
+          if (type === 'test-script-execution') {
             item.testScriptErrorMessage = action.payload.errorMessage;
           }
 
@@ -2652,7 +2663,7 @@ export const collectionsSlice = createSlice({
           if (type === 'request-sent') {
             const { cancelTokenUid, requestSent } = action.payload;
             item.requestSent = requestSent;
-            
+
             // sometimes the response is received before the request-sent event arrives
             if (item.requestState === 'queued') {
               item.requestState = 'sending';
@@ -2669,12 +2680,12 @@ export const collectionsSlice = createSlice({
             const { results } = action.payload;
             item.testResults = results;
           }
-          
+
           if (type === 'test-results-pre-request') {
             const { results } = action.payload;
             item.preRequestTestResults = results;
           }
-          
+
           if (type === 'test-results-post-response') {
             const { results } = action.payload;
             item.postResponseTestResults = results;
@@ -2788,7 +2799,7 @@ export const collectionsSlice = createSlice({
 
       if (collection) {
         collection.runnerResult = null;
-        collection.runnerTags = { include: [], exclude: [] }
+        collection.runnerTags = { include: [], exclude: [] };
         collection.runnerTagsEnabled = false;
         collection.runnerConfiguration = null;
       }
@@ -2861,14 +2872,14 @@ export const collectionsSlice = createSlice({
       );
 
       // Add the new credential with folderUid and itemUid
-      filteredOauth2Credentials.push({ 
-        collectionUid, 
-        folderUid, 
-        itemUid, 
-        url, 
+      filteredOauth2Credentials.push({
+        collectionUid,
+        folderUid,
+        itemUid,
+        url,
         credentials,
         credentialsId,
-        debugInfo 
+        debugInfo
       });
 
       collection.oauth2Credentials = filteredOauth2Credentials;
@@ -2877,9 +2888,9 @@ export const collectionsSlice = createSlice({
         collection.timeline = [];
       }
 
-      if(debugInfo) {
+      if (debugInfo) {
         collection.timeline.push({
-          type: "oauth2",
+          type: 'oauth2',
           collectionUid,
           folderUid,
           itemUid,
@@ -2891,7 +2902,7 @@ export const collectionsSlice = createSlice({
             url,
             credentials,
             credentialsId,
-            debugInfo: debugInfo.data,
+            debugInfo: debugInfo.data
           }
         });
       }
@@ -2927,7 +2938,7 @@ export const collectionsSlice = createSlice({
     updateFolderAuthMode: (state, action) => {
       const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
       const folder = collection ? findItemInCollection(collection, action.payload.folderUid) : null;
-      
+
       if (folder) {
         if (!folder.draft) {
           folder.draft = cloneDeep(folder.root);
@@ -2936,7 +2947,25 @@ export const collectionsSlice = createSlice({
         set(folder, 'draft.request.auth.mode', action.payload.mode);
       }
     },
+    streamDataReceived: (state, action) => {
+      const { itemUid, collectionUid, data } = action.payload;
+      const collection = findCollectionByUid(state.collections, collectionUid);
 
+      if (collection) {
+        const item = findItemInCollection(collection, itemUid);
+        if (data.data) {
+          item.response.data ||= [];
+          item.response.data = [{
+            type: 'incoming',
+            message: data.data,
+            messageHexdump: hexdump(data.data),
+            timestamp: Date.now()
+          }].concat(item.response.data);
+        }
+        item.response.dataBuffer = Buffer.concat([Buffer.from(item.response.dataBuffer), Buffer.from(data.dataBuffer)]);
+        item.response.size = data.data?.length + (item.response.size || 0);
+      }
+    },
     addRequestTag: (state, action) => {
       const { tag, collectionUid, itemUid } = action.payload;
       const collection = findCollectionByUid(state.collections, collectionUid);
@@ -2978,7 +3007,7 @@ export const collectionsSlice = createSlice({
     updateCollectionTagsList: (state, action) => {
       const { collectionUid } = action.payload;
       const collection = findCollectionByUid(state.collections, collectionUid);
-      
+
       if (collection) {
         collection.allTags = getUniqueTagsFromItems(collection.items);
       }
@@ -3279,7 +3308,6 @@ export const {
   updateCollectionDocs,
   updateCollectionProxy,
   updateCollectionClientCertificates,
-  updateCollectionPresets,
   updateCollectionProtobuf,
   collectionAddFileEvent,
   collectionAddDirectoryEvent,
@@ -3298,6 +3326,7 @@ export const {
   updateRequestDocs,
   updateFolderDocs,
   moveCollection,
+  streamDataReceived,
   collectionAddOauth2CredentialsByUrl,
   collectionClearOauth2CredentialsByUrl,
   collectionGetOauth2CredentialsByUrl,
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/global-environments.js b/packages/bruno-app/src/providers/ReduxStore/slices/global-environments.js
index 8e8effd1e..0e5503593 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/global-environments.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/global-environments.js
@@ -29,7 +29,7 @@ export const globalEnvironmentsSlice = createSlice({
     _saveGlobalEnvironment: (state, action) => {
       const { environmentUid: globalEnvironmentUid, variables } = action.payload;
       if (globalEnvironmentUid) {
-        const environment = state.globalEnvironments.find(env => env?.uid == globalEnvironmentUid);
+        const environment = state.globalEnvironments.find((env) => env?.uid == globalEnvironmentUid);
         if (environment) {
           environment.variables = variables;
         }
@@ -38,7 +38,7 @@ export const globalEnvironmentsSlice = createSlice({
     _renameGlobalEnvironment: (state, action) => {
       const { environmentUid: globalEnvironmentUid, name } = action.payload;
       if (globalEnvironmentUid) {
-        const environment = state.globalEnvironments.find(env => env?.uid == globalEnvironmentUid);
+        const environment = state.globalEnvironments.find((env) => env?.uid == globalEnvironmentUid);
         if (environment) {
           environment.name = name;
         }
@@ -57,7 +57,7 @@ export const globalEnvironmentsSlice = createSlice({
     _selectGlobalEnvironment: (state, action) => {
       const { environmentUid: globalEnvironmentUid } = action.payload;
       if (globalEnvironmentUid) {
-        const environment = state.globalEnvironments.find(env => env?.uid == globalEnvironmentUid);
+        const environment = state.globalEnvironments.find((env) => env?.uid == globalEnvironmentUid);
         if (environment) {
           state.activeGlobalEnvironmentUid = globalEnvironmentUid;
         }
@@ -68,7 +68,7 @@ export const globalEnvironmentsSlice = createSlice({
     _deleteGlobalEnvironment: (state, action) => {
       const { environmentUid: uid } = action.payload;
       if (uid) {
-        state.globalEnvironments = state.globalEnvironments.filter(env => env?.uid !== uid);
+        state.globalEnvironments = state.globalEnvironments.filter((env) => env?.uid !== uid);
         if (uid === state.activeGlobalEnvironmentUid) {
           state.activeGlobalEnvironmentUid = null;
         }
@@ -87,19 +87,31 @@ export const {
   _deleteGlobalEnvironment
 } = globalEnvironmentsSlice.actions;
 
-export const addGlobalEnvironment = ({ name, variables = [] }) => (dispatch) => {
+const getWorkspaceContext = (state) => {
+  const workspaceUid = state.workspaces?.activeWorkspaceUid;
+  const workspace = state.workspaces?.workspaces?.find((w) => w.uid === workspaceUid);
+  return { workspaceUid, workspacePath: workspace?.pathname };
+};
+
+export const addGlobalEnvironment = ({ name, variables = [] }) => (dispatch, getState) => {
   return new Promise((resolve, reject) => {
     const uid = uuid();
-    let environment = { name, uid, variables };
+    const environment = { name, uid, variables };
     const { ipcRenderer } = window;
+    const state = getState();
+    const { workspaceUid, workspacePath } = getWorkspaceContext(state);
+
     environmentSchema
       .validate(environment)
-      .then(() => ipcRenderer.invoke('renderer:create-global-environment', { name, uid, variables }))
+      .then(() => ipcRenderer.invoke('renderer:create-global-environment', { name, uid, variables, workspaceUid, workspacePath }))
       .then((result) => {
+        const finalUid = result?.uid || uid;
         const finalName = result?.name || name;
-        dispatch(_addGlobalEnvironment({ name: finalName, uid, variables }));
+        const finalVariables = result?.variables || variables;
+        dispatch(_addGlobalEnvironment({ name: finalName, uid: finalUid, variables: finalVariables }));
+        return finalUid;
       })
-      .then(() => dispatch(selectGlobalEnvironment({ environmentUid: uid })))
+      .then((finalUid) => dispatch(selectGlobalEnvironment({ environmentUid: finalUid })))
       .then(resolve)
       .catch(reject);
   });
@@ -108,17 +120,24 @@ export const addGlobalEnvironment = ({ name, variables = [] }) => (dispatch) =>
 export const copyGlobalEnvironment = ({ name, environmentUid: baseEnvUid }) => (dispatch, getState) => {
   return new Promise((resolve, reject) => {
     const state = getState();
+    const { workspaceUid, workspacePath } = getWorkspaceContext(state);
     const globalEnvironments = state.globalEnvironments.globalEnvironments;
-    const baseEnv = globalEnvironments?.find(env => env?.uid == baseEnvUid)
+    const baseEnv = globalEnvironments?.find((env) => env?.uid == baseEnvUid);
+    if (!baseEnv) {
+      return reject(new Error('Base environment not found'));
+    }
     const uid = uuid();
-    let environment = { uid, name, variables: baseEnv.variables };
+    const environment = { uid, name, variables: baseEnv.variables };
     const { ipcRenderer } = window;
+
     environmentSchema
       .validate(environment)
-      .then(() => ipcRenderer.invoke('renderer:create-global-environment', { uid, name, variables: baseEnv.variables }))
+      .then(() => ipcRenderer.invoke('renderer:create-global-environment', { uid, name, variables: baseEnv.variables, workspaceUid, workspacePath }))
       .then((result) => {
+        const finalUid = result?.uid || uid;
         const finalName = result?.name || name;
-        dispatch(_copyGlobalEnvironment({ name: finalName, uid, variables: baseEnv.variables }));
+        const finalVariables = result?.variables || baseEnv.variables;
+        dispatch(_copyGlobalEnvironment({ name: finalName, uid: finalUid, variables: finalVariables }));
       })
       .then(resolve)
       .catch(reject);
@@ -129,15 +148,26 @@ export const renameGlobalEnvironment = ({ name: newName, environmentUid }) => (d
   return new Promise((resolve, reject) => {
     const { ipcRenderer } = window;
     const state = getState();
+    const { workspaceUid, workspacePath } = getWorkspaceContext(state);
     const globalEnvironments = state.globalEnvironments.globalEnvironments;
-    const environment = globalEnvironments?.find(env => env?.uid == environmentUid)
+    const environment = globalEnvironments?.find((env) => env?.uid == environmentUid);
     if (!environment) {
       return reject(new Error('Environment not found'));
     }
     environmentSchema
       .validate(environment)
-      .then(() => ipcRenderer.invoke('renderer:rename-global-environment', { name: newName, environmentUid }))
-      .then(() => dispatch(_renameGlobalEnvironment({ name: newName, environmentUid })))
+      .then(() => ipcRenderer.invoke('renderer:rename-global-environment', { name: newName, environmentUid, workspaceUid, workspacePath }))
+      .then((result) => {
+        const resolvedUid = result?.uid || environmentUid;
+        dispatch(_renameGlobalEnvironment({ name: newName, environmentUid: resolvedUid }));
+        return ipcRenderer
+          .invoke('renderer:get-global-environments', { workspaceUid, workspacePath })
+          .then((data) => {
+            dispatch(updateGlobalEnvironments(data));
+            return resolvedUid;
+          });
+      })
+      .then((resolvedUid) => dispatch(_selectGlobalEnvironment({ environmentUid: resolvedUid })))
       .then(resolve)
       .catch(reject);
   });
@@ -146,35 +176,47 @@ export const renameGlobalEnvironment = ({ name: newName, environmentUid }) => (d
 export const saveGlobalEnvironment = ({ variables, environmentUid }) => (dispatch, getState) => {
   return new Promise((resolve, reject) => {
     const state = getState();
+    const { workspaceUid, workspacePath } = getWorkspaceContext(state);
     const globalEnvironments = state.globalEnvironments.globalEnvironments;
-    const environment = globalEnvironments?.find(env => env?.uid == environmentUid);
+    let environment = globalEnvironments?.find((env) => env?.uid == environmentUid);
+    if (!environment) {
+      const activeUid = state.globalEnvironments?.activeGlobalEnvironmentUid;
+      const activeEnv = globalEnvironments?.find((env) => env?.uid == activeUid);
+      if (activeEnv) {
+        environment = activeEnv;
+        environmentUid = activeEnv.uid;
+      }
+    }
 
     if (!environment) {
       return reject(new Error('Environment not found'));
     }
 
-    let environmentToSave = { ...environment, variables };
-
+    const environmentToSave = { ...environment, variables };
     const { ipcRenderer } = window;
+
     environmentSchema
       .validate(environmentToSave)
       .then(() => ipcRenderer.invoke('renderer:save-global-environment', {
         environmentUid,
-        variables
+        variables,
+        workspaceUid,
+        workspacePath
       }))
       .then(() => dispatch(_saveGlobalEnvironment({ environmentUid, variables })))
       .then(resolve)
-      .catch((error) => {
-        reject(error);
-      });
+      .catch(reject);
   });
 };
 
 export const selectGlobalEnvironment = ({ environmentUid }) => (dispatch, getState) => {
   return new Promise((resolve, reject) => {
     const { ipcRenderer } = window;
+    const state = getState();
+    const { workspaceUid, workspacePath } = getWorkspaceContext(state);
+
     ipcRenderer
-      .invoke('renderer:select-global-environment', { environmentUid })
+      .invoke('renderer:select-global-environment', { environmentUid, workspaceUid, workspacePath })
       .then(() => dispatch(_selectGlobalEnvironment({ environmentUid })))
       .then(resolve)
       .catch(reject);
@@ -184,8 +226,11 @@ export const selectGlobalEnvironment = ({ environmentUid }) => (dispatch, getSta
 export const deleteGlobalEnvironment = ({ environmentUid }) => (dispatch, getState) => {
   return new Promise((resolve, reject) => {
     const { ipcRenderer } = window;
+    const state = getState();
+    const { workspaceUid, workspacePath } = getWorkspaceContext(state);
+
     ipcRenderer
-      .invoke('renderer:delete-global-environment', { environmentUid })
+      .invoke('renderer:delete-global-environment', { environmentUid, workspaceUid, workspacePath })
       .then(() => dispatch(_deleteGlobalEnvironment({ environmentUid })))
       .then(resolve)
       .catch(reject);
@@ -198,9 +243,10 @@ export const globalEnvironmentsUpdateEvent = ({ globalEnvironmentVariables }) =>
     if (!globalEnvironmentVariables) resolve();
 
     const state = getState();
+    const { workspaceUid, workspacePath } = getWorkspaceContext(state);
     const globalEnvironments = state?.globalEnvironments?.globalEnvironments || [];
     const environmentUid = state?.globalEnvironments?.activeGlobalEnvironmentUid;
-    const environment = globalEnvironments?.find(env => env?.uid == environmentUid);
+    const environment = globalEnvironments?.find((env) => env?.uid == environmentUid);
 
     if (!environment || !environmentUid) {
       return resolve();
@@ -210,16 +256,15 @@ export const globalEnvironmentsUpdateEvent = ({ globalEnvironmentVariables }) =>
 
     // "globalEnvironmentVariables" will include only the enabled variables and newly added variables created using the script.
     // Update the value of each variable if it's present in "globalEnvironmentVariables", otherwise keep the existing value.
-    variables = variables?.map?.(variable => ({
+    variables = variables?.map?.((variable) => ({
       ...variable,
       value: has(globalEnvironmentVariables, variable?.name)
         ? globalEnvironmentVariables[variable?.name]
         : variable?.value
     }));
 
-    // add new env values
     Object.entries(globalEnvironmentVariables)?.forEach?.(([key, value]) => {
-      let isAnExistingVariable = variables?.find(v => v?.name == key)
+      const isAnExistingVariable = variables?.find((v) => v?.name == key);
       if (!isAnExistingVariable) {
         variables.push({
           uid: uuid(),
@@ -232,21 +277,20 @@ export const globalEnvironmentsUpdateEvent = ({ globalEnvironmentVariables }) =>
       }
     });
 
-    let environmentToSave = { ...environment, variables };
+    const environmentToSave = { ...environment, variables };
 
     environmentSchema
       .validate(environmentToSave)
       .then(() => ipcRenderer.invoke('renderer:save-global-environment', {
         environmentUid,
-        variables
+        variables,
+        workspaceUid,
+        workspacePath
       }))
       .then(() => dispatch(_saveGlobalEnvironment({ environmentUid, variables })))
       .then(resolve)
-      .catch((error) => {
-        reject(error);
-      });
+      .catch(reject);
   });
-}
+};
 
-
-export default globalEnvironmentsSlice.reducer;
\ No newline at end of file
+export default globalEnvironmentsSlice.reducer;
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/logs.js b/packages/bruno-app/src/providers/ReduxStore/slices/logs.js
index a96f1ec90..71e5b844a 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/logs.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/logs.js
@@ -40,9 +40,9 @@ export const logsSlice = createSlice({
         args: args || [],
         timestamp: timestamp || new Date().toISOString()
       };
-      
+
       state.logs.push(newLog);
-      
+
       if (state.logs.length > state.maxLogs) {
         state.logs = state.logs.slice(-state.maxLogs);
       }
@@ -59,9 +59,9 @@ export const logsSlice = createSlice({
         args: args || [],
         timestamp: timestamp || new Date().toISOString()
       };
-      
+
       state.debugErrors.push(newError);
-      
+
       if (state.debugErrors.length > state.maxDebugErrors) {
         state.debugErrors = state.debugErrors.slice(-state.maxDebugErrors);
       }
@@ -93,7 +93,7 @@ export const logsSlice = createSlice({
     },
     toggleAllFilters: (state, action) => {
       const enabled = action.payload;
-      Object.keys(state.filters).forEach(key => {
+      Object.keys(state.filters).forEach((key) => {
         state.filters[key] = enabled;
       });
     },
@@ -103,7 +103,7 @@ export const logsSlice = createSlice({
     },
     toggleAllNetworkFilters: (state, action) => {
       const enabled = action.payload;
-      Object.keys(state.networkFilters).forEach(key => {
+      Object.keys(state.networkFilters).forEach((key) => {
         state.networkFilters[key] = enabled;
       });
     },
@@ -122,15 +122,15 @@ export const logsSlice = createSlice({
   }
 });
 
-export const { 
-  addLog, 
+export const {
+  addLog,
   addDebugError,
-  clearLogs, 
+  clearLogs,
   clearDebugErrors,
-  openConsole, 
-  closeConsole, 
+  openConsole,
+  closeConsole,
   setActiveTab,
-  updateFilter, 
+  updateFilter,
   toggleAllFilters,
   updateNetworkFilter,
   toggleAllNetworkFilters,
@@ -140,4 +140,4 @@ export const {
   clearSelectedError
 } = logsSlice.actions;
 
-export default logsSlice.reducer; 
\ No newline at end of file
+export default logsSlice.reducer;
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/notifications.js b/packages/bruno-app/src/providers/ReduxStore/slices/notifications.js
index 062f367ca..c03db6d6a 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/notifications.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/notifications.js
@@ -33,7 +33,7 @@ export const filterNotificationsByVersion = (notifications, currentVersion) => {
 
     if (!currentVersion) return notifications;
 
-    return notifications.filter(notification => {
+    return notifications.filter((notification) => {
       const { minVersion, maxVersion } = notification;
       if (!minVersion && !maxVersion) return true;
       if (!minVersion) return semver.lte(currentVersion, maxVersion);
@@ -103,10 +103,10 @@ export const notificationSlice = createSlice({
   }
 });
 
-export const { setNotifications, setFetchingStatus, markNotificationAsRead, markAllNotificationsAsRead } =
-  notificationSlice.actions;
+export const { setNotifications, setFetchingStatus, markNotificationAsRead, markAllNotificationsAsRead }
+  = notificationSlice.actions;
 
-export const fetchNotifications = ({currentVersion}) => (dispatch, getState) => {
+export const fetchNotifications = ({ currentVersion }) => (dispatch, getState) => {
   return new Promise((resolve) => {
     const { ipcRenderer } = window;
     dispatch(setFetchingStatus(true));
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/notifications.spec.js b/packages/bruno-app/src/providers/ReduxStore/slices/notifications.spec.js
index 80e84d9bd..887193743 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/notifications.spec.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/notifications.spec.js
@@ -53,9 +53,9 @@ describe('filterNotificationsByVersion - basic', () => {
 describe('filterNotificationsByVersion - semver', () => {
   it('should filter out notifications outside version range', () => {
     const notifications = [
-      { minVersion: '1.0.0', maxVersion: '1.1.0' },  // should be included
-      { minVersion: '2.0.0', maxVersion: '2.1.0' },  // should be filtered out
-      { minVersion: '0.5.0', maxVersion: '0.9.0' }   // should be filtered out
+      { minVersion: '1.0.0', maxVersion: '1.1.0' }, // should be included
+      { minVersion: '2.0.0', maxVersion: '2.1.0' }, // should be filtered out
+      { minVersion: '0.5.0', maxVersion: '0.9.0' } // should be filtered out
     ];
     const currentVersion = '1.0.5';
     const filteredNotifications = filterNotificationsByVersion(notifications, currentVersion);
@@ -66,10 +66,10 @@ describe('filterNotificationsByVersion - semver', () => {
 
   it('should handle mixed valid and invalid version ranges', () => {
     const notifications = [
-      { minVersion: '1.0.0', maxVersion: '2.0.0' },  // should be included
-      { minVersion: '3.0.0', maxVersion: '4.0.0' },  // should be filtered out
-      { minVersion: '1.5.0', maxVersion: '1.8.0' },  // should be included
-      { minVersion: '0.1.0', maxVersion: '0.5.0' }   // should be filtered out
+      { minVersion: '1.0.0', maxVersion: '2.0.0' }, // should be included
+      { minVersion: '3.0.0', maxVersion: '4.0.0' }, // should be filtered out
+      { minVersion: '1.5.0', maxVersion: '1.8.0' }, // should be included
+      { minVersion: '0.1.0', maxVersion: '0.5.0' } // should be filtered out
     ];
     const currentVersion = '1.6.0';
     const filteredNotifications = filterNotificationsByVersion(notifications, currentVersion);
@@ -81,9 +81,9 @@ describe('filterNotificationsByVersion - semver', () => {
 
   it('should handle edge cases of version ranges', () => {
     const notifications = [
-      { minVersion: '1.0.0', maxVersion: '1.0.0' },  // should be included
-      { minVersion: '1.0.1', maxVersion: '2.0.0' },  // should be filtered out
-      { minVersion: '0.9.9', maxVersion: '1.0.0' }   // should be included
+      { minVersion: '1.0.0', maxVersion: '1.0.0' }, // should be included
+      { minVersion: '1.0.1', maxVersion: '2.0.0' }, // should be filtered out
+      { minVersion: '0.9.9', maxVersion: '1.0.0' } // should be included
     ];
     const currentVersion = '1.0.0';
     const filteredNotifications = filterNotificationsByVersion(notifications, currentVersion);
@@ -130,4 +130,4 @@ describe('filterNotificationsByVersion - undefined version bounds', () => {
     const filteredNotifications = filterNotificationsByVersion(notifications, currentVersion);
     expect(filteredNotifications).toEqual([]);
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/tabs.js b/packages/bruno-app/src/providers/ReduxStore/slices/tabs.js
index 1692c3eeb..a6ffc9e0f 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/tabs.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/tabs.js
@@ -22,11 +22,11 @@ export const tabsSlice = createSlice({
       const { uid, collectionUid, type, requestPaneTab, preview, exampleUid, itemUid } = action.payload;
 
       const nonReplaceableTabTypes = [
-        "variables",
-        "collection-runner",
-        "security-settings",
+        'variables',
+        'collection-runner',
+        'security-settings'
       ];
-    
+
       const existingTab = find(state.tabs, (tab) => tab.uid === uid);
       if (existingTab) {
         state.activeTabUid = existingTab.uid;
@@ -60,7 +60,7 @@ export const tabsSlice = createSlice({
           type: type || 'request',
           preview: preview !== undefined
             ? preview
-          : !nonReplaceableTabTypes.includes(type),
+            : !nonReplaceableTabTypes.includes(type),
           ...(uid ? { folderUid: uid } : {}),
           ...(exampleUid ? { exampleUid } : {}),
           ...(itemUid ? { itemUid } : {})
@@ -69,7 +69,7 @@ export const tabsSlice = createSlice({
         state.activeTabUid = uid;
         return;
       }
-    
+
       state.tabs.push({
         uid,
         collectionUid,
@@ -80,7 +80,7 @@ export const tabsSlice = createSlice({
         type: type || 'request',
         ...(uid ? { folderUid: uid } : {}),
         preview: preview !== undefined
-            ? preview
+          ? preview
           : !nonReplaceableTabTypes.includes(type),
         ...(exampleUid ? { exampleUid } : {}),
         ...(itemUid ? { itemUid } : {})
@@ -117,6 +117,13 @@ export const tabsSlice = createSlice({
         tab.requestPaneWidth = action.payload.requestPaneWidth;
       }
     },
+    updateRequestPaneTabHeight: (state, action) => {
+      const tab = find(state.tabs, (t) => t.uid === action.payload.uid);
+
+      if (tab) {
+        tab.requestPaneHeight = action.payload.requestPaneHeight;
+      }
+    },
     updateRequestPaneTab: (state, action) => {
       const tab = find(state.tabs, (t) => t.uid === action.payload.uid);
 
@@ -218,6 +225,7 @@ export const {
   focusTab,
   switchTab,
   updateRequestPaneTabWidth,
+  updateRequestPaneTabHeight,
   updateRequestPaneTab,
   updateResponsePaneTab,
   updateResponsePaneScrollPosition,
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/workspaces/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/workspaces/actions.js
new file mode 100644
index 000000000..9e34212d0
--- /dev/null
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/workspaces/actions.js
@@ -0,0 +1,649 @@
+import path from 'path';
+import {
+  createWorkspace,
+  removeWorkspace,
+  setActiveWorkspace,
+  updateWorkspace,
+  addCollectionToWorkspace,
+  removeCollectionFromWorkspace,
+  updateWorkspaceLoadingState
+} from '../workspaces';
+import { showHomePage } from '../app';
+import { createCollection, openCollection, openMultipleCollections } from '../collections/actions';
+import { removeCollection } from '../collections';
+import { updateGlobalEnvironments } from '../global-environments';
+import toast from 'react-hot-toast';
+
+const { ipcRenderer } = window;
+
+const transformCollection = async (collection, type) => {
+  switch (type) {
+    case 'bruno': {
+      const { processBrunoCollection } = await import('utils/importers/bruno-collection');
+      return processBrunoCollection(collection);
+    }
+    case 'postman': {
+      const { postmanToBruno } = await import('utils/importers/postman-collection');
+      return postmanToBruno(collection);
+    }
+    case 'insomnia': {
+      const { convertInsomniaToBruno } = await import('utils/importers/insomnia-collection');
+      return convertInsomniaToBruno(collection);
+    }
+    case 'openapi': {
+      const { convertOpenapiToBruno } = await import('utils/importers/openapi-collection');
+      return convertOpenapiToBruno(collection);
+    }
+    case 'wsdl': {
+      const { wsdlToBruno } = await import('@usebruno/converters');
+      return wsdlToBruno(collection);
+    }
+    default:
+      throw new Error(`Unsupported collection type: ${type}`);
+  }
+};
+
+export const createWorkspaceAction = (workspaceName, workspaceFolderName, workspaceLocation) => {
+  return async (dispatch) => {
+    try {
+      const result = await ipcRenderer.invoke('renderer:create-workspace',
+        workspaceName,
+        workspaceFolderName,
+        workspaceLocation);
+
+      const { workspaceConfig, workspaceUid, workspacePath } = result;
+
+      dispatch(createWorkspace({
+        uid: workspaceUid,
+        name: workspaceName,
+        pathname: workspacePath,
+        ...workspaceConfig
+      }));
+
+      await dispatch(switchWorkspace(workspaceUid));
+
+      return result;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const openWorkspace = () => {
+  return async (dispatch) => {
+    try {
+      const workspacePath = await ipcRenderer.invoke('renderer:browse-directory');
+      if (workspacePath) {
+        const result = await ipcRenderer.invoke('renderer:open-workspace', workspacePath);
+        const { workspaceConfig, workspaceUid } = result;
+
+        dispatch(createWorkspace({
+          uid: workspaceUid,
+          pathname: workspacePath,
+          ...workspaceConfig
+        }));
+
+        await dispatch(switchWorkspace(workspaceUid));
+
+        return result;
+      }
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const openWorkspaceDialog = () => {
+  return async (dispatch) => {
+    try {
+      const result = await ipcRenderer.invoke('renderer:open-workspace-dialog');
+      if (result) {
+        const { workspaceConfig, workspaceUid } = result;
+
+        dispatch(createWorkspace({
+          uid: workspaceUid,
+          pathname: result.workspacePath,
+          ...workspaceConfig
+        }));
+
+        await dispatch(switchWorkspace(workspaceUid));
+
+        return result;
+      }
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const removeCollectionFromWorkspaceAction = (workspaceUid, collectionPath) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspacesState = getState().workspaces;
+      const collectionsState = getState().collections;
+      const workspace = workspacesState.workspaces.find((w) => w.uid === workspaceUid);
+
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      const collection = collectionsState.collections.find((c) => c.pathname === collectionPath);
+
+      await ipcRenderer.invoke('renderer:remove-collection-from-workspace',
+        workspaceUid,
+        workspace.pathname,
+        collectionPath);
+
+      if (collection) {
+        const workspaceCollection = workspace.collections?.find((wc) =>
+          wc.path === collectionPath);
+
+        if (workspaceCollection) {
+          dispatch(removeCollection({ collectionUid: collection.uid }));
+        }
+      }
+
+      dispatch(removeCollectionFromWorkspace({
+        workspaceUid,
+        collectionLocation: collectionPath
+      }));
+
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+const loadWorkspaceCollectionsForSwitch = async (dispatch, workspace) => {
+  const openCollectionsFunction = (collectionPaths, workspaceId) => {
+    return dispatch(openMultipleCollections(collectionPaths, { workspaceId }));
+  };
+
+  try {
+    const workspaceCollections = await dispatch(loadWorkspaceCollections(workspace.uid));
+    const updatedWorkspace = await dispatch((_, getState) => getState().workspaces.workspaces.find((w) => w.uid === workspace.uid));
+
+    if (updatedWorkspace?.collections?.length > 0) {
+      const alreadyOpenCollections = await dispatch((_, getState) => getState().collections.collections.map((c) => c.pathname));
+
+      const collectionPaths = updatedWorkspace.collections
+        .map((wc) => wc.path)
+        .filter((p) => p && !alreadyOpenCollections.includes(p));
+
+      if (collectionPaths.length > 0) {
+        await openCollectionsFunction(collectionPaths, updatedWorkspace.pathname);
+      }
+    }
+  } catch (error) {
+    console.error('Failed to load workspace collections:', error);
+  }
+};
+
+export const switchWorkspace = (workspaceUid) => {
+  return async (dispatch, getState) => {
+    dispatch(setActiveWorkspace(workspaceUid));
+
+    const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+
+    if (!workspace) {
+      return;
+    }
+
+    try {
+      const { ipcRenderer } = window;
+
+      const result = await ipcRenderer.invoke('renderer:get-global-environments',
+        {
+          workspaceUid,
+          workspacePath: workspace.pathname
+        });
+
+      const globalEnvironments = result?.globalEnvironments || [];
+      const activeGlobalEnvironmentUid = result?.activeGlobalEnvironmentUid || null;
+
+      dispatch(updateGlobalEnvironments({ globalEnvironments, activeGlobalEnvironmentUid }));
+    } catch (error) {
+      dispatch(updateGlobalEnvironments({ globalEnvironments: [], activeGlobalEnvironmentUid: null }));
+    }
+
+    await loadWorkspaceCollectionsForSwitch(dispatch, workspace);
+    dispatch(showHomePage());
+  };
+};
+
+export const loadWorkspaceCollections = (workspaceUid, force = false) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      const hasProcessedCollections = workspace.collections
+        && workspace.collections.length > 0
+        && workspace.collections.some((c) => c.path && c.path.startsWith('/'));
+
+      if (!force && hasProcessedCollections) {
+        return workspace.collections;
+      }
+
+      dispatch(updateWorkspaceLoadingState({ workspaceUid, loadingState: 'loading' }));
+
+      let collections = [];
+
+      if (!workspace.pathname) {
+        collections = [];
+      } else {
+        const rawCollections = await ipcRenderer.invoke('renderer:load-workspace-collections', workspace.pathname);
+
+        collections = rawCollections.map((collection) => {
+          return {
+            ...collection
+          };
+        });
+      }
+
+      dispatch(updateWorkspace({
+        uid: workspaceUid,
+        collections
+      }));
+
+      dispatch(updateWorkspaceLoadingState({ workspaceUid, loadingState: 'loaded' }));
+
+      return collections;
+    } catch (error) {
+      dispatch(updateWorkspaceLoadingState({ workspaceUid, loadingState: 'error' }));
+      throw error;
+    }
+  };
+};
+
+export const removeWorkspaceAction = (workspaceUid) => {
+  return (dispatch) => {
+    dispatch(removeWorkspace(workspaceUid));
+  };
+};
+
+export const loadLastOpenedWorkspaces = () => {
+  return async (dispatch, getState) => {
+    try {
+      const workspaces = await ipcRenderer.invoke('renderer:get-last-opened-workspaces');
+      const currentWorkspaces = getState().workspaces.workspaces;
+      const validWorkspaceUids = new Set(workspaces.map((w) => w.uid));
+
+      for (const currentWorkspace of currentWorkspaces) {
+        if (currentWorkspace.type !== 'default' && !validWorkspaceUids.has(currentWorkspace.uid)) {
+          dispatch(removeWorkspace(currentWorkspace.uid));
+        }
+      }
+
+      for (const workspace of workspaces) {
+        const existingWorkspace = currentWorkspaces.find((w) => w.uid === workspace.uid);
+
+        if (!existingWorkspace) {
+          dispatch(createWorkspace(workspace));
+
+          if (workspace.pathname) {
+            try {
+              await ipcRenderer.invoke('renderer:start-workspace-watcher', workspace.pathname);
+            } catch (error) {
+            }
+          }
+        }
+      }
+
+      return workspaces;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const workspaceOpenedEvent = (workspacePath, workspaceUid, workspaceConfig) => {
+  return async (dispatch, getState) => {
+    dispatch(createWorkspace({
+      uid: workspaceUid,
+      pathname: workspacePath,
+      ...workspaceConfig
+    }));
+
+    try {
+      await dispatch(loadWorkspaceCollections(workspaceUid));
+    } catch (error) {
+    }
+
+    // If this is the default workspace or no workspace is active yet, switch to it
+    const state = getState();
+    const activeWorkspaceUid = state.workspaces.activeWorkspaceUid;
+
+    if (!activeWorkspaceUid || workspaceConfig.type === 'default') {
+      dispatch(switchWorkspace(workspaceUid));
+    }
+  };
+};
+
+export const workspaceConfigUpdatedEvent = (workspacePath, workspaceUid, workspaceConfig) => {
+  return async (dispatch, getState) => {
+    if (!workspaceConfig) {
+      return;
+    }
+
+    const { collections, ...configWithoutCollections } = workspaceConfig;
+
+    dispatch(updateWorkspace({
+      uid: workspaceUid,
+      ...configWithoutCollections
+    }));
+
+    const activeWorkspaceUid = getState().workspaces.activeWorkspaceUid;
+    if (activeWorkspaceUid === workspaceUid) {
+      try {
+        await dispatch(loadWorkspaceCollections(workspaceUid, true));
+
+        const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+        const openCollections = getState().collections.collections.map((c) => c.pathname);
+
+        if (workspace?.collections?.length > 0) {
+          const newCollectionPaths = workspace.collections
+            .map((workspaceCollection) => workspaceCollection.path)
+            .filter((collectionPath) => collectionPath && !openCollections.includes(collectionPath));
+
+          if (newCollectionPaths.length > 0) {
+            try {
+              await dispatch(openMultipleCollections(newCollectionPaths, { workspaceId: workspace.pathname }));
+            } catch (error) {
+            }
+          }
+        }
+      } catch (error) {
+      }
+    }
+  };
+};
+
+export const saveWorkspaceDocs = (workspaceUid, docs) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      if (workspace.type === 'default' || !workspace.pathname) {
+        await ipcRenderer.invoke('renderer:save-preferences', {
+          defaultWorkspaceDocs: docs || ''
+        });
+      } else {
+        await ipcRenderer.invoke('renderer:save-workspace-docs', workspace.pathname, docs || '');
+      }
+
+      dispatch(updateWorkspace({
+        uid: workspaceUid,
+        docs: docs
+      }));
+
+      return docs;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const createCollectionInWorkspace = (collectionName, collectionFolderName, collectionLocation, workspaceUid) => {
+  return async (dispatch, getState) => {
+    const currentWorkspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+    if (!currentWorkspace) {
+      throw new Error('Workspace not found');
+    }
+
+    const projectCollectionLocation = `${currentWorkspace.pathname}/collections`;
+
+    return await dispatch(createCollection(collectionName, collectionFolderName, projectCollectionLocation, {
+      workspaceId: currentWorkspace.pathname
+    }));
+  };
+};
+
+export const openCollectionInWorkspace = () => {
+  return (dispatch) => dispatch(openCollection());
+};
+
+const handleWorkspaceAction = async (action, workspaceUid, ...args) => {
+  try {
+    await action(workspaceUid, ...args);
+    return true;
+  } catch (error) {
+    const actionName = action.name.replace('renderer:', '').replace('-', ' ');
+    toast.error(error.message || `Failed to ${actionName} workspace`);
+    throw error;
+  }
+};
+
+export const renameWorkspaceAction = (workspaceUid, newName) => {
+  return async (dispatch, getState) => {
+    try {
+      const { workspaces } = getState().workspaces;
+      const workspace = workspaces.find((w) => w.uid === workspaceUid);
+
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      await handleWorkspaceAction((...args) => ipcRenderer.invoke('renderer:rename-workspace', ...args),
+        workspace.pathname,
+        newName);
+
+      dispatch(updateWorkspace({
+        uid: workspaceUid,
+        name: newName
+      }));
+
+      toast.success('Workspace renamed successfully');
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const closeWorkspaceAction = (workspaceUid) => {
+  return async (dispatch, getState) => {
+    try {
+      const { workspaces } = getState().workspaces;
+      const workspace = workspaces.find((w) => w.uid === workspaceUid);
+
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      await ipcRenderer.invoke('renderer:close-workspace', workspace.pathname);
+      dispatch(removeWorkspace(workspaceUid));
+
+      toast.success('Workspace closed successfully');
+    } catch (error) {
+      toast.error(error.message || 'Failed to close workspace');
+      throw error;
+    }
+  };
+};
+
+export const importCollectionInWorkspace = (collection, workspaceUid, collectionLocation, type) => {
+  return async (dispatch, getState) => {
+    const currentWorkspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+
+    if (!currentWorkspace) {
+      throw new Error('Workspace not found');
+    }
+
+    const location = collectionLocation || path.join(currentWorkspace.pathname, 'collections');
+    const transformedCollection = await transformCollection(collection, type);
+    const collectionPath = await ipcRenderer.invoke('renderer:import-collection', transformedCollection, location);
+
+    const workspaceCollection = {
+      name: transformedCollection.name,
+      path: collectionPath
+    };
+
+    await ipcRenderer.invoke('renderer:add-collection-to-workspace', currentWorkspace.pathname, workspaceCollection);
+
+    return collectionPath;
+  };
+};
+
+export const loadWorkspaceEnvironments = (workspaceUid) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      const environments = await ipcRenderer.invoke('renderer:load-workspace-environments', workspace.pathname);
+
+      dispatch(updateWorkspace({
+        uid: workspaceUid,
+        environments: environments
+      }));
+
+      return environments;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const createWorkspaceEnvironment = (workspaceUid, environmentName) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      const environment = await ipcRenderer.invoke('renderer:create-workspace-environment', workspace.pathname, environmentName);
+
+      await dispatch(loadWorkspaceEnvironments(workspaceUid));
+
+      return environment;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const deleteWorkspaceEnvironment = (workspaceUid, environmentUid) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      await ipcRenderer.invoke('renderer:delete-workspace-environment', workspace.pathname, environmentUid);
+
+      await dispatch(loadWorkspaceEnvironments(workspaceUid));
+
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const selectWorkspaceEnvironment = (workspaceUid, environmentUid) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      await ipcRenderer.invoke('renderer:select-workspace-environment', workspace.pathname, environmentUid);
+
+      dispatch(updateWorkspace({
+        uid: workspaceUid,
+        activeEnvironmentUid: environmentUid
+      }));
+
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const importWorkspaceEnvironment = (workspaceUid, environmentData) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      const environment = await ipcRenderer.invoke('renderer:import-workspace-environment', workspace.pathname, environmentData);
+
+      await dispatch(loadWorkspaceEnvironments(workspaceUid));
+
+      return environment;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const updateWorkspaceEnvironment = (workspaceUid, environmentUid, environmentData) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      await ipcRenderer.invoke('renderer:update-workspace-environment', workspace.pathname, environmentUid, environmentData);
+
+      await dispatch(loadWorkspaceEnvironments(workspaceUid));
+
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const renameWorkspaceEnvironment = (workspaceUid, environmentUid, newName) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      await ipcRenderer.invoke('renderer:rename-workspace-environment', workspace.pathname, environmentUid, newName);
+
+      await dispatch(loadWorkspaceEnvironments(workspaceUid));
+
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
+
+export const copyWorkspaceEnvironment = (workspaceUid, environmentUid, newName) => {
+  return async (dispatch, getState) => {
+    try {
+      const workspace = getState().workspaces.workspaces.find((w) => w.uid === workspaceUid);
+      if (!workspace) {
+        throw new Error('Workspace not found');
+      }
+
+      const newEnvironment = await ipcRenderer.invoke('renderer:copy-workspace-environment', workspace.pathname, environmentUid, newName);
+
+      await dispatch(loadWorkspaceEnvironments(workspaceUid));
+
+      return newEnvironment;
+    } catch (error) {
+      throw error;
+    }
+  };
+};
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/workspaces/index.js b/packages/bruno-app/src/providers/ReduxStore/slices/workspaces/index.js
new file mode 100644
index 000000000..340776f6b
--- /dev/null
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/workspaces/index.js
@@ -0,0 +1,90 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+const DEFAULT_WORKSPACE_UID = 'default';
+
+const initialState = {
+  workspaces: [],
+  activeWorkspaceUid: DEFAULT_WORKSPACE_UID
+};
+
+export const workspacesSlice = createSlice({
+  name: 'workspaces',
+  initialState,
+  reducers: {
+    setActiveWorkspace: (state, action) => {
+      state.activeWorkspaceUid = action.payload;
+    },
+
+    createWorkspace: (state, action) => {
+      const workspace = action.payload;
+      workspace.collections = workspace.collections || [];
+
+      const existingWorkspace = state.workspaces.find((w) => w.uid === workspace.uid);
+      if (!existingWorkspace) {
+        state.workspaces.push(workspace);
+      } else {
+        Object.assign(existingWorkspace, workspace);
+      }
+    },
+
+    removeWorkspace: (state, action) => {
+      const workspaceUid = action.payload;
+      state.workspaces = state.workspaces.filter((w) => w.uid !== workspaceUid);
+
+      if (state.activeWorkspaceUid === workspaceUid) {
+        state.activeWorkspaceUid = DEFAULT_WORKSPACE_UID;
+      }
+    },
+
+    updateWorkspace: (state, action) => {
+      const { uid, ...updates } = action.payload;
+      const workspace = state.workspaces.find((w) => w.uid === uid);
+      if (workspace) {
+        Object.assign(workspace, updates);
+      }
+    },
+
+    addCollectionToWorkspace: (state, action) => {
+      const { workspaceUid, collection } = action.payload;
+      const workspace = state.workspaces.find((w) => w.uid === workspaceUid);
+      if (workspace) {
+        workspace.collections = workspace.collections || [];
+        const existingCollection = workspace.collections.find((c) =>
+          c.uid === collection.uid || c.path === collection.path);
+        if (!existingCollection) {
+          workspace.collections.push(collection);
+        }
+      }
+    },
+
+    removeCollectionFromWorkspace: (state, action) => {
+      const { workspaceUid, collectionLocation } = action.payload;
+      const workspace = state.workspaces.find((w) => w.uid === workspaceUid);
+      if (workspace?.collections) {
+        // Filter by both path and location since path could be relative or absolute
+        workspace.collections = workspace.collections.filter((c) =>
+          c.path !== collectionLocation && c.location !== collectionLocation);
+      }
+    },
+
+    updateWorkspaceLoadingState: (state, action) => {
+      const { workspaceUid, loadingState } = action.payload;
+      const workspace = state.workspaces.find((w) => w.uid === workspaceUid);
+      if (workspace) {
+        workspace.loadingState = loadingState;
+      }
+    }
+  }
+});
+
+export const {
+  setActiveWorkspace,
+  createWorkspace,
+  removeWorkspace,
+  updateWorkspace,
+  addCollectionToWorkspace,
+  removeCollectionFromWorkspace,
+  updateWorkspaceLoadingState
+} = workspacesSlice.actions;
+
+export default workspacesSlice.reducer;
diff --git a/packages/bruno-app/src/selectors/tab.js b/packages/bruno-app/src/selectors/tab.js
index 76aa67365..a38382c16 100644
--- a/packages/bruno-app/src/selectors/tab.js
+++ b/packages/bruno-app/src/selectors/tab.js
@@ -1,9 +1,9 @@
 import { createSelector } from '@reduxjs/toolkit';
 
 export const isTabForItemActive = ({ itemUid }) => createSelector([
-    (state) => state.tabs?.activeTabUid
+  (state) => state.tabs?.activeTabUid
 ], (activeTabUid) => activeTabUid === itemUid);
 
 export const isTabForItemPresent = ({ itemUid }) => createSelector([
-    (state) => state.tabs.tabs,
-], (tabs) => tabs.some((tab) => tab.uid === itemUid));
\ No newline at end of file
+  (state) => state.tabs.tabs
+], (tabs) => tabs.some((tab) => tab.uid === itemUid));
diff --git a/packages/bruno-app/src/styles/globals.css b/packages/bruno-app/src/styles/globals.css
index de18baa3d..7f0b49d31 100644
--- a/packages/bruno-app/src/styles/globals.css
+++ b/packages/bruno-app/src/styles/globals.css
@@ -48,7 +48,7 @@
   --font-family-mono: 'Fira Code', monospace;
   --font-size-hint: .75rem;
   --font-size-inline-code: .8125rem;
-  --font-size-body: .8rem;
+  --font-size-body: 1rem; 
   --font-size-h4: 1.125rem;
   --font-size-h3: 1.375rem;
   --font-size-h2: 1.8125rem;
@@ -99,7 +99,7 @@
   --font-family-mono: 'Fira Code', monospace;
   --font-size-hint: .75rem;
   --font-size-inline-code: .8125rem;
-  --font-size-body: .9375rem;
+  --font-size-body: 1rem; 
   --font-size-h4: 1.125rem;
   --font-size-h3: 1.375rem;
   --font-size-h2: 1.8125rem;
@@ -153,10 +153,6 @@ body {
   overflow-x: hidden;
 }
 
-body {
-  font-size: 0.875rem;
-}
-
 body::-webkit-scrollbar,
 .CodeMirror-vscrollbar::-webkit-scrollbar {
   width: 0.6rem;
diff --git a/packages/bruno-app/src/themes/dark.js b/packages/bruno-app/src/themes/dark.js
index 34cb27874..42d56cbf4 100644
--- a/packages/bruno-app/src/themes/dark.js
+++ b/packages/bruno-app/src/themes/dark.js
@@ -1,8 +1,58 @@
+const colors = {
+  BRAND: '#546de5',
+  TEXT: '#d4d4d4',
+  TEXT_LINK: '#569cd6',
+  BACKGROUND: '#1e1e1e',
+
+  GRAY_1: '#666666',
+  GRAY_2: '#444444',
+  GRAY_3: '#252526',
+
+  CODEMIRROR_TOKENS: {
+    DEFINITION: '#9ccc9c', // Softer, brighter sage — better contrast
+    PROPERTY: '#7dcfff', // Soft sky blue, high clarity without being loud
+    STRING: '#d7ba7d', // VSCode-like warm string tone
+    NUMBER: '#4ec9b0', // Standard teal with higher clarity
+    ATOM: '#c586c0', // Brighter lavender, matches VSCode purple
+    VARIABLE: '#4fc1ff', // Clear aqua-blue (used widely in dark themes)
+    KEYWORD: '#c58679', // Coral-ish but muted to avoid eye strain
+    COMMENT: '#6a9955', // Greenish-slate — very readable & subtle
+    OPERATOR: '#d4d4d4' // Light gray — consistent with dark mode operators
+  }
+};
+
 const darkTheme = {
-  brand: '#546de5',
-  text: '#d4d4d4',
-  textLink: '#569cd6',
-  bg: '#1e1e1e',
+  brand: colors.BRAND,
+  text: colors.TEXT,
+  textLink: colors.TEXT_LINK,
+  bg: colors.BACKGROUND,
+
+  font: {
+    size: {
+      xs: '0.6875rem', // 11px
+      sm: '0.75rem', // 12px
+      base: '0.8125rem', // 13px
+      md: '0.875rem', // 14px
+      lg: '1rem', // 16px
+      xl: '1.125rem' // 18px
+    }
+  },
+
+  shadow: {
+    sm: '0 1px 3px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.3)',
+    md: '0 2px 8px rgba(0, 0, 0, 0.6), 0 0 0 1px rgba(0, 0, 0, 0.4)',
+    lg: '0 2px 12px rgba(0, 0, 0, 0.7), 0 0 0 1px rgba(0, 0, 0, 0.4)'
+  },
+
+  border: {
+    radius: {
+      sm: '4px',
+      base: '6px',
+      md: '8px',
+      lg: '10px',
+      xl: '12px'
+    }
+  },
 
   colors: {
     text: {
@@ -10,7 +60,7 @@ const darkTheme = {
       danger: '#f06f57',
       muted: '#9d9d9d',
       purple: '#cd56d6',
-      yellow: '#f59e0b'
+      yellow: '#d9a342'
     },
     bg: {
       danger: '#d03544'
@@ -46,8 +96,11 @@ const darkTheme = {
   sidebar: {
     color: '#ccc',
     muted: '#9d9d9d',
-    bg: '#252526',
-    dragbar: '#666666',
+    bg: colors.GRAY_3,
+    dragbar: {
+      border: 'transparent',
+      activeBorder: colors.GRAY_1
+    },
 
     badge: {
       bg: '#3D3D3D'
@@ -62,6 +115,7 @@ const darkTheme = {
       item: {
         bg: '#37373D',
         hoverBg: '#2A2D2F',
+        keyboardFocusBg: 'rgba(10, 132, 255, 0.2)',
         indentBorder: 'solid 1px #585858',
         active: {
           indentBorder: 'solid 1px #4c4c4c'
@@ -87,14 +141,47 @@ const darkTheme = {
     shadow: 'rgb(0 0 0 / 36%) 0px 2px 8px',
     separator: '#444',
     labelBg: '#4a4949',
-    selectedBg: '#F59E0B14',
-    selectedColor: '#F59E0B',
+    selectedBg: '#d9a34214',
+    selectedColor: '#d9a342',
     mutedText: '#9B9B9B',
     primaryText: '#D4D4D4',
     secondaryText: '#9CA3AF',
     headingText: '#FFFFFF'
   },
 
+  listItem: {
+    hoverBg: '#2A2D2F',
+    activeBg: '#3D3D3D'
+  },
+
+  workspace: {
+    accent: '#F59E0B',
+    border: '#444',
+    borderMuted: '#585858',
+    card: {
+      bg: '#2A2D2F'
+    },
+    button: {
+      bg: '#242424'
+    },
+    collection: {
+      header: {
+        indentBorder: 'solid 1px #444444'
+      },
+      item: {
+        indentBorder: 'solid 1px #313131'
+      }
+    },
+    environments: {
+      bg: '#212121',
+      indentBorder: 'solid 1px #313131',
+      activeBg: '#37373c',
+      search: {
+        bg: '#3D3D3D'
+      }
+    }
+  },
+
   request: {
     methods: {
       get: '#8cd656',
@@ -107,15 +194,17 @@ const darkTheme = {
       head: '#d69956'
     },
     grpc: '#6366f1',
-    ws: '#f59e0b',
+    ws: '#d9a342',
     gql: '#e535ab'
   },
 
   requestTabPanel: {
     url: {
-      bg: '#3D3D3D',
+      bg: colors.BACKGROUND,
       icon: 'rgb(204, 204, 204)',
-      errorHoverBg: '#4a2a2a'
+      iconDanger: '#fa5343',
+      errorHoverBg: '#4a2a2a',
+      border: `solid 1px ${colors.GRAY_2}`
     },
     dragbar: {
       border: '#444',
@@ -240,7 +329,7 @@ const darkTheme = {
   tabs: {
     active: {
       color: '#CCCCCC',
-      border: '#F59E0B'
+      border: '#d9a342'
     },
     secondary: {
       active: {
@@ -275,24 +364,43 @@ const darkTheme = {
   },
 
   codemirror: {
-    bg: '#1e1e1e',
-    border: '#373737',
+    bg: colors.BACKGROUND,
+    border: colors.BACKGROUND,
     placeholder: {
       color: '#a2a2a2',
       opacity: 0.5
     },
     gutter: {
-      bg: '#262626'
+      bg: colors.BACKGROUND
     },
     variable: {
       valid: 'rgb(11 178 126)',
       invalid: '#f06f57',
+      prompt: '#3D8DF5',
       info: {
-        color: '#ce9178',
-        bg: 'rgb(48,48,49)',
-        boxShadow: 'rgb(0 0 0 / 36%) 0px 2px 8px'
+        color: '#FFFFFF',
+        bg: '#343434',
+        boxShadow: 'rgb(0 0 0 / 36%) 0px 2px 8px',
+        editorBg: '#292929',
+        iconColor: '#989898',
+        editorBorder: '#3D3D3D',
+        editorFocusBorder: '#CCCCCC',
+        editableDisplayHoverBg: 'rgba(255,255,255,0.03)',
+        border: '#4F4F4F',
+        editorBorder: '#3D3D3D'
       }
     },
+    tokens: {
+      definition: colors.CODEMIRROR_TOKENS.DEFINITION,
+      property: colors.CODEMIRROR_TOKENS.PROPERTY,
+      string: colors.CODEMIRROR_TOKENS.STRING,
+      number: colors.CODEMIRROR_TOKENS.NUMBER,
+      atom: colors.CODEMIRROR_TOKENS.ATOM,
+      variable: colors.CODEMIRROR_TOKENS.VARIABLE,
+      keyword: colors.CODEMIRROR_TOKENS.KEYWORD,
+      comment: colors.CODEMIRROR_TOKENS.COMMENT,
+      operator: colors.CODEMIRROR_TOKENS.OPERATOR
+    },
     searchLineHighlightCurrent: 'rgba(120,120,120,0.18)',
     searchMatch: '#FFD700',
     searchMatchActive: '#FFFF00'
@@ -326,7 +434,7 @@ const darkTheme = {
   tooltip: {
     bg: '#1f1f1f',
     color: '#ffffff',
-    shortcutColor: '#f59e0b'
+    shortcutColor: '#d9a342'
   },
 
   infoTip: {
@@ -443,7 +551,7 @@ const darkTheme = {
         hoverBg: 'rgba(255, 255, 255, 0.05)',
         selected: {
           bg: 'rgba(245, 158, 11, 0.2)',
-          border: '#f59e0b'
+          border: '#d9a342'
         },
         text: '#d4d4d4',
         secondaryText: '#9d9d9d',
@@ -464,9 +572,22 @@ const darkTheme = {
       }
     }
   },
+  deprecationWarning: {
+    bg: 'rgba(250, 83, 67, 0.1)',
+    border: 'rgba(250, 83, 67, 0.1)',
+    icon: '#FA5343',
+    text: '#B8B8B8'
+  },
+
+  preferences: {
+    sidebar: {
+      border: '#444444'
+    }
+  },
+
   examples: {
-    buttonBg: '#F59E0B1A',
-    buttonColor: '#F59E0B',
+    buttonBg: '#d9a3421A',
+    buttonColor: '#d9a342',
     buttonText: '#fff',
     buttonIconColor: '#fff',
     border: '#444',
diff --git a/packages/bruno-app/src/themes/light.js b/packages/bruno-app/src/themes/light.js
index 794925883..f085ea807 100644
--- a/packages/bruno-app/src/themes/light.js
+++ b/packages/bruno-app/src/themes/light.js
@@ -1,13 +1,66 @@
+const colors = {
+  BRAND: '#546de5',
+  TEXT: 'rgb(52, 52, 52)',
+  TEXT_LINK: '#1663bb',
+  BACKGROUND: '#fff',
+  WHITE: '#fff',
+  BLACK: '#000',
+  GRAY_1: '#f8f8f8',
+  GRAY_2: '#eaeaea',
+  GRAY_3: '#e5e5e5',
+  GRAY_4: '#cbcbcb',
+
+  CODEMIRROR_TOKENS: {
+    DEFINITION: '#566f4e', // Deep moss
+    PROPERTY: '#4b7bbb', // Muted azure
+    STRING: '#a06e3b', // Warm bronze
+    NUMBER: '#3d8b7c', // Muted jade
+    ATOM: '#8169ad', // Soft plum
+    VARIABLE: '#3f7b6f', // Deep teal
+    KEYWORD: '#b95d6a', // Muted ruby
+    COMMENT: '#8997aa', // Cool gray
+    OPERATOR: '#6b7a8f' // Slate blue
+  }
+};
+
 const lightTheme = {
-  brand: '#546de5',
-  text: 'rgb(52, 52, 52)',
-  textLink: '#1663bb',
-  bg: '#fff',
+  brand: colors.BRAND,
+  text: colors.TEXT,
+  textLink: colors.TEXT_LINK,
+  bg: colors.BACKGROUND,
+
+  font: {
+    size: {
+      xs: '0.6875rem', // 11px
+      sm: '0.75rem', // 12px
+      base: '0.8125rem', // 13px
+      md: '0.875rem', // 14px
+      lg: '1rem', // 16px
+      xl: '1.125rem' // 18px
+    }
+  },
+
+  shadow: {
+    sm: '0 1px 3px rgba(0, 0, 0, 0.12), 0 0 0 1px rgba(0, 0, 0, 0.05)',
+    md: '0 2px 8px rgba(0, 0, 0, 0.14), 0 0 0 1px rgba(0, 0, 0, 0.06)',
+    lg: '0 2px 12px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.05)'
+  },
+
+  border: {
+    radius: {
+      sm: '4px',
+      base: '6px',
+      md: '8px',
+      lg: '10px',
+      xl: '12px'
+    }
+  },
 
   colors: {
     text: {
       green: '#047857',
       danger: '#B91C1C',
+      warning: '#f57c00',
       muted: '#838383',
       purple: '#8e44ad',
       yellow: '#d97706'
@@ -46,11 +99,14 @@ const lightTheme = {
   sidebar: {
     color: 'rgb(52, 52, 52)',
     muted: '#4b5563',
-    bg: '#F3F3F3',
-    dragbar: 'rgb(200, 200, 200)',
+    bg: colors.GRAY_1,
+    dragbar: {
+      border: colors.GRAY_3,
+      activeBorder: colors.GRAY_4
+    },
 
     badge: {
-      bg: '#e1e1e1'
+      bg: '#eaeaea'
     },
 
     search: {
@@ -60,11 +116,12 @@ const lightTheme = {
 
     collection: {
       item: {
-        bg: '#e1e1e1',
-        hoverBg: '#e7e7e7',
-        indentBorder: 'solid 1px #e1e1e1',
+        bg: colors.GRAY_2,
+        hoverBg: colors.GRAY_2,
+        keyboardFocusBg: 'rgba(10, 132, 255, 0.2)',
+        indentBorder: `solid 1px ${colors.GRAY_3}`,
         active: {
-          indentBorder: 'solid 1px #d0d0d0'
+          indentBorder: `solid 1px ${colors.GRAY_3}`
         }
       }
     },
@@ -95,6 +152,39 @@ const lightTheme = {
     headingText: '#343434'
   },
 
+  listItem: {
+    hoverBg: '#e7e7e7',
+    activeBg: '#dcdcdc'
+  },
+
+  workspace: {
+    accent: '#D97706',
+    border: '#e7e7e7',
+    borderMuted: '#f3f3f3',
+    card: {
+      bg: '#fff'
+    },
+    button: {
+      bg: '#f3f3f3'
+    },
+    collection: {
+      header: {
+        indentBorder: 'solid 1px #efefef'
+      },
+      item: {
+        indentBorder: 'solid 1px #f9f9f9'
+      }
+    },
+    environments: {
+      bg: '#fbfbfb',
+      indentBorder: 'solid 1px #efefef',
+      activeBg: '#eeeeee',
+      search: {
+        bg: '#fff'
+      }
+    }
+  },
+
   request: {
     methods: {
       get: 'rgb(5, 150, 105)',
@@ -113,9 +203,11 @@ const lightTheme = {
 
   requestTabPanel: {
     url: {
-      bg: '#f3f3f3',
+      bg: colors.WHITE,
       icon: '#515151',
-      errorHoverBg: '#fef2f2'
+      iconDanger: '#d91f11',
+      errorHoverBg: '#fef2f2',
+      border: `solid 1px ${colors.GRAY_3}`
     },
     dragbar: {
       border: '#efefef',
@@ -276,24 +368,43 @@ const lightTheme = {
   },
 
   codemirror: {
-    bg: 'white',
-    border: '#efefef',
+    bg: colors.WHITE,
+    border: colors.WHITE,
     placeholder: {
       color: '#a2a2a2',
       opacity: 0.75
     },
     gutter: {
-      bg: '#f3f3f3'
+      bg: colors.WHITE
     },
     variable: {
       valid: '#047857',
       invalid: 'rgb(185, 28, 28)',
+      prompt: '#186ADE',
       info: {
-        color: 'rgb(52, 52, 52)',
-        bg: 'white',
-        boxShadow: '0 1px 3px rgba(0, 0, 0, 0.45)'
+        color: '#343434',
+        bg: '#FFFFFF',
+        boxShadow: '0 1px 3px rgba(0, 0, 0, 0.45)',
+        editorBg: '#F7F7F7',
+        iconColor: '#989898',
+        editorBorder: '#EFEFEF',
+        editorFocusBorder: '#989898',
+        editableDisplayHoverBg: 'rgba(0,0,0,0.02)',
+        border: '#EFEFEF',
+        editorBorder: '#EFEFEF'
       }
     },
+    tokens: {
+      definition: colors.CODEMIRROR_TOKENS.DEFINITION,
+      property: colors.CODEMIRROR_TOKENS.PROPERTY,
+      string: colors.CODEMIRROR_TOKENS.STRING,
+      number: colors.CODEMIRROR_TOKENS.NUMBER,
+      atom: colors.CODEMIRROR_TOKENS.ATOM,
+      variable: colors.CODEMIRROR_TOKENS.VARIABLE,
+      keyword: colors.CODEMIRROR_TOKENS.KEYWORD,
+      comment: colors.CODEMIRROR_TOKENS.COMMENT,
+      operator: colors.CODEMIRROR_TOKENS.OPERATOR
+    },
     searchLineHighlightCurrent: 'rgba(120,120,120,0.10)',
     searchMatch: '#B8860B',
     searchMatchActive: '#DAA520'
@@ -471,6 +582,19 @@ const lightTheme = {
       }
     }
   },
+  deprecationWarning: {
+    bg: 'rgba(217, 31, 17, 0.1)',
+    border: 'rgba(217, 31, 17, 0.1)',
+    icon: '#D91F11',
+    text: '#343434'
+  },
+
+  preferences: {
+    sidebar: {
+      border: '#EFEFEF'
+    }
+  },
+
   examples: {
     buttonBg: '#D977061A',
     buttonColor: '#D97706',
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js b/packages/bruno-app/src/utils/auth/index.js
similarity index 99%
rename from packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js
rename to packages/bruno-app/src/utils/auth/index.js
index 45e396625..b479b63c4 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js
+++ b/packages/bruno-app/src/utils/auth/index.js
@@ -40,4 +40,4 @@ export const resolveInheritedAuth = (item, collection) => {
     ...mergedRequest,
     auth: effectiveAuth
   };
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.spec.js b/packages/bruno-app/src/utils/auth/index.spec.js
similarity index 97%
rename from packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.spec.js
rename to packages/bruno-app/src/utils/auth/index.spec.js
index ad5afc3e6..dfdde956f 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.spec.js
+++ b/packages/bruno-app/src/utils/auth/index.spec.js
@@ -1,4 +1,4 @@
-import { resolveInheritedAuth } from './auth-utils';
+import { resolveInheritedAuth } from './index';
 
 jest.mock('utils/collections/index', () => ({
   getTreePathFromCollectionToItem: (collection, item) => {
@@ -76,4 +76,4 @@ describe('auth-utils.resolveInheritedAuth', () => {
     expect(resolved.auth.mode).toBe('basic');
     expect(resolved.auth.basic.username).toBe('override');
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-app/src/utils/codegenerator/auth.js b/packages/bruno-app/src/utils/codegenerator/auth.js
index 7098cf8ac..ad28970eb 100644
--- a/packages/bruno-app/src/utils/codegenerator/auth.js
+++ b/packages/bruno-app/src/utils/codegenerator/auth.js
@@ -1,7 +1,6 @@
 import get from 'lodash/get';
 
 export const getAuthHeaders = (collectionRootAuth, requestAuth) => {
-
   // Discovered edge case where code generation fails when you create a collection which has not been saved yet:
   // Collection auth therefore null, and request inherits from collection, therefore it is also null
   // TypeError: Cannot read properties of undefined (reading 'mode')
diff --git a/packages/bruno-app/src/utils/codegenerator/har.js b/packages/bruno-app/src/utils/codegenerator/har.js
index b8a4bd19b..11d5b66d2 100644
--- a/packages/bruno-app/src/utils/codegenerator/har.js
+++ b/packages/bruno-app/src/utils/codegenerator/har.js
@@ -107,13 +107,13 @@ const createPostData = (body) => {
         text: filePath,
         params: filePath
           ? [
-            {
-              name: selectedFile?.name || 'file',
-              value: filePath,
-              fileName: filePath,
-              contentType: selectedFile?.contentType || 'application/octet-stream'
-            }
-          ]
+              {
+                name: selectedFile?.name || 'file',
+                value: filePath,
+                fileName: filePath,
+                contentType: selectedFile?.contentType || 'application/octet-stream'
+              }
+            ]
           : []
       };
     }
@@ -130,7 +130,7 @@ const createPostData = (body) => {
   }
 };
 
-export const buildHarRequest = ({ request, headers }) => { 
+export const buildHarRequest = ({ request, headers }) => {
   // NOTE:
   // This is just a safety check.
   // The interpolateUrlPathParams method validates the url, but it does not throw
diff --git a/packages/bruno-app/src/utils/codegenerator/targets.js b/packages/bruno-app/src/utils/codegenerator/targets.js
index 95b222dbc..9a536677e 100644
--- a/packages/bruno-app/src/utils/codegenerator/targets.js
+++ b/packages/bruno-app/src/utils/codegenerator/targets.js
@@ -5,22 +5,22 @@ export const getLanguages = () => {
   for (const target of Object.values(targets)) {
     const { key, title } = target.info;
     const clients = Object.keys(target.clientsById);
-    const languages =
-      (clients.length === 1)
+    const languages
+      = (clients.length === 1)
         ? [{
-          name: title,
-          target: key,
-          client: clients[0]
-        }]
-        : clients.map(client => ({
-          name: `${title}-${client}`,
-          target: key,
-          client
-        }));
+            name: title,
+            target: key,
+            client: clients[0]
+          }]
+        : clients.map((client) => ({
+            name: `${title}-${client}`,
+            target: key,
+            client
+          }));
     allLanguages.push(...languages);
-    
+
     // Move "Shell-curl" to the top of the array
-    const shellCurlIndex = allLanguages.findIndex(lang => lang.name === "Shell-curl");
+    const shellCurlIndex = allLanguages.findIndex((lang) => lang.name === 'Shell-curl');
     if (shellCurlIndex !== -1) {
       const [shellCurl] = allLanguages.splice(shellCurlIndex, 1);
       allLanguages.unshift(shellCurl);
@@ -28,4 +28,4 @@ export const getLanguages = () => {
   }
 
   return allLanguages;
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/utils/codemirror/autocomplete.js b/packages/bruno-app/src/utils/codemirror/autocomplete.js
index def351389..38e4e1fdc 100644
--- a/packages/bruno-app/src/utils/codemirror/autocomplete.js
+++ b/packages/bruno-app/src/utils/codemirror/autocomplete.js
@@ -29,12 +29,12 @@ const STATIC_API_HINTS = {
     'req.getName()',
     'req.getTags()',
     'req.disableParsingResponseJson()',
-    'req.onFail(function(err) {})',
+    'req.onFail(function(err) {})'
   ],
   res: [
     'res',
     'res.status',
-    'res.statusText', 
+    'res.statusText',
     'res.headers',
     'res.body',
     'res.responseTime',
@@ -100,7 +100,7 @@ const STATIC_API_HINTS = {
 };
 
 // Mock data functions - prefixed with $
-const MOCK_DATA_HINTS = Object.keys(mockDataFunctions).map(key => `$${key}`);
+const MOCK_DATA_HINTS = Object.keys(mockDataFunctions).map((key) => `$${key}`);
 
 // Constants for word pattern matching
 const WORD_PATTERN = /[\w.$-/]/;
@@ -115,11 +115,11 @@ const NON_CHARACTER_KEYS = /^(?!Shift|Tab|Enter|Escape|ArrowUp|ArrowDown|ArrowLe
 const generateProgressiveHints = (fullHint) => {
   const parts = fullHint.split('.');
   const progressiveHints = [];
-  
+
   for (let i = 1; i <= parts.length; i++) {
     progressiveHints.push(parts.slice(0, i).join('.'));
   }
-  
+
   return progressiveHints;
 };
 
@@ -139,21 +139,21 @@ const shouldSkipVariableKey = (key) => {
  */
 const transformVariablesToHints = (allVariables = {}) => {
   const hints = [];
-  
+
   // Process all variables without type-specific handling
-  Object.keys(allVariables).forEach(key => {
+  Object.keys(allVariables).forEach((key) => {
     if (!shouldSkipVariableKey(key)) {
       hints.push(key);
     }
   });
-  
+
   // Handle process environment variables
   if (allVariables.process && allVariables.process.env) {
-    Object.keys(allVariables.process.env).forEach(key => {
+    Object.keys(allVariables.process.env).forEach((key) => {
       hints.push(`process.env.${key}`);
     });
   }
-  
+
   return hints;
 };
 
@@ -164,11 +164,11 @@ const transformVariablesToHints = (allVariables = {}) => {
  */
 const addApiHintsToSet = (apiHints, showHintsFor) => {
   const apiTypes = ['req', 'res', 'bru'];
-  
-  apiTypes.forEach(apiType => {
+
+  apiTypes.forEach((apiType) => {
     if (showHintsFor.includes(apiType)) {
-      STATIC_API_HINTS[apiType].forEach(hint => {
-        generateProgressiveHints(hint).forEach(h => apiHints.add(h));
+      STATIC_API_HINTS[apiType].forEach((hint) => {
+        generateProgressiveHints(hint).forEach((h) => apiHints.add(h));
       });
     }
   });
@@ -181,14 +181,14 @@ const addApiHintsToSet = (apiHints, showHintsFor) => {
  */
 const addVariableHintsToSet = (variableHints, allVariables) => {
   // Add mock data hints
-  MOCK_DATA_HINTS.forEach(hint => {
-    generateProgressiveHints(hint).forEach(h => variableHints.add(h));
+  MOCK_DATA_HINTS.forEach((hint) => {
+    generateProgressiveHints(hint).forEach((h) => variableHints.add(h));
   });
-  
+
   // Add variable hints with progressive hints
   const variableHintsList = transformVariablesToHints(allVariables);
-  variableHintsList.forEach(hint => {
-    generateProgressiveHints(hint).forEach(h => variableHints.add(h));
+  variableHintsList.forEach((hint) => {
+    generateProgressiveHints(hint).forEach((h) => variableHints.add(h));
   });
 };
 
@@ -199,8 +199,8 @@ const addVariableHintsToSet = (variableHints, allVariables) => {
  */
 const addCustomHintsToSet = (anywordHints, customHints) => {
   if (customHints && Array.isArray(customHints)) {
-    customHints.forEach(hint => {
-      generateProgressiveHints(hint).forEach(h => anywordHints.add(h));
+    customHints.forEach((hint) => {
+      generateProgressiveHints(hint).forEach((h) => anywordHints.add(h));
     });
   }
 };
@@ -218,14 +218,14 @@ const buildCategorizedHintsList = (allVariables = {}, anywordAutocompleteHints =
     variables: new Set(),
     anyword: new Set()
   };
-  
+
   const showHintsFor = options.showHintsFor || [];
-  
+
   // Add different types of hints
   addApiHintsToSet(categorizedHints.api, showHintsFor);
   addVariableHintsToSet(categorizedHints.variables, allVariables);
   addCustomHintsToSet(categorizedHints.anyword, anywordAutocompleteHints);
-  
+
   return {
     api: Array.from(categorizedHints.api).sort(),
     variables: Array.from(categorizedHints.variables).sort(),
@@ -242,7 +242,7 @@ const buildCategorizedHintsList = (allVariables = {}, anywordAutocompleteHints =
  */
 const calculateVariableReplacementPositions = (cursor, startPos, wordMatch) => {
   let replaceFrom, replaceTo;
-  
+
   if (wordMatch.endsWith('.')) {
     replaceFrom = cursor;
     replaceTo = cursor;
@@ -256,7 +256,7 @@ const calculateVariableReplacementPositions = (cursor, startPos, wordMatch) => {
       replaceTo = cursor;
     }
   }
-  
+
   return { replaceFrom, replaceTo };
 };
 
@@ -270,7 +270,7 @@ const calculateVariableReplacementPositions = (cursor, startPos, wordMatch) => {
  */
 const calculateWordReplacementPositions = (cursor, start, end, word) => {
   let replaceFrom, replaceTo;
-  
+
   if (word.endsWith('.')) {
     replaceFrom = { line: cursor.line, ch: end };
     replaceTo = cursor;
@@ -284,7 +284,7 @@ const calculateWordReplacementPositions = (cursor, start, end, word) => {
       replaceTo = { line: cursor.line, ch: end };
     }
   }
-  
+
   return { replaceFrom, replaceTo };
 };
 
@@ -309,18 +309,18 @@ const determineWordContext = (word) => {
 const extractWordFromLine = (currentLine, cursorPosition) => {
   let start = cursorPosition;
   let end = start;
-  
+
   while (end < currentLine.length && WORD_PATTERN.test(currentLine.charAt(end))) {
     ++end;
   }
   while (start && WORD_PATTERN.test(currentLine.charAt(start - 1))) {
     --start;
   }
-  
+
   if (start === end) {
     return null;
   }
-  
+
   return {
     word: currentLine.slice(start, end),
     start,
@@ -337,14 +337,14 @@ const getCurrentWordWithContext = (cm) => {
   const cursor = cm.getCursor();
   const currentLine = cm.getLine(cursor.line);
   const currentString = cm.getRange({ line: cursor.line, ch: 0 }, cursor);
-  
+
   // Check for variable pattern {{word
   const variableMatch = currentString.match(VARIABLE_PATTERN);
   if (variableMatch) {
     const wordMatch = variableMatch[1];
     const startPos = { line: cursor.line, ch: currentString.lastIndexOf('{{') + 2 };
     const { replaceFrom, replaceTo } = calculateVariableReplacementPositions(cursor, startPos, wordMatch);
-    
+
     return {
       word: wordMatch,
       from: replaceFrom,
@@ -353,13 +353,13 @@ const getCurrentWordWithContext = (cm) => {
       requiresBraces: true
     };
   }
-  
+
   // Check for regular word
   const wordInfo = extractWordFromLine(currentLine, cursor.ch);
   if (!wordInfo) {
     return null;
   }
-  
+
   const { word, start, end } = wordInfo;
   const { replaceFrom, replaceTo } = calculateWordReplacementPositions(cursor, start, end, word);
   const context = determineWordContext(word);
@@ -381,20 +381,20 @@ const getCurrentWordWithContext = (cm) => {
  */
 const extractNextSegmentSuggestions = (filteredHints, currentInput) => {
   const suggestions = new Set();
-  
-  filteredHints.forEach(hint => {
+
+  filteredHints.forEach((hint) => {
     if (!hint.toLowerCase().startsWith(currentInput.toLowerCase())) {
       return;
     }
-    
+
     // Handle exact match case
     if (hint.toLowerCase() === currentInput.toLowerCase()) {
       suggestions.add(hint.substring(hint.lastIndexOf('.') + 1));
       return;
     }
-    
+
     const inputLength = currentInput.length;
-    
+
     if (currentInput.endsWith('.')) {
       // Show next segment after the dot
       const afterDot = hint.substring(inputLength);
@@ -406,13 +406,13 @@ const extractNextSegmentSuggestions = (filteredHints, currentInput) => {
       const lastDotInInput = currentInput.lastIndexOf('.');
       const currentSegmentStart = lastDotInInput + 1;
       const nextDotAfterInput = hint.indexOf('.', currentSegmentStart);
-      const segment = nextDotAfterInput === -1 
+      const segment = nextDotAfterInput === -1
         ? hint.substring(currentSegmentStart)
         : hint.substring(currentSegmentStart, nextDotAfterInput);
       suggestions.add(segment);
     }
   });
-  
+
   return Array.from(suggestions).sort();
 };
 
@@ -426,7 +426,7 @@ const getHintParts = (filteredHints, currentInput) => {
   if (!filteredHints || filteredHints.length === 0) {
     return [];
   }
-  
+
   return extractNextSegmentSuggestions(filteredHints, currentInput);
 };
 
@@ -439,18 +439,18 @@ const getHintParts = (filteredHints, currentInput) => {
  */
 const getAllowedHintsByContext = (categorizedHints, context, showHintsFor) => {
   let allowedHints = [];
-  
+
   if (context === 'variables' && showHintsFor.includes('variables')) {
     allowedHints = [...categorizedHints.variables];
   } else if (context === 'api') {
-    const hasApiHints = showHintsFor.some(hint => ['req', 'res', 'bru'].includes(hint));
+    const hasApiHints = showHintsFor.some((hint) => ['req', 'res', 'bru'].includes(hint));
     if (hasApiHints) {
       allowedHints = [...categorizedHints.api];
     }
   } else if (context === 'anyword') {
     allowedHints = [...categorizedHints.anyword];
   }
-  
+
   return allowedHints;
 };
 
@@ -466,15 +466,15 @@ const filterHintsByContext = (categorizedHints, currentWord, context, showHintsF
   if (!currentWord) {
     return [];
   }
-  
+
   const allowedHints = getAllowedHintsByContext(categorizedHints, context, showHintsFor);
-  
-  const filtered = allowedHints.filter(hint => {
+
+  const filtered = allowedHints.filter((hint) => {
     return hint.toLowerCase().startsWith(currentWord.toLowerCase());
   });
-  
+
   const hintParts = getHintParts(filtered, currentWord);
-  
+
   return hintParts.slice(0, 50);
 };
 
@@ -486,11 +486,11 @@ const filterHintsByContext = (categorizedHints, currentWord, context, showHintsF
  * @returns {Object} Hint object with list and positions
  */
 const createVariableHintList = (filteredHints, from, to) => {
-  const hintList = filteredHints.map(hint => ({
+  const hintList = filteredHints.map((hint) => ({
     text: hint,
     displayText: hint
   }));
-  
+
   return {
     list: hintList,
     from,
@@ -525,23 +525,23 @@ export const getAutoCompleteHints = (cm, allVariables = {}, anywordAutocompleteH
   if (!allVariables) {
     return null;
   }
-  
+
   const wordInfo = getCurrentWordWithContext(cm);
   if (!wordInfo) {
     return null;
   }
-  
+
   const { word, from, to, context, requiresBraces } = wordInfo;
-  const showHintsFor = options.showHintsFor || [];  
-  
+  const showHintsFor = options.showHintsFor || [];
+
   // Check if this context requires braces but we're not in a brace context
   if (context === 'variables' && !requiresBraces) {
     return null;
   }
-  
+
   const categorizedHints = buildCategorizedHintsList(allVariables, anywordAutocompleteHints, options);
   const filteredHints = filterHintsByContext(categorizedHints, word, context, showHintsFor);
-  
+
   if (filteredHints.length === 0) {
     return null;
   }
@@ -549,7 +549,7 @@ export const getAutoCompleteHints = (cm, allVariables = {}, anywordAutocompleteH
   if (context === 'variables') {
     return createVariableHintList(filteredHints, from, to);
   }
-  
+
   return createStandardHintList(filteredHints, from, to);
 };
 
@@ -562,34 +562,34 @@ const handleClickForAutocomplete = (cm, options) => {
   const allVariables = options.getAllVariables?.() || {};
   const anywordAutocompleteHints = options.getAnywordAutocompleteHints?.() || [];
   const showHintsFor = options.showHintsFor || [];
-  
+
   // Build all available hints
   const categorizedHints = buildCategorizedHintsList(allVariables, anywordAutocompleteHints, options);
-  
+
   // Combine all hints based on showHintsFor configuration
   let allHints = [];
-  
+
   // Add API hints if enabled
-  const hasApiHints = showHintsFor.some(hint => ['req', 'res', 'bru'].includes(hint));
+  const hasApiHints = showHintsFor.some((hint) => ['req', 'res', 'bru'].includes(hint));
   if (hasApiHints) {
     allHints = [...allHints, ...categorizedHints.api];
   }
-  
+
   // Add variable hints if enabled
   if (showHintsFor.includes('variables')) {
     allHints = [...allHints, ...categorizedHints.variables];
   }
-  
+
   // Add anyword hints (always included)
   allHints = [...allHints, ...categorizedHints.anyword];
-  
+
   // Remove duplicates and sort
   allHints = [...new Set(allHints)].sort();
-  
+
   if (allHints.length === 0) {
     return;
   }
-  
+
   const cursor = cm.getCursor();
 
   if (cursor.ch > 0) return;
@@ -618,18 +618,18 @@ const handleKeyupForAutocomplete = (cm, event, options) => {
   if (!NON_CHARACTER_KEYS.test(event?.key)) {
     return;
   }
-  
+
   const allVariables = options.getAllVariables?.() || {};
   const anywordAutocompleteHints = options.getAnywordAutocompleteHints?.() || [];
   const hints = getAutoCompleteHints(cm, allVariables, anywordAutocompleteHints, options);
-  
+
   if (!hints) {
     if (cm.state.completionActive) {
       cm.state.completionActive.close();
     }
     return;
   }
-  
+
   cm.showHint({
     hint: () => hints,
     completeSingle: false
@@ -646,11 +646,11 @@ export const setupAutoComplete = (editor, options = {}) => {
   if (!editor) {
     return;
   }
-  
+
   const keyupHandler = (cm, event) => {
     handleKeyupForAutocomplete(cm, event, options);
   };
-  
+
   editor.on('keyup', keyupHandler);
 
   const clickHandler = (cm) => {
@@ -659,12 +659,12 @@ export const setupAutoComplete = (editor, options = {}) => {
       handleClickForAutocomplete(cm, options);
     }
   };
-  
+
   // Add click handler if showHintsOnClick is enabled
   if (options.showHintsOnClick) {
     editor.on('mousedown', clickHandler);
   }
-  
+
   return () => {
     editor.off('keyup', keyupHandler);
     if (options.showHintsOnClick) {
@@ -678,4 +678,4 @@ if (!CodeMirror.commands.autocomplete) {
   CodeMirror.commands.autocomplete = (cm, hint, options) => {
     cm.showHint({ hint, ...options });
   };
-}
\ No newline at end of file
+}
diff --git a/packages/bruno-app/src/utils/codemirror/autocomplete.spec.js b/packages/bruno-app/src/utils/codemirror/autocomplete.spec.js
index 5a8d984c1..124fc0cb0 100644
--- a/packages/bruno-app/src/utils/codemirror/autocomplete.spec.js
+++ b/packages/bruno-app/src/utils/codemirror/autocomplete.spec.js
@@ -16,9 +16,9 @@ jest.mock('codemirror', () => {
 });
 
 // Import the functions to test
-import { 
-  getAutoCompleteHints, 
-  setupAutoComplete 
+import {
+  getAutoCompleteHints,
+  setupAutoComplete
 } from './autocomplete';
 
 describe('Bruno Autocomplete', () => {
@@ -40,7 +40,7 @@ describe('Bruno Autocomplete', () => {
         mockedCodemirror.getRange.mockReturnValue('{{envVar');
         const allVariables = {
           envVar1: 'value1',
-          envVar2: 'value2',
+          envVar2: 'value2'
         };
 
         const result = getAutoCompleteHints(mockedCodemirror, allVariables, [], {
@@ -59,7 +59,7 @@ describe('Bruno Autocomplete', () => {
       it('should include mock data functions with $ prefix', () => {
         mockedCodemirror.getCursor.mockReturnValue({ line: 0, ch: 9 });
         mockedCodemirror.getRange.mockReturnValue('{{$randomI');
-        
+
         const result = getAutoCompleteHints(mockedCodemirror, {}, [], {
           showHintsFor: ['variables']
         });
@@ -334,11 +334,11 @@ describe('Bruno Autocomplete', () => {
         });
 
         expect(result).toBeTruthy();
-        const displayTexts = result.list.map(item => 
+        const displayTexts = result.list.map((item) =>
           typeof item === 'object' ? item.displayText : item
         );
-        
-        const userVars = displayTexts.filter(text => !text.startsWith('$'));
+
+        const userVars = displayTexts.filter((text) => !text.startsWith('$'));
         expect(userVars).toEqual(['apple', 'banana', 'zebra']);
       });
     });
@@ -440,9 +440,9 @@ describe('Bruno Autocomplete', () => {
 
     describe('Event handling', () => {
       it('should trigger hints on character key press', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables,
-          showHintsFor: ['req'] 
+          showHintsFor: ['req']
         };
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
         const keyupHandler = mockedCodemirror.on.mock.calls[0][1];
@@ -465,7 +465,7 @@ describe('Bruno Autocomplete', () => {
 
         const nonCharacterKeys = ['Shift', 'Tab', 'Enter', 'Escape', 'ArrowUp', 'ArrowDown', 'Meta'];
 
-        nonCharacterKeys.forEach(key => {
+        nonCharacterKeys.forEach((key) => {
           const mockEvent = { key };
           keyupHandler(mockedCodemirror, mockEvent);
         });
@@ -492,9 +492,9 @@ describe('Bruno Autocomplete', () => {
       });
 
       it('should pass options to getAutoCompleteHints', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables,
-          showHintsFor: ['req'] 
+          showHintsFor: ['req']
         };
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
         const keyupHandler = mockedCodemirror.on.mock.calls[0][1];
@@ -515,9 +515,9 @@ describe('Bruno Autocomplete', () => {
 
     describe('Click event handling (showHintsOnClick)', () => {
       it('should setup mousedown event listener when showHintsOnClick is enabled', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables,
-          showHintsOnClick: true 
+          showHintsOnClick: true
         };
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
 
@@ -527,9 +527,9 @@ describe('Bruno Autocomplete', () => {
       });
 
       it('should not setup mousedown event listener when showHintsOnClick is disabled', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables,
-          showHintsOnClick: false 
+          showHintsOnClick: false
         };
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
 
@@ -538,7 +538,7 @@ describe('Bruno Autocomplete', () => {
       });
 
       it('should not setup mousedown event listener when showHintsOnClick is undefined', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables
         };
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
@@ -549,9 +549,9 @@ describe('Bruno Autocomplete', () => {
 
       it('should show hints on click when showHintsOnClick is enabled', () => {
         jest.useFakeTimers();
-        
+
         const mockGetAnywordAutocompleteHints = jest.fn(() => ['Content-Type', 'Accept']);
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables,
           getAnywordAutocompleteHints: mockGetAnywordAutocompleteHints,
           showHintsOnClick: true,
@@ -560,8 +560,8 @@ describe('Bruno Autocomplete', () => {
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
 
         // Find the click handler (mousedown event)
-        const clickHandler = mockedCodemirror.on.mock.calls.find(call => call[0] === 'mousedown')[1];
-        
+        const clickHandler = mockedCodemirror.on.mock.calls.find((call) => call[0] === 'mousedown')[1];
+
         mockedCodemirror.getCursor.mockReturnValue({ line: 0, ch: 0 });
 
         clickHandler(mockedCodemirror);
@@ -572,26 +572,26 @@ describe('Bruno Autocomplete', () => {
         expect(mockGetAllVariables).toHaveBeenCalled();
         expect(mockGetAnywordAutocompleteHints).toHaveBeenCalled();
         expect(mockedCodemirror.showHint).toHaveBeenCalled();
-        
+
         jest.useRealTimers();
       });
 
       it('should not show hints on click when showHintsOnClick is disabled', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables,
-          showHintsOnClick: false 
+          showHintsOnClick: false
         };
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
 
         // There should be no mousedown handler
-        const mousedownCalls = mockedCodemirror.on.mock.calls.filter(call => call[0] === 'mousedown');
+        const mousedownCalls = mockedCodemirror.on.mock.calls.filter((call) => call[0] === 'mousedown');
         expect(mousedownCalls).toHaveLength(0);
       });
 
       it('should cleanup mousedown event listener when showHintsOnClick was enabled', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables,
-          showHintsOnClick: true 
+          showHintsOnClick: true
         };
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
 
@@ -603,9 +603,9 @@ describe('Bruno Autocomplete', () => {
       });
 
       it('should only cleanup keyup event listener when showHintsOnClick was disabled', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables,
-          showHintsOnClick: false 
+          showHintsOnClick: false
         };
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
 
@@ -617,9 +617,9 @@ describe('Bruno Autocomplete', () => {
 
       it('should show all available hints on click based on showHintsFor configuration', () => {
         jest.useFakeTimers();
-        
+
         const mockGetAnywordAutocompleteHints = jest.fn(() => ['Content-Type', 'Accept']);
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables.mockReturnValue({
             envVar1: 'value1',
             envVar2: 'value2'
@@ -631,8 +631,8 @@ describe('Bruno Autocomplete', () => {
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
 
         // Find the click handler (mousedown event)
-        const clickHandler = mockedCodemirror.on.mock.calls.find(call => call[0] === 'mousedown')[1];
-        
+        const clickHandler = mockedCodemirror.on.mock.calls.find((call) => call[0] === 'mousedown')[1];
+
         const mockCursor = { line: 0, ch: 0 };
         mockedCodemirror.getCursor.mockReturnValue(mockCursor);
 
@@ -649,19 +649,19 @@ describe('Bruno Autocomplete', () => {
         // Verify the hint function returns the expected structure
         const hintCall = mockedCodemirror.showHint.mock.calls[0][0];
         const hintResult = hintCall.hint();
-        
+
         expect(hintResult).toEqual({
           list: expect.any(Array),
           from: mockCursor,
           to: mockCursor
         });
         expect(hintResult.list.length).toBeGreaterThan(0);
-        
+
         jest.useRealTimers();
       });
 
       it('should not show hints on click when no hints are available', () => {
-        const options = { 
+        const options = {
           getAllVariables: mockGetAllVariables.mockReturnValue({}),
           getAnywordAutocompleteHints: jest.fn(() => []),
           showHintsOnClick: true,
@@ -670,8 +670,8 @@ describe('Bruno Autocomplete', () => {
         cleanupFn = setupAutoComplete(mockedCodemirror, options);
 
         // Find the click handler (mousedown event)
-        const clickHandler = mockedCodemirror.on.mock.calls.find(call => call[0] === 'mousedown')[1];
-        
+        const clickHandler = mockedCodemirror.on.mock.calls.find((call) => call[0] === 'mousedown')[1];
+
         mockedCodemirror.getCursor.mockReturnValue({ line: 0, ch: 0 });
 
         clickHandler(mockedCodemirror);
@@ -704,4 +704,4 @@ describe('Bruno Autocomplete', () => {
       expect(mockedCodemirror.commands.autocomplete).toBe(existingCommand);
     });
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-app/src/utils/codemirror/brunoVarInfo.js b/packages/bruno-app/src/utils/codemirror/brunoVarInfo.js
index 8f87c6824..0559500de 100644
--- a/packages/bruno-app/src/utils/codemirror/brunoVarInfo.js
+++ b/packages/bruno-app/src/utils/codemirror/brunoVarInfo.js
@@ -7,20 +7,27 @@
  */
 
 import { interpolate } from '@usebruno/common';
+import { getVariableScope, isVariableSecret, getAllVariables } from 'utils/collections';
+import { updateVariableInScope } from 'providers/ReduxStore/slices/collections/actions';
+import store from 'providers/ReduxStore';
+import { defineCodeMirrorBrunoVariablesMode } from 'utils/common/codemirror';
+import { MaskedEditor } from 'utils/common/masked-editor';
+import { setupAutoComplete } from 'utils/codemirror/autocomplete';
+import { variableNameRegex } from 'utils/common/regex';
 
 let CodeMirror;
 const SERVER_RENDERED = typeof window === 'undefined' || global['PREVENT_CODEMIRROR_RENDER'] === true;
 const { get } = require('lodash');
 
 const COPY_ICON_SVG_TEXT = `
-    <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+    <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
       <rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
       <path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
     </svg>
 `;
 
 const CHECKMARK_ICON_SVG_TEXT = `
-<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
   <polyline points="20,6 9,17 4,12"></polyline>
 </svg>
 `;
@@ -29,43 +36,100 @@ const COPY_SUCCESS_COLOR = '#22c55e';
 
 export const COPY_SUCCESS_TIMEOUT = 1000;
 
-const getCopyButton = (variableValue) => {
+// Editor height constraints
+const EDITOR_MIN_HEIGHT = 1.75;
+const EDITOR_MAX_HEIGHT = 11.125;
+
+/**
+ * Calculate editor height based on content, clamped between min and max
+ * @param {number} contentHeight - The actual content height from CodeMirror
+ * @returns {number} The clamped height value
+ */
+const calculateEditorHeight = (contentHeight) => {
+  const contentHeightRem = contentHeight / 16;
+  return Math.min(Math.max(contentHeightRem, EDITOR_MIN_HEIGHT), EDITOR_MAX_HEIGHT);
+};
+
+const EYE_ICON_SVG = `
+  <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"></path>
+    <circle cx="12" cy="12" r="3"></circle>
+  </svg>
+`;
+
+const EYE_OFF_ICON_SVG = `
+  <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24"></path>
+    <line x1="1" y1="1" x2="23" y2="23"></line>
+  </svg>
+`;
+
+const getScopeLabel = (scopeType) => {
+  const labels = {
+    'global': 'Global',
+    'environment': 'Environment',
+    'collection': 'Collection',
+    'folder': 'Folder',
+    'request': 'Request',
+    'runtime': 'Runtime',
+    'process.env': 'Process Env',
+    'undefined': 'Undefined'
+  };
+  return labels[scopeType] || scopeType;
+};
+
+// Get the masked display text based on the value length
+const getMaskedDisplay = (value) => {
+  const contentLength = (value || '').length;
+  return contentLength > 0 ? '*'.repeat(contentLength) : '';
+};
+
+// Update the value display based on the secret and masked state
+const updateValueDisplay = (valueDisplay, value, isSecret, isMasked, isRevealed) => {
+  if ((isSecret || isMasked) && !isRevealed) {
+    valueDisplay.textContent = getMaskedDisplay(value);
+  } else {
+    valueDisplay.textContent = value || '';
+  }
+};
+
+// Check if the raw value contains references to secret variables
+const containsSecretVariableReferences = (rawValue, collection, item) => {
+  if (!rawValue || typeof rawValue !== 'string') {
+    return false;
+  }
+
+  // Match all variable references like {{varName}}
+  const variableReferencePattern = /\{\{([^}]+)\}\}/g;
+  const matches = rawValue.matchAll(variableReferencePattern);
+
+  for (const match of matches) {
+    const referencedVarName = match[1].trim();
+
+    // Get scope info for the referenced variable
+    const referencedScopeInfo = getVariableScope(referencedVarName, collection, item);
+
+    // Check if the referenced variable is a secret
+    if (referencedScopeInfo && isVariableSecret(referencedScopeInfo)) {
+      return true;
+    }
+  }
+
+  return false;
+};
+
+const getCopyButton = (variableValue, onCopyCallback) => {
   const copyButton = document.createElement('button');
 
   copyButton.className = 'copy-button';
-  copyButton.style.backgroundColor = 'transparent';
-  copyButton.style.border = 'none';
-  copyButton.style.color = 'inherit';
-  copyButton.style.cursor = 'pointer';
-  copyButton.style.padding = '2px';
-  copyButton.style.opacity = '0.7';
-  copyButton.style.transition = 'opacity 0.2s ease';
-  copyButton.style.display = 'flex';
-  copyButton.style.alignItems = 'center';
-  copyButton.style.justifyContent = 'center';
-
   copyButton.innerHTML = COPY_ICON_SVG_TEXT;
+  copyButton.type = 'button';
 
   let isCopied = false;
 
-  copyButton.addEventListener('mouseenter', () => {
-    if (isCopied) {
-      return;
-    }
-
-    copyButton.style.opacity = '1';
-  });
-
-  copyButton.addEventListener('mouseleave', () => {
-    if (isCopied) {
-      return;
-    }
-
-    copyButton.style.opacity = '0.7';
-  });
-
   copyButton.addEventListener('click', (e) => {
     e.stopPropagation();
+    e.preventDefault();
 
     // Prevent clicking if showing success checkmark
     if (isCopied) {
@@ -77,7 +141,6 @@ const getCopyButton = (variableValue) => {
       .then(() => {
         isCopied = true;
         copyButton.innerHTML = CHECKMARK_ICON_SVG_TEXT;
-        copyButton.style.opacity = '1';
         copyButton.style.color = COPY_SUCCESS_COLOR;
         copyButton.style.cursor = 'default';
         copyButton.classList.add('copy-success');
@@ -85,11 +148,15 @@ const getCopyButton = (variableValue) => {
         setTimeout(() => {
           isCopied = false;
           copyButton.innerHTML = COPY_ICON_SVG_TEXT;
-          copyButton.style.opacity = '0.7';
-          copyButton.style.color = 'inherit';
+          copyButton.style.color = '#989898';
           copyButton.style.cursor = 'pointer';
           copyButton.classList.remove('copy-success');
         }, COPY_SUCCESS_TIMEOUT);
+
+        // Call callback if provided
+        if (onCopyCallback) {
+          onCopyCallback();
+        }
       })
       .catch((err) => {
         console.error('Failed to copy to clipboard:', err.message);
@@ -99,37 +166,380 @@ const getCopyButton = (variableValue) => {
   return copyButton;
 };
 
-export const renderVarInfo = (token, options, cm, pos) => {
+export const renderVarInfo = (token, options) => {
   // Extract variable name and value based on token
   const { variableName, variableValue } = extractVariableInfo(token.string, options.variables);
 
-  if (variableValue === undefined) {
+  // Don't show popover if we can't extract a variable name or if it's empty/whitespace
+  if (!variableName || !variableName.trim()) {
     return;
   }
 
-  const into = document.createElement('div');
+  const collection = options.collection;
+  const item = options.item;
 
-  const contentDiv = document.createElement('div');
-  contentDiv.style.display = 'flex';
-  contentDiv.style.alignItems = 'center';
-  contentDiv.style.gap = '8px';
-  contentDiv.className = 'info-content';
-
-  const descriptionDiv = document.createElement('div');
-  descriptionDiv.className = 'info-description';
-  descriptionDiv.style.flex = '1';
-
-  if (options?.variables?.maskedEnvVariables?.includes(variableName)) {
-    descriptionDiv.appendChild(document.createTextNode('*****'));
+  // Check if this is a process.env variable (starts with "process.env.")
+  let scopeInfo;
+  if (variableName.startsWith('process.env.')) {
+    scopeInfo = {
+      type: 'process.env',
+      value: variableValue || '',
+      data: null
+    };
   } else {
-    descriptionDiv.appendChild(document.createTextNode(variableValue));
+    // Detect variable scope
+    scopeInfo = getVariableScope(variableName, collection, item);
+
+    // If variable doesn't exist in any scope, determine scope based on context
+    if (!scopeInfo) {
+      if (item) {
+        // Determine if item is a folder or request
+        const isFolder = item.type === 'folder';
+
+        if (isFolder) {
+          // We're in folder settings - create as folder variable
+          scopeInfo = {
+            type: 'folder',
+            value: '', // Empty value for new variable
+            data: { folder: item, variable: null } // variable is null since it doesn't exist yet
+          };
+        } else {
+          // We're in a request - create as request variable
+          scopeInfo = {
+            type: 'request',
+            value: '', // Empty value for new variable
+            data: { item, variable: null } // variable is null since it doesn't exist yet
+          };
+        }
+      } else if (collection) {
+        // No item context but we have collection - create as collection variable
+        scopeInfo = {
+          type: 'collection',
+          value: '',
+          data: { collection, variable: null }
+        };
+      } else {
+        // No context at all, show as undefined
+        scopeInfo = {
+          type: 'undefined',
+          value: '',
+          data: null
+        };
+      }
+    }
   }
 
-  const copyButton = getCopyButton(variableValue);
+  // Check if variable is read-only (process.env, runtime, and undefined variables cannot be edited)
+  const isReadOnly = scopeInfo.type === 'process.env' || scopeInfo.type === 'runtime' || scopeInfo.type === 'undefined';
 
-  contentDiv.appendChild(descriptionDiv);
-  contentDiv.appendChild(copyButton);
-  into.appendChild(contentDiv);
+  // Get raw value from scope
+  const rawValue = scopeInfo.value || '';
+
+  // Check if variable should be masked:
+  const isSecret = scopeInfo.type !== 'undefined' ? isVariableSecret(scopeInfo) : false;
+  const hasSecretReferences = containsSecretVariableReferences(rawValue, collection, item);
+  const shouldMaskValue = isSecret || hasSecretReferences;
+
+  const isMasked = options.variables?.maskedEnvVariables?.includes(variableName);
+
+  const into = document.createElement('div');
+  into.className = 'bruno-var-info-container';
+
+  // Header: Variable name + Scope badge
+  const header = document.createElement('div');
+  header.className = 'var-info-header';
+
+  const varName = document.createElement('span');
+  varName.className = 'var-name';
+  varName.textContent = variableName;
+
+  const scopeBadge = document.createElement('span');
+  scopeBadge.className = 'var-scope-badge';
+
+  // Show scope label with indication if it's a new variable
+  const scopeLabel = scopeInfo ? getScopeLabel(scopeInfo.type) : 'Unknown';
+  const isNewVariable = scopeInfo && scopeInfo.data && scopeInfo.data.variable === null;
+  scopeBadge.textContent = isNewVariable ? `${scopeLabel}` : scopeLabel;
+
+  header.appendChild(varName);
+  header.appendChild(scopeBadge);
+  into.appendChild(header);
+
+  // Check if variable name is valid (only for non-process.env variables)
+  const isValidVariableName = scopeInfo.type === 'process.env' || variableNameRegex.test(variableName);
+
+  // Show warning if variable name is invalid
+  if (!isValidVariableName) {
+    const warningNote = document.createElement('div');
+    warningNote.className = 'var-warning-note';
+    warningNote.textContent = 'Invalid variable name! Variables must only contain alpha-numeric characters, "-", "_", "."';
+    into.appendChild(warningNote);
+
+    // Don't show value or any other content for invalid variable names
+    return into;
+  }
+
+  // Value container with icons
+  const valueContainer = document.createElement('div');
+  valueContainer.className = 'var-value-container';
+
+  // Create editable value display/editor (if editable)
+  if (!isReadOnly && scopeInfo) {
+    // Handle secret/masked variables state
+    let isRevealed = false;
+
+    // Create display element (shows interpolated value by default)
+    const valueDisplay = document.createElement('div');
+    valueDisplay.className = 'var-value-editable-display';
+    // Mask the displayed value if it contains secrets or references to secrets
+    updateValueDisplay(valueDisplay, variableValue, shouldMaskValue, isMasked, false);
+
+    // Create container for CodeMirror (hidden by default)
+    const editorContainer = document.createElement('div');
+    editorContainer.className = 'var-value-editor';
+    editorContainer.style.display = 'none'; // Hidden initially
+
+    // Detect current theme from DOM
+    const isDarkTheme = document.documentElement.classList.contains('dark');
+    const cmTheme = isDarkTheme ? 'monokai' : 'default';
+
+    // Get all variables for syntax highlighting (but prevent recursive tooltips)
+    const allVariables = collection ? getAllVariables(collection, item) : {};
+
+    // Create CodeMirror instance
+    const cmEditor = CodeMirror(editorContainer, {
+      value: typeof rawValue === 'string' ? rawValue : String(rawValue), // Use raw value (e.g., {{echo-host}} not resolved value) (ensure it's always a string for CodeMirror) #usebruno/bruno/#6265
+      mode: 'brunovariables',
+      theme: cmTheme,
+      lineWrapping: true,
+      lineNumbers: false,
+      brunoVarInfo: false, // Disable tooltips within the editor to prevent recursion
+      scrollbarStyle: null,
+      viewportMargin: Infinity
+    });
+
+    // Setup variable mode for syntax highlighting
+    defineCodeMirrorBrunoVariablesMode(allVariables, 'text/plain', false, true);
+    cmEditor.setOption('mode', 'brunovariables');
+
+    // Setup autocomplete
+    const getAllVariablesHandler = () => allVariables;
+    const autoCompleteOptions = {
+      getAllVariables: getAllVariablesHandler,
+      showHintsFor: ['variables']
+    };
+    const autoCompleteCleanup = setupAutoComplete(cmEditor, autoCompleteOptions);
+
+    // Handle secret/masked variables
+    let maskedEditor = null;
+
+    if (shouldMaskValue || isMasked) {
+      maskedEditor = new MaskedEditor(cmEditor);
+      maskedEditor.enable();
+    }
+
+    // Store original value for comparison and track editing state
+    let originalValue = rawValue;
+    let isEditing = false;
+
+    cmEditor.setOption('extraKeys', {
+      'Enter': (cm) => {
+        // Enter: save and blur
+        cm.getInputField().blur();
+      },
+      'Shift-Enter': (cm) => {
+        // Shift+Enter: insert new line
+        cm.replaceSelection('\n', 'end');
+      }
+    });
+
+    // Dynamically adjust editor height as content changes
+    cmEditor.on('change', () => {
+      if (isEditing) {
+        // Use requestAnimationFrame for smoother updates after DOM changes
+        requestAnimationFrame(() => {
+          cmEditor.refresh();
+          // Get height from the actual rendered sizer element (more accurate)
+          const sizer = cmEditor.getWrapperElement().querySelector('.CodeMirror-sizer');
+          const contentHeight = sizer ? sizer.clientHeight : cmEditor.getScrollInfo().height;
+          const newHeight = calculateEditorHeight(contentHeight);
+          editorContainer.style.height = `${newHeight}rem`;
+        });
+      }
+    });
+
+    // Icons container (top-right)
+    const iconsContainer = document.createElement('div');
+    iconsContainer.className = 'var-icons';
+
+    // Eye toggle button (show if the displayed value is masked)
+    if (shouldMaskValue || isMasked) {
+      const toggleButton = document.createElement('button');
+      toggleButton.className = 'secret-toggle-button';
+      toggleButton.innerHTML = EYE_ICON_SVG;
+      toggleButton.type = 'button';
+
+      toggleButton.addEventListener('click', (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+        isRevealed = !isRevealed;
+
+        // Update icon
+        toggleButton.innerHTML = isRevealed ? EYE_OFF_ICON_SVG : EYE_ICON_SVG;
+
+        // Update display mode
+        updateValueDisplay(valueDisplay, variableValue, shouldMaskValue, isMasked, isRevealed);
+
+        // Update editor mode
+        if (maskedEditor) {
+          isRevealed ? maskedEditor.disable() : maskedEditor.enable();
+        }
+
+        // Refocus the editor if it's currently in edit mode
+        if (isEditing) {
+          setTimeout(() => {
+            cmEditor.focus();
+          }, 0);
+        }
+      });
+
+      iconsContainer.appendChild(toggleButton);
+    }
+
+    // Copy button (copy actual value, not masked)
+    const copyButton = getCopyButton(variableValue || '', () => {
+      // Refocus the editor if it's currently in edit mode
+      if (isEditing) {
+        setTimeout(() => {
+          cmEditor.focus();
+        }, 0);
+      }
+    });
+    iconsContainer.appendChild(copyButton);
+
+    valueContainer.appendChild(valueDisplay);
+    valueContainer.appendChild(editorContainer);
+    valueContainer.appendChild(iconsContainer);
+
+    // Click on display to enter edit mode
+    valueDisplay.addEventListener('click', () => {
+      if (isEditing) return;
+
+      isEditing = true;
+      valueDisplay.style.display = 'none';
+      editorContainer.style.display = 'block';
+
+      // Focus the editor and ensure proper sizing
+      setTimeout(() => {
+        cmEditor.refresh();
+        cmEditor.focus();
+
+        // Set cursor to end of content
+        const lineCount = cmEditor.lineCount();
+        const lastLine = cmEditor.getLine(lineCount - 1);
+        cmEditor.setCursor(lineCount - 1, lastLine ? lastLine.length : 0);
+
+        // Adjust height based on content
+        const contentHeight = cmEditor.getScrollInfo().height;
+        editorContainer.style.height = `${calculateEditorHeight(contentHeight)}rem`;
+      }, 0);
+    });
+
+    // Save on blur and return to display mode
+    cmEditor.on('blur', () => {
+      const newValue = cmEditor.getValue();
+
+      // Switch back to display mode
+      editorContainer.style.display = 'none';
+      editorContainer.style.height = `${EDITOR_MIN_HEIGHT}rem`; // Reset to minimum height
+      valueDisplay.style.display = 'block';
+      isEditing = false;
+
+      if (newValue !== originalValue) {
+        // Dispatch Redux action to update variable
+        const dispatch = store.dispatch;
+        dispatch(updateVariableInScope(variableName, newValue, scopeInfo, collection.uid))
+          .then(() => {
+            originalValue = newValue;
+            // Re-interpolate the new value to show the resolved value in display
+            const interpolatedValue = interpolate(newValue, allVariables);
+            // Check if the NEW value contains secret references
+            const newHasSecretRefs = containsSecretVariableReferences(newValue, collection, item);
+            const newShouldMask = isSecret || newHasSecretRefs;
+            updateValueDisplay(valueDisplay, interpolatedValue, newShouldMask, isMasked, isRevealed);
+          })
+          .catch((err) => {
+            console.error('Failed to update variable:', err);
+            // Revert on error
+            cmEditor.setValue(originalValue);
+            updateValueDisplay(valueDisplay, variableValue, shouldMaskValue, isMasked, isRevealed);
+          });
+      }
+    });
+
+    // Store references for cleanup
+    valueContainer._cmEditor = cmEditor;
+    valueContainer._maskedEditor = maskedEditor;
+    valueContainer._autoCompleteCleanup = autoCompleteCleanup;
+  } else {
+    // Read-only display (for runtime, process.env, undefined variables)
+    let isRevealed = false;
+
+    const valueDisplay = document.createElement('div');
+    valueDisplay.className = 'var-value-display';
+    // For read-only variables, still check if they reference secrets
+    updateValueDisplay(valueDisplay, variableValue, shouldMaskValue, isMasked, false);
+
+    // Icons container
+    const iconsContainer = document.createElement('div');
+    iconsContainer.className = 'var-icons';
+
+    // Eye toggle button (for read-only variables that reference secrets or are masked)
+    if (shouldMaskValue || isMasked) {
+      const toggleButton = document.createElement('button');
+      toggleButton.className = 'secret-toggle-button';
+      toggleButton.innerHTML = EYE_ICON_SVG;
+      toggleButton.type = 'button';
+
+      toggleButton.addEventListener('click', (e) => {
+        e.stopPropagation();
+        e.preventDefault();
+        isRevealed = !isRevealed;
+
+        toggleButton.innerHTML = isRevealed ? EYE_OFF_ICON_SVG : EYE_ICON_SVG;
+        updateValueDisplay(valueDisplay, variableValue, shouldMaskValue, isMasked, isRevealed);
+      });
+
+      iconsContainer.appendChild(toggleButton);
+    }
+
+    // Copy button (always copy actual value, not masked)
+    const copyButton = getCopyButton(variableValue || '');
+    iconsContainer.appendChild(copyButton);
+
+    valueContainer.appendChild(valueDisplay);
+    valueContainer.appendChild(iconsContainer);
+
+    // Read-only note
+    if (scopeInfo.type === 'process.env') {
+      const readOnlyNote = document.createElement('div');
+      readOnlyNote.className = 'var-readonly-note';
+      readOnlyNote.textContent = 'read-only';
+      into.appendChild(readOnlyNote);
+    } else if (scopeInfo.type === 'runtime') {
+      const readOnlyNote = document.createElement('div');
+      readOnlyNote.className = 'var-readonly-note';
+      readOnlyNote.textContent = 'Set by scripts (read-only)';
+      into.appendChild(readOnlyNote);
+    } else if (scopeInfo.type === 'undefined') {
+      const readOnlyNote = document.createElement('div');
+      readOnlyNote.className = 'var-readonly-note';
+      readOnlyNote.textContent = 'No active environment';
+      into.appendChild(readOnlyNote);
+    }
+  }
+
+  into.appendChild(valueContainer);
 
   return into;
 };
@@ -137,6 +547,9 @@ export const renderVarInfo = (token, options, cm, pos) => {
 if (!SERVER_RENDERED) {
   CodeMirror = require('codemirror');
 
+  // Global state to track active popup
+  let activePopup = null;
+
   CodeMirror.defineOption('brunoVarInfo', false, function (cm, options, old) {
     if (old && old !== CodeMirror.Init) {
       const oldOnMouseOver = cm.state.brunoVarInfo.onMouseOver;
@@ -167,10 +580,12 @@ if (!SERVER_RENDERED) {
     const state = cm.state.brunoVarInfo;
     const target = e.target || e.srcElement;
 
+    // Prevent new tooltips if one is already active
     if (target.nodeName !== 'SPAN' || state.hoverTimeout !== undefined) {
       return;
     }
-    if (!target.classList.contains('cm-variable-valid')) {
+    // Show popover for both valid and invalid variables
+    if (!target.classList.contains('cm-variable-valid') && !target.classList.contains('cm-variable-invalid')) {
       return;
     }
 
@@ -210,9 +625,51 @@ if (!SERVER_RENDERED) {
 
     const state = cm.state.brunoVarInfo;
     const options = state.options;
-    const token = cm.getTokenAt(pos, true);
+    let token = cm.getTokenAt(pos, true);
+
     if (token) {
-      const brunoVarInfo = renderVarInfo(token, options, cm, pos);
+      const line = cm.getLine(pos.line);
+
+      // Find the opening {{ before the cursor
+      let start = token.start;
+      while (start > 0 && !line.substring(start - 2, start).includes('{{')) {
+        // Stop if we encounter }} - we've gone past the start of our variable
+        if (line.substring(start - 2, start) === '}}') {
+          break;
+        }
+        start--;
+      }
+      if (line.substring(start - 2, start) === '{{') {
+        start = start - 2;
+      }
+
+      // Find the closing }} after the cursor
+      let end = token.end;
+      while (end < line.length && !line.substring(end, end + 2).includes('}}')) {
+        // Stop if we encounter {{ - we've gone past the end of our variable
+        if (line.substring(end, end + 2) === '{{') {
+          break;
+        }
+        end++;
+      }
+      if (line.substring(end, end + 2) === '}}') {
+        end = end + 2;
+      }
+
+      // Extract the full variable string including {{ and }}
+      const fullVariableString = line.substring(start, end);
+
+      // Only use the expanded string if it looks like a complete variable
+      if (fullVariableString.startsWith('{{') && fullVariableString.endsWith('}}')) {
+        token = {
+          ...token,
+          string: fullVariableString,
+          start: start,
+          end: end
+        };
+      }
+
+      const brunoVarInfo = renderVarInfo(token, options);
       if (brunoVarInfo) {
         showPopup(cm, box, brunoVarInfo);
       }
@@ -220,40 +677,59 @@ if (!SERVER_RENDERED) {
   }
 
   function showPopup(cm, box, brunoVarInfo) {
+    // If there's already an active popup, remove it first
+    if (activePopup && activePopup.parentNode) {
+      activePopup.parentNode.removeChild(activePopup);
+      activePopup = null;
+    }
+
     const popup = document.createElement('div');
     popup.className = 'CodeMirror-brunoVarInfo';
     popup.appendChild(brunoVarInfo);
     document.body.appendChild(popup);
 
+    // Track this popup as the active one
+    activePopup = popup;
+
     const popupBox = popup.getBoundingClientRect();
     const popupStyle = popup.currentStyle || window.getComputedStyle(popup);
-    const popupWidth =
-      popupBox.right - popupBox.left + parseFloat(popupStyle.marginLeft) + parseFloat(popupStyle.marginRight);
-    const popupHeight =
-      popupBox.bottom - popupBox.top + parseFloat(popupStyle.marginTop) + parseFloat(popupStyle.marginBottom);
+    const popupWidth
+      = popupBox.right - popupBox.left + parseFloat(popupStyle.marginLeft) + parseFloat(popupStyle.marginRight);
+    const popupHeight
+      = popupBox.bottom - popupBox.top + parseFloat(popupStyle.marginTop) + parseFloat(popupStyle.marginBottom);
 
-    let topPos = box.bottom;
-    if (popupHeight > window.innerHeight - box.bottom - 15 && box.top > window.innerHeight - box.bottom) {
-      topPos = box.top - popupHeight;
+    const GAP_REM = 0.5;
+    const EDGE_MARGIN_REM = 0.9375;
+
+    // Position below the trigger by default with gap
+    let topPos = box.bottom + (GAP_REM * 16);
+
+    // Check if there's enough space below; if not, position above
+    if (popupHeight > window.innerHeight - box.bottom - (EDGE_MARGIN_REM * 16) && box.top > window.innerHeight - box.bottom) {
+      topPos = box.top - popupHeight - (GAP_REM * 16);
     }
 
+    // Ensure it doesn't go off the top of the screen
     if (topPos < 0) {
-      topPos = box.bottom;
+      topPos = box.bottom + (GAP_REM * 16);
     }
 
-    // make popup appear on top of cursor
-    if (topPos > 70) {
-      topPos = topPos - 70;
+    // Horizontal positioning - align to left of trigger
+    let leftPos = box.left;
+
+    // Ensure it doesn't go off the right edge
+    if (leftPos + popupWidth > window.innerWidth - (EDGE_MARGIN_REM * 16)) {
+      leftPos = window.innerWidth - popupWidth - (EDGE_MARGIN_REM * 16);
     }
 
-    let leftPos = Math.max(0, window.innerWidth - popupWidth - 15);
-    if (leftPos > box.left) {
-      leftPos = box.left;
+    // Ensure it doesn't go off the left edge
+    if (leftPos < 0) {
+      leftPos = 0;
     }
 
     popup.style.opacity = 1;
-    popup.style.top = topPos + 'px';
-    popup.style.left = leftPos + 'px';
+    popup.style.top = `${topPos / 16}rem`;
+    popup.style.left = `${leftPos / 16}rem`;
 
     let popupTimeout;
 
@@ -263,13 +739,41 @@ if (!SERVER_RENDERED) {
 
     const onMouseOut = function () {
       clearTimeout(popupTimeout);
-      popupTimeout = setTimeout(hidePopup, 200);
+      popupTimeout = setTimeout(hidePopup, 500);
     };
 
     const hidePopup = function () {
       CodeMirror.off(popup, 'mouseover', onMouseOverPopup);
       CodeMirror.off(popup, 'mouseout', onMouseOut);
       CodeMirror.off(cm.getWrapperElement(), 'mouseout', onMouseOut);
+      CodeMirror.off(cm, 'change', onEditorChange);
+
+      // Cleanup CodeMirror and MaskedEditor instances
+      const valueContainer = popup.querySelector('.var-value-container');
+      if (valueContainer) {
+        // Cleanup autocomplete
+        if (valueContainer._autoCompleteCleanup) {
+          valueContainer._autoCompleteCleanup();
+          valueContainer._autoCompleteCleanup = null;
+        }
+
+        // Cleanup MaskedEditor
+        if (valueContainer._maskedEditor) {
+          valueContainer._maskedEditor.destroy();
+          valueContainer._maskedEditor = null;
+        }
+
+        // Cleanup CodeMirror
+        if (valueContainer._cmEditor) {
+          valueContainer._cmEditor.getWrapperElement().remove();
+          valueContainer._cmEditor = null;
+        }
+      }
+
+      // Clear the active popup reference
+      if (activePopup === popup) {
+        activePopup = null;
+      }
 
       if (popup.style.opacity) {
         popup.style.opacity = 0;
@@ -283,9 +787,15 @@ if (!SERVER_RENDERED) {
       }
     };
 
+    // Hide popup when user types in the main editor
+    const onEditorChange = function () {
+      hidePopup();
+    };
+
     CodeMirror.on(popup, 'mouseover', onMouseOverPopup);
     CodeMirror.on(popup, 'mouseout', onMouseOut);
     CodeMirror.on(cm.getWrapperElement(), 'mouseout', onMouseOut);
+    CodeMirror.on(cm, 'change', onEditorChange);
   }
 }
 
@@ -302,10 +812,22 @@ export const extractVariableInfo = (str, variables) => {
 
   if (DOUBLE_BRACE_PATTERN.test(str)) {
     variableName = str.replace('{{', '').replace('}}', '').trim();
+    // Don't return empty variable names
+    if (!variableName) {
+      return { variableName: undefined, variableValue: undefined };
+    }
     variableValue = interpolate(get(variables, variableName), variables);
   } else if (str.startsWith('/:')) {
     variableName = str.replace('/:', '').trim();
+    // Don't return empty variable names
+    if (!variableName) {
+      return { variableName: undefined, variableValue: undefined };
+    }
     variableValue = variables?.pathParams?.[variableName];
+  } else if (str.startsWith('{{') && str.endsWith('}}')) {
+    // Handle cases like {{}} or {{   }} (empty or whitespace only)
+    // These don't match the pattern but look like variables
+    return { variableName: undefined, variableValue: undefined };
   } else {
     // direct variable reference (e.g., for numeric values in JSON mode or plain variable names)
     variableName = str;
diff --git a/packages/bruno-app/src/utils/codemirror/brunoVarInfo.spec.js b/packages/bruno-app/src/utils/codemirror/brunoVarInfo.spec.js
index f425d91a5..42e565cf7 100644
--- a/packages/bruno-app/src/utils/codemirror/brunoVarInfo.spec.js
+++ b/packages/bruno-app/src/utils/codemirror/brunoVarInfo.spec.js
@@ -6,6 +6,51 @@ jest.mock('@usebruno/common', () => ({
   interpolate: jest.fn()
 }));
 
+jest.mock('providers/ReduxStore', () => ({
+  default: {
+    dispatch: jest.fn(),
+    getState: jest.fn()
+  }
+}));
+
+jest.mock('providers/ReduxStore/slices/collections/actions', () => ({
+  updateVariableInScope: jest.fn()
+}));
+
+jest.mock('utils/collections', () => ({
+  getVariableScope: jest.fn(),
+  isVariableSecret: jest.fn(),
+  getAllVariables: jest.fn(),
+  findEnvironmentInCollection: jest.fn()
+}));
+
+jest.mock('utils/common/codemirror', () => ({
+  defineCodeMirrorBrunoVariablesMode: jest.fn()
+}));
+
+jest.mock('utils/common/masked-editor', () => ({
+  MaskedEditor: jest.fn()
+}));
+
+jest.mock('utils/codemirror/autocomplete', () => ({
+  setupAutoComplete: jest.fn(() => jest.fn())
+}));
+
+// Mock CodeMirror
+global.CodeMirror = jest.fn((element, options) => {
+  const mockEditor = {
+    getValue: jest.fn(() => options.value || ''),
+    setValue: jest.fn(),
+    on: jest.fn(),
+    off: jest.fn(),
+    refresh: jest.fn(),
+    focus: jest.fn(),
+    options: options || {},
+    getWrapperElement: jest.fn(() => element)
+  };
+  return mockEditor;
+});
+
 describe('extractVariableInfo', () => {
   let mockVariables;
 
@@ -93,6 +138,24 @@ describe('extractVariableInfo', () => {
         variableValue: undefined
       });
     });
+
+    it('should return undefined for empty double brace variables', () => {
+      const result = extractVariableInfo('{{}}', mockVariables);
+
+      expect(result).toEqual({
+        variableName: undefined,
+        variableValue: undefined
+      });
+    });
+
+    it('should return undefined for whitespace-only double brace variables', () => {
+      const result = extractVariableInfo('{{   }}', mockVariables);
+
+      expect(result).toEqual({
+        variableName: undefined,
+        variableValue: undefined
+      });
+    });
   });
 
   describe('path parameter format (/:variableName)', () => {
@@ -136,6 +199,24 @@ describe('extractVariableInfo', () => {
         variableValue: undefined
       });
     });
+
+    it('should return undefined for empty path parameters', () => {
+      const result = extractVariableInfo('/:', mockVariables);
+
+      expect(result).toEqual({
+        variableName: undefined,
+        variableValue: undefined
+      });
+    });
+
+    it('should return undefined for whitespace-only path parameters', () => {
+      const result = extractVariableInfo('/:   ', mockVariables);
+
+      expect(result).toEqual({
+        variableName: undefined,
+        variableValue: undefined
+      });
+    });
   });
 
   describe('direct variable format', () => {
@@ -258,13 +339,15 @@ describe('renderVarInfo', () => {
     jest.useRealTimers();
   });
 
-  function setupRender(variables) {
-    const result = renderVarInfo({ string: '{{apiKey}}' }, { variables });
-    const contentDiv = result.querySelector('.info-content');
-    const descriptionDiv = contentDiv.querySelector('.info-description');
-    const copyButton = contentDiv.querySelector('.copy-button');
+  function setupRender(variables, collection = null, item = null) {
+    const result = renderVarInfo({ string: '{{apiKey}}' }, { variables, collection, item });
+    if (!result) return { result: null, containerDiv: null, valueDisplay: null, copyButton: null };
 
-    return { result, contentDiv, descriptionDiv, copyButton };
+    const containerDiv = result;
+    const valueDisplay = containerDiv.querySelector('.var-value-editable-display') || containerDiv.querySelector('.var-value-display');
+    const copyButton = containerDiv.querySelector('.copy-button');
+
+    return { result, containerDiv, valueDisplay, copyButton };
   }
 
   describe('popup functionality', () => {
@@ -275,18 +358,18 @@ describe('renderVarInfo', () => {
     });
 
     it('should create a popup with the correct variable name and value', () => {
-      const { descriptionDiv } = setupRender({ apiKey: 'test-value' });
+      const { valueDisplay } = setupRender({ apiKey: 'test-value' });
 
-      expect(descriptionDiv.textContent).toBe('test-value');
+      expect(valueDisplay.textContent).toBe('test-value');
     });
 
     it('should correctly mask the variable value in the popup', () => {
-      const { descriptionDiv } = setupRender({
+      const { valueDisplay } = setupRender({
         apiKey: 'test-value',
         maskedEnvVariables: ['apiKey']
       });
 
-      expect(descriptionDiv.textContent).toBe('*****');
+      expect(valueDisplay.textContent).toBe('**********');
     });
   });
 
@@ -297,19 +380,19 @@ describe('renderVarInfo', () => {
       expect(copyButton).toBeDefined();
     });
 
-    it('should copy the variable value to the clipboard', async () => {
+    it('should copy the variable value to the clipboard', () => {
       const { copyButton } = setupRender({ apiKey: 'test-value' });
 
-      await copyButton.click();
+      copyButton.click();
 
       expect(clipboardText).toBe('test-value');
       expect(navigator.clipboard.writeText).toHaveBeenCalledWith('test-value');
     });
 
-    it('should copy the variable value of masked variables to the clipboard', async () => {
+    it('should copy the variable value of masked variables to the clipboard', () => {
       const { copyButton } = setupRender({ apiKey: 'test-value', maskedEnvVariables: ['apiKey'] });
 
-      await copyButton.click();
+      copyButton.click();
 
       expect(clipboardText).toBe('test-value');
       expect(navigator.clipboard.writeText).toHaveBeenCalledWith('test-value');
@@ -332,10 +415,10 @@ describe('renderVarInfo', () => {
     it('should log to the console when the variable value is not copied', async () => {
       const { copyButton } = setupRender({ apiKey: 'cause-clipboard-error' });
 
-      await copyButton.click();
+      copyButton.click();
 
       // wait for .catch() microtask to run
-      await Promise.resolve();
+      await jest.runAllTimersAsync();
 
       expect(clipboardText).toBe('');
       expect(console.error).toHaveBeenCalledWith('Failed to copy to clipboard:', 'Clipboard error');
diff --git a/packages/bruno-app/src/utils/codemirror/javascript-lint.js b/packages/bruno-app/src/utils/codemirror/javascript-lint.js
index 0038406aa..385479e99 100644
--- a/packages/bruno-app/src/utils/codemirror/javascript-lint.js
+++ b/packages/bruno-app/src/utils/codemirror/javascript-lint.js
@@ -21,7 +21,7 @@ if (!SERVER_RENDERED) {
       }
       return [];
     }
-    
+
     // Set default options for Bruno
     const defaultOptions = {
       esversion: 11,
@@ -33,19 +33,19 @@ if (!SERVER_RENDERED) {
       module: true,
       node: true,
       predef: {
-        'bru': false,
-        'req': false,
-        'res': false,
-        'test': false,
-        'expect': false,
-        'require': false,
-        'module': false
+        bru: false,
+        req: false,
+        res: false,
+        test: false,
+        expect: false,
+        require: false,
+        module: false
       }
     };
-    
+
     // Merge provided options with defaults
     options = Object.assign({}, defaultOptions, options);
-    
+
     if (!options.indent)
       // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation
       options.indent = 1; // JSHint default value is 4
@@ -68,9 +68,9 @@ if (!SERVER_RENDERED) {
     errors = filter(errors, (error) => {
       if (error.code === 'E058' || error.code === 'W024') {
         if (
-          error.evidence &&
-          error.evidence.includes('await') &&
-          error.scope === '(main)'
+          error.evidence
+          && error.evidence.includes('await')
+          && error.scope === '(main)'
         ) {
           return false;
         }
@@ -80,7 +80,7 @@ if (!SERVER_RENDERED) {
 
       /*
        * Filter out errors due to atob/btoa redefinition
-       * 
+       *
        * - W079: Redefinition of '{a}'
        *   This JSHint warning triggers when a variable name conflicts with a built-in global.
        *   We filter this for atob/btoa to allow explicit requires in Node.js environments
diff --git a/packages/bruno-app/src/utils/codemirror/linkAware.js b/packages/bruno-app/src/utils/codemirror/linkAware.js
new file mode 100644
index 000000000..c7aa694c3
--- /dev/null
+++ b/packages/bruno-app/src/utils/codemirror/linkAware.js
@@ -0,0 +1,183 @@
+import LinkifyIt from 'linkify-it';
+import { isMacOS } from 'utils/common/platform';
+import { debounce } from 'lodash';
+/**
+ * Marks URLs in the CodeMirror editor with clickable link styling
+ * @param {Object} editor - The CodeMirror editor instance
+ * @param {Object} linkify - The LinkifyIt instance for URL detection
+ * @param {string} linkClass - CSS class name for links
+ * @param {string} linkHint - Tooltip text for links
+ */
+function markUrls(editor, linkify, linkClass, linkHint) {
+  const doc = editor.getDoc();
+  const text = doc.getValue();
+
+  // Clear existing link marks
+  editor.getAllMarks().forEach((mark) => {
+    if (mark.className === linkClass) mark.clear();
+  });
+
+  // Find and mark new URLs
+  const matches = linkify.match(text);
+  matches?.forEach(({ index, lastIndex, url }) => {
+    const from = editor.posFromIndex(index);
+    const to = editor.posFromIndex(lastIndex);
+    editor.markText(from, to, {
+      className: linkClass,
+      attributes: {
+        'data-url': url,
+        'title': linkHint
+      }
+    });
+  });
+}
+
+/**
+ * Handles mouse enter events on links to show hover effects
+ * @param {Event} event - The mouse enter event
+ * @param {string} linkClass - CSS class name for links
+ * @param {string} linkHoverClass - CSS class name for hovered links
+ * @param {Function} updateCmdCtrlClass - Function to update Cmd/Ctrl state
+ */
+function handleMouseEnter(event, linkClass, linkHoverClass, updateCmdCtrlClass) {
+  const el = event.target;
+  if (!el.classList.contains(linkClass)) return;
+
+  updateCmdCtrlClass(event);
+
+  el.classList.add(linkHoverClass);
+
+  // Add hover effect to previous siblings that are also links
+  let sibling = el.previousElementSibling;
+  while (sibling && sibling.classList.contains(linkClass)) {
+    sibling.classList.add(linkHoverClass);
+    sibling = sibling.previousElementSibling;
+  }
+
+  // Add hover effect to next siblings that are also links
+  sibling = el.nextElementSibling;
+  while (sibling && sibling.classList.contains(linkClass)) {
+    sibling.classList.add(linkHoverClass);
+    sibling = sibling.nextElementSibling;
+  }
+}
+
+/**
+ * Handles mouse leave events on links to remove hover effects
+ * @param {Event} event - The mouse leave event
+ * @param {string} linkClass - CSS class name for links
+ * @param {string} linkHoverClass - CSS class name for hovered links
+ */
+function handleMouseLeave(event, linkClass, linkHoverClass) {
+  const el = event.target;
+  el.classList.remove(linkHoverClass);
+
+  // Remove hover effect from previous siblings that are also links
+  let sibling = el.previousElementSibling;
+  while (sibling && sibling.classList.contains(linkClass)) {
+    sibling.classList.remove(linkHoverClass);
+    sibling = sibling.previousElementSibling;
+  }
+
+  // Remove hover effect from next siblings that are also links
+  sibling = el.nextElementSibling;
+  while (sibling && sibling.classList.contains(linkClass)) {
+    sibling.classList.remove(linkHoverClass);
+    sibling = sibling.nextElementSibling;
+  }
+}
+
+/**
+ * Updates the CSS class on the editor wrapper based on Cmd/Ctrl key state
+ * @param {Event} event - The keyboard event
+ * @param {HTMLElement} editorWrapper - The editor wrapper element
+ * @param {string} cmdCtrlClass - CSS class name for Cmd/Ctrl pressed state
+ * @param {Function} isCmdOrCtrlPressed - Function to check if Cmd/Ctrl is pressed
+ */
+function updateCmdCtrlClass(event, editorWrapper, cmdCtrlClass, isCmdOrCtrlPressed) {
+  if (isCmdOrCtrlPressed(event)) {
+    editorWrapper.classList.add(cmdCtrlClass);
+  } else {
+    editorWrapper.classList.remove(cmdCtrlClass);
+  }
+}
+
+/**
+ * Handles click events on links to open them externally
+ * @param {Event} event - The click event
+ * @param {string} linkClass - CSS class name for links
+ * @param {Function} isCmdOrCtrlPressed - Function to check if Cmd/Ctrl is pressed
+ */
+function handleClick(event, linkClass, isCmdOrCtrlPressed) {
+  if (!isCmdOrCtrlPressed(event)) return;
+
+  if (event.target.classList.contains(linkClass)) {
+    event.preventDefault();
+    event.stopPropagation();
+    const url = event.target.getAttribute('data-url');
+    if (url) {
+      window?.ipcRenderer?.openExternal(url);
+    }
+  }
+}
+
+/**
+ * Sets up link awareness for a CodeMirror editor instance.
+ * This enables automatic URL detection, styling, and click-to-open functionality.
+ * @param {Object} editor - The CodeMirror editor instance
+ * @param {Object} options - Configuration options (currently unused but reserved for future use)
+ * @returns {void}
+ */
+function setupLinkAware(editor, options = {}) {
+  if (!editor) {
+    return;
+  }
+
+  // CSS class names and configuration
+  const cmdCtrlClass = 'cmd-ctrl-pressed';
+  const linkClass = 'CodeMirror-link';
+  const linkHoverClass = 'hovered-link';
+  const linkHint = isMacOS() ? 'Hold Cmd and click to open link' : 'Hold Ctrl and click to open link';
+
+  // Helper function to check if Cmd/Ctrl is pressed
+  const isCmdOrCtrlPressed = (event) => (isMacOS() ? event.metaKey : event.ctrlKey);
+
+  // Initialize LinkifyIt for URL detection
+  const linkify = new LinkifyIt();
+  const editorWrapper = editor.getWrapperElement();
+
+  // Create bound versions of event handlers with proper parameters
+  const boundMarkUrls = () => markUrls(editor, linkify, linkClass, linkHint);
+  const boundUpdateCmdCtrlClass = (event) => updateCmdCtrlClass(event, editorWrapper, cmdCtrlClass, isCmdOrCtrlPressed);
+  const boundHandleClick = (event) => handleClick(event, linkClass, isCmdOrCtrlPressed);
+  const boundHandleMouseEnter = (event) => handleMouseEnter(event, linkClass, linkHoverClass, boundUpdateCmdCtrlClass);
+  const boundHandleMouseLeave = (event) => handleMouseLeave(event, linkClass, linkHoverClass);
+
+  // Create debounced version of markUrls
+  const debouncedMarkUrls = debounce(() => {
+    requestAnimationFrame(boundMarkUrls);
+  }, 150);
+
+  // Initial URL marking
+  boundMarkUrls();
+
+  // Set up event listeners
+  editor.on('changes', debouncedMarkUrls);
+  window.addEventListener('keydown', boundUpdateCmdCtrlClass);
+  window.addEventListener('keyup', boundUpdateCmdCtrlClass);
+  editorWrapper.addEventListener('click', boundHandleClick);
+  editorWrapper.addEventListener('mouseover', boundHandleMouseEnter);
+  editorWrapper.addEventListener('mouseout', boundHandleMouseLeave);
+
+  // Cleanup function to remove all event listeners
+  editor._destroyLinkAware = () => {
+    editor.off('changes', debouncedMarkUrls);
+    window.removeEventListener('keydown', boundUpdateCmdCtrlClass);
+    window.removeEventListener('keyup', boundUpdateCmdCtrlClass);
+    editorWrapper.removeEventListener('click', boundHandleClick);
+    editorWrapper.removeEventListener('mouseover', boundHandleMouseEnter);
+    editorWrapper.removeEventListener('mouseout', boundHandleMouseLeave);
+  };
+}
+
+export { setupLinkAware };
diff --git a/packages/bruno-app/src/utils/codemirror/linkAware.spec.js b/packages/bruno-app/src/utils/codemirror/linkAware.spec.js
new file mode 100644
index 000000000..565033d8b
--- /dev/null
+++ b/packages/bruno-app/src/utils/codemirror/linkAware.spec.js
@@ -0,0 +1,591 @@
+import { setupLinkAware } from './linkAware';
+import LinkifyIt from 'linkify-it';
+import { isMacOS } from 'utils/common/platform';
+
+// No need to mock CodeMirror since setupLinkAware works with an existing editor
+
+// Mock linkify-it
+jest.mock('linkify-it', () => {
+  return jest.fn().mockImplementation(() => ({
+    match: jest.fn()
+  }));
+});
+
+jest.mock('utils/common/platform', () => ({
+  isMacOS: jest.fn()
+}));
+// Mock requestAnimationFrame
+global.requestAnimationFrame = jest.fn((cb) => cb());
+
+// Mock window.ipcRenderer
+global.window = {
+  ...global.window,
+  ipcRenderer: {
+    openExternal: jest.fn()
+  },
+  addEventListener: jest.fn(),
+  removeEventListener: jest.fn()
+};
+
+describe('setupLinkAware', () => {
+  let mockEditor;
+  let mockDoc;
+  let mockWrapperElement;
+  let mockLinkify;
+  let mockMark;
+  let originalTimeout;
+  let mockSetTimeout;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.useFakeTimers();
+
+    // Create a Jest mock for setTimeout
+    mockSetTimeout = jest.spyOn(global, 'setTimeout');
+
+    // Store original timeout and mock requestAnimationFrame
+    originalTimeout = global.setTimeout;
+    global.requestAnimationFrame = jest.fn((cb) => cb());
+
+    // Setup DOM mocks
+    mockWrapperElement = {
+      classList: {
+        add: jest.fn(),
+        remove: jest.fn()
+      },
+      addEventListener: jest.fn(),
+      removeEventListener: jest.fn()
+    };
+
+    mockMark = {
+      clear: jest.fn(),
+      className: 'CodeMirror-link'
+    };
+
+    mockDoc = {
+      getValue: jest.fn().mockReturnValue('Check out https://example.com and http://test.org')
+    };
+
+    mockEditor = {
+      getDoc: jest.fn().mockReturnValue(mockDoc),
+      getAllMarks: jest.fn().mockReturnValue([mockMark]),
+      markText: jest.fn(),
+      posFromIndex: jest.fn().mockImplementation((index) => ({ line: 0, ch: index })),
+      getWrapperElement: jest.fn().mockReturnValue(mockWrapperElement),
+      on: jest.fn(),
+      off: jest.fn(),
+      _destroyLinkAware: undefined
+    };
+
+    mockLinkify = {
+      match: jest.fn().mockReturnValue([
+        { index: 10, lastIndex: 28, url: 'https://example.com' },
+        { index: 33, lastIndex: 48, url: 'http://test.org' }
+      ])
+    };
+
+    LinkifyIt.mockImplementation(() => mockLinkify);
+
+    // Mock window and ipcRenderer
+    global.window = {
+      addEventListener: jest.fn(),
+      removeEventListener: jest.fn(),
+      ipcRenderer: {
+        openExternal: jest.fn()
+      }
+    };
+  });
+
+  afterEach(() => {
+    delete global.window;
+    delete global.requestAnimationFrame;
+    global.setTimeout = originalTimeout;
+    mockSetTimeout.mockRestore();
+    jest.useRealTimers();
+  });
+
+  describe('editor setup and configuration', () => {
+    it('should set up link awareness on an existing editor', () => {
+      setupLinkAware(mockEditor);
+
+      expect(mockEditor.getWrapperElement).toHaveBeenCalled();
+      expect(mockEditor.on).toHaveBeenCalledWith('changes', expect.any(Function));
+      expect(mockWrapperElement.addEventListener).toHaveBeenCalledWith('click', expect.any(Function));
+      expect(mockWrapperElement.addEventListener).toHaveBeenCalledWith('mouseover', expect.any(Function));
+      expect(mockWrapperElement.addEventListener).toHaveBeenCalledWith('mouseout', expect.any(Function));
+    });
+
+    it('should accept options parameter', () => {
+      const options = { someOption: true };
+
+      setupLinkAware(mockEditor, options);
+
+      expect(mockEditor.getWrapperElement).toHaveBeenCalled();
+    });
+
+    it('should return early if editor is null', () => {
+      const result = setupLinkAware(null);
+
+      expect(result).toBeUndefined();
+      expect(mockEditor.getWrapperElement).not.toHaveBeenCalled();
+    });
+
+    it('should add _destroyLinkAware method to editor', () => {
+      setupLinkAware(mockEditor);
+
+      expect(mockEditor._destroyLinkAware).toBeInstanceOf(Function);
+    });
+  });
+
+  describe('platform-specific behavior', () => {
+    it('should use Cmd key hint on macOS', () => {
+      isMacOS.mockReturnValue(true);
+      setupLinkAware(mockEditor);
+
+      // Verify that markUrls was called which sets the hint
+      expect(mockEditor.markText).toHaveBeenCalledWith(expect.anything(),
+        expect.anything(),
+        expect.objectContaining({
+          attributes: expect.objectContaining({
+            title: 'Hold Cmd and click to open link'
+          })
+        }));
+    });
+
+    it('should use Ctrl key hint on non-macOS', () => {
+      isMacOS.mockReturnValue(false);
+      setupLinkAware(mockEditor);
+
+      // Verify that markUrls was called which sets the hint
+      expect(mockEditor.markText).toHaveBeenCalledWith(expect.anything(),
+        expect.anything(),
+        expect.objectContaining({
+          attributes: expect.objectContaining({
+            title: 'Hold Ctrl and click to open link'
+          })
+        }));
+    });
+  });
+
+  describe('CSS class management', () => {
+    it('should add cmd-ctrl-pressed class when modifier key is pressed', () => {
+      isMacOS.mockReturnValue(true);
+      setupLinkAware(mockEditor);
+
+      const keydownHandler = global.window.addEventListener.mock.calls.find((call) => call[0] === 'keydown')[1];
+      const mockEvent = { metaKey: true };
+
+      keydownHandler(mockEvent);
+
+      expect(mockWrapperElement.classList.add).toHaveBeenCalledWith('cmd-ctrl-pressed');
+    });
+
+    it('should remove cmd-ctrl-pressed class when modifier key is released', () => {
+      isMacOS.mockReturnValue(false);
+      setupLinkAware(mockEditor);
+
+      const keyupHandler = global.window.addEventListener.mock.calls.find((call) => call[0] === 'keyup')[1];
+      const mockEvent = { ctrlKey: false };
+
+      keyupHandler(mockEvent);
+
+      expect(mockWrapperElement.classList.remove).toHaveBeenCalledWith('cmd-ctrl-pressed');
+    });
+  });
+
+  describe('click handling', () => {
+    it('should open external URL when Cmd+clicking on a link', () => {
+      isMacOS.mockReturnValue(true);
+      setupLinkAware(mockEditor);
+
+      const clickHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'click')[1];
+      const mockEvent = {
+        metaKey: true,
+        target: {
+          classList: { contains: (className) => className === 'CodeMirror-link' },
+          getAttribute: () => 'https://example.com'
+        },
+        preventDefault: jest.fn(),
+        stopPropagation: jest.fn()
+      };
+
+      clickHandler(mockEvent);
+
+      expect(mockEvent.preventDefault).toHaveBeenCalled();
+      expect(mockEvent.stopPropagation).toHaveBeenCalled();
+      expect(global.window.ipcRenderer.openExternal).toHaveBeenCalledWith('https://example.com');
+    });
+
+    it('should not open URL when clicking without modifier key', () => {
+      setupLinkAware(mockEditor);
+
+      const clickHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'click')[1];
+      const mockEvent = {
+        metaKey: false,
+        ctrlKey: false,
+        target: {
+          classList: { contains: (className) => className === 'CodeMirror-link' },
+          getAttribute: () => 'https://example.com'
+        }
+      };
+
+      clickHandler(mockEvent);
+
+      expect(global.window.ipcRenderer.openExternal).not.toHaveBeenCalled();
+    });
+
+    it('should not open URL when clicking on non-link element', () => {
+      isMacOS.mockReturnValue(true);
+      setupLinkAware(mockEditor);
+
+      const clickHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'click')[1];
+      const mockEvent = {
+        metaKey: true,
+        target: {
+          classList: { contains: () => false }
+        }
+      };
+
+      clickHandler(mockEvent);
+
+      expect(global.window.ipcRenderer.openExternal).not.toHaveBeenCalled();
+    });
+
+    it('should not open URL when data-url attribute is missing', () => {
+      isMacOS.mockReturnValue(true);
+      setupLinkAware(mockEditor);
+
+      const clickHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'click')[1];
+      const mockEvent = {
+        metaKey: true,
+        target: {
+          classList: { contains: (className) => className === 'CodeMirror-link' },
+          getAttribute: () => null
+        },
+        preventDefault: jest.fn(),
+        stopPropagation: jest.fn()
+      };
+
+      clickHandler(mockEvent);
+
+      expect(mockEvent.preventDefault).toHaveBeenCalled();
+      expect(mockEvent.stopPropagation).toHaveBeenCalled();
+      expect(global.window.ipcRenderer.openExternal).not.toHaveBeenCalled();
+    });
+  });
+
+  // Test debouncing behavior
+  describe('debouncing', () => {
+    it('should debounce URL marking on content changes', () => {
+      setupLinkAware(mockEditor);
+
+      // Clear the calls from initial setup
+      mockEditor.getAllMarks.mockClear();
+      requestAnimationFrame.mockClear();
+
+      // Simulate multiple rapid content changes
+      const changeHandler = mockEditor.on.mock.calls.find((call) => call[0] === 'changes')[1];
+      changeHandler();
+      changeHandler();
+      changeHandler();
+
+      // With debouncing, setTimeout should be called (lodash debounce uses it internally)
+      // The exact number may vary, but we should see at least one call
+      expect(setTimeout).toHaveBeenCalled();
+      expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 150);
+
+      // Fast-forward timers
+      jest.runAllTimers();
+
+      // Should only mark URLs once despite multiple rapid changes
+      expect(requestAnimationFrame).toHaveBeenCalledTimes(1);
+      expect(mockEditor.getAllMarks).toHaveBeenCalledTimes(1);
+    });
+
+    it('should apply link tooltips when marking URLs', () => {
+      setupLinkAware(mockEditor);
+
+      expect(mockEditor.markText).toHaveBeenCalledWith({ line: 0, ch: 10 },
+        { line: 0, ch: 28 },
+        {
+          className: 'CodeMirror-link',
+          attributes: {
+            'data-url': 'https://example.com',
+            'title': 'Hold Cmd and click to open link'
+          }
+        });
+    });
+  });
+
+  // Test animation frame handling
+  describe('animation frame handling', () => {
+    it('should use requestAnimationFrame for URL marking', () => {
+      setupLinkAware(mockEditor);
+
+      const changeHandler = mockEditor.on.mock.calls.find((call) => call[0] === 'changes')[1];
+      changeHandler();
+
+      jest.runAllTimers();
+
+      expect(requestAnimationFrame).toHaveBeenCalled();
+    });
+  });
+
+  describe('hover behavior', () => {
+    it('should add hover class on mouseover for link elements', () => {
+      setupLinkAware(mockEditor);
+
+      const mouseoverHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'mouseover')[1];
+
+      const mockTarget = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          add: jest.fn(),
+          remove: jest.fn()
+        },
+        previousElementSibling: {
+          classList: {
+            contains: jest.fn().mockReturnValue(true),
+            add: jest.fn(),
+            remove: jest.fn()
+          },
+          previousElementSibling: null
+        },
+        nextElementSibling: {
+          classList: {
+            contains: jest.fn().mockReturnValue(true),
+            add: jest.fn(),
+            remove: jest.fn()
+          },
+          nextElementSibling: null
+        }
+      };
+
+      const mockEvent = { target: mockTarget };
+      mouseoverHandler(mockEvent);
+
+      expect(mockTarget.classList.add).toHaveBeenCalledWith('hovered-link');
+      expect(mockTarget.previousElementSibling.classList.add).toHaveBeenCalledWith('hovered-link');
+      expect(mockTarget.nextElementSibling.classList.add).toHaveBeenCalledWith('hovered-link');
+    });
+
+    it('should not add hover class for non-link elements', () => {
+      setupLinkAware(mockEditor);
+
+      const mouseoverHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'mouseover')[1];
+
+      const mockTarget = {
+        classList: {
+          contains: jest.fn().mockReturnValue(false),
+          add: jest.fn()
+        }
+      };
+
+      const mockEvent = { target: mockTarget };
+      mouseoverHandler(mockEvent);
+
+      expect(mockTarget.classList.add).not.toHaveBeenCalled();
+    });
+
+    it('should remove hover class on mouseout', () => {
+      setupLinkAware(mockEditor);
+
+      const mouseoutHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'mouseout')[1];
+
+      const mockTarget = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          remove: jest.fn()
+        },
+        previousElementSibling: {
+          classList: {
+            contains: jest.fn().mockReturnValue(true),
+            remove: jest.fn()
+          },
+          previousElementSibling: null
+        },
+        nextElementSibling: {
+          classList: {
+            contains: jest.fn().mockReturnValue(true),
+            remove: jest.fn()
+          },
+          nextElementSibling: null
+        }
+      };
+
+      const mockEvent = { target: mockTarget };
+      mouseoutHandler(mockEvent);
+
+      expect(mockTarget.classList.remove).toHaveBeenCalledWith('hovered-link');
+      expect(mockTarget.previousElementSibling.classList.remove).toHaveBeenCalledWith('hovered-link');
+      expect(mockTarget.nextElementSibling.classList.remove).toHaveBeenCalledWith('hovered-link');
+    });
+
+    it('should handle multi-span links correctly on hover', () => {
+      setupLinkAware(mockEditor);
+
+      const mouseoverHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'mouseover')[1];
+
+      // Create a mock with a chain of link spans
+      const mockNestedPrev = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          add: jest.fn()
+        },
+        previousElementSibling: null
+      };
+
+      const mockPrev = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          add: jest.fn()
+        },
+        previousElementSibling: mockNestedPrev
+      };
+
+      const mockNestedNext = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          add: jest.fn()
+        },
+        nextElementSibling: null
+      };
+
+      const mockNext = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          add: jest.fn()
+        },
+        nextElementSibling: mockNestedNext
+      };
+
+      const mockTarget = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          add: jest.fn()
+        },
+        previousElementSibling: mockPrev,
+        nextElementSibling: mockNext
+      };
+
+      const mockEvent = { target: mockTarget };
+      mouseoverHandler(mockEvent);
+
+      expect(mockTarget.classList.add).toHaveBeenCalledWith('hovered-link');
+      expect(mockPrev.classList.add).toHaveBeenCalledWith('hovered-link');
+      expect(mockNestedPrev.classList.add).toHaveBeenCalledWith('hovered-link');
+      expect(mockNext.classList.add).toHaveBeenCalledWith('hovered-link');
+      expect(mockNestedNext.classList.add).toHaveBeenCalledWith('hovered-link');
+    });
+  });
+
+  // Test memory cleanup
+  describe('memory cleanup', () => {
+    it('should properly clean up all event listeners and marks', () => {
+      setupLinkAware(mockEditor);
+
+      mockEditor._destroyLinkAware();
+
+      expect(mockEditor.off).toHaveBeenCalled();
+      expect(global.window.removeEventListener).toHaveBeenCalledTimes(2);
+      expect(mockWrapperElement.removeEventListener).toHaveBeenCalledTimes(3); // click, mouseover, mouseout
+      expect(mockWrapperElement.removeEventListener).toHaveBeenCalledWith('click', expect.any(Function));
+      expect(mockWrapperElement.removeEventListener).toHaveBeenCalledWith('mouseover', expect.any(Function));
+      expect(mockWrapperElement.removeEventListener).toHaveBeenCalledWith('mouseout', expect.any(Function));
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should handle missing target in mouse event', () => {
+      setupLinkAware(mockEditor);
+
+      const mouseoverHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'mouseover')[1];
+      const mockEvent = { target: null };
+
+      // Note: This will throw as the implementation accesses target.classList without null check
+      expect(() => mouseoverHandler(mockEvent)).toThrow();
+    });
+
+    it('should handle missing ipcRenderer', () => {
+      delete global.window.ipcRenderer;
+      isMacOS.mockReturnValue(true);
+      setupLinkAware(mockEditor);
+
+      const clickHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'click')[1];
+      const mockEvent = {
+        metaKey: true,
+        target: {
+          classList: { contains: (className) => className === 'CodeMirror-link' },
+          getAttribute: () => 'https://example.com'
+        },
+        preventDefault: jest.fn(),
+        stopPropagation: jest.fn()
+      };
+
+      expect(() => clickHandler(mockEvent)).not.toThrow();
+    });
+
+    it('should handle LinkifyIt returning null matches', () => {
+      mockLinkify.match.mockReturnValue(null);
+
+      expect(() => setupLinkAware(mockEditor)).not.toThrow();
+      // markText may still be called to clear existing marks
+    });
+
+    it('should handle null siblings in mouseover events', () => {
+      setupLinkAware(mockEditor);
+
+      const mouseoverHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'mouseover')[1];
+
+      const mockTarget = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          add: jest.fn()
+        },
+        previousElementSibling: null,
+        nextElementSibling: null
+      };
+
+      const mockEvent = { target: mockTarget };
+
+      expect(() => mouseoverHandler(mockEvent)).not.toThrow();
+      expect(mockTarget.classList.add).toHaveBeenCalledWith('hovered-link');
+    });
+
+    it('should handle non-link siblings in mouseover events', () => {
+      setupLinkAware(mockEditor);
+
+      const mouseoverHandler = mockWrapperElement.addEventListener.mock.calls.find((call) => call[0] === 'mouseover')[1];
+
+      const mockPrev = {
+        classList: {
+          contains: jest.fn().mockReturnValue(false),
+          add: jest.fn()
+        }
+      };
+
+      const mockNext = {
+        classList: {
+          contains: jest.fn().mockReturnValue(false),
+          add: jest.fn()
+        }
+      };
+
+      const mockTarget = {
+        classList: {
+          contains: jest.fn().mockReturnValue(true),
+          add: jest.fn()
+        },
+        previousElementSibling: mockPrev,
+        nextElementSibling: mockNext
+      };
+
+      const mockEvent = { target: mockTarget };
+      mouseoverHandler(mockEvent);
+
+      expect(mockTarget.classList.add).toHaveBeenCalledWith('hovered-link');
+      expect(mockPrev.classList.add).not.toHaveBeenCalled();
+      expect(mockNext.classList.add).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/packages/bruno-app/src/utils/codemirror/lint-errors.js b/packages/bruno-app/src/utils/codemirror/lint-errors.js
new file mode 100644
index 000000000..e813c247b
--- /dev/null
+++ b/packages/bruno-app/src/utils/codemirror/lint-errors.js
@@ -0,0 +1,141 @@
+/**
+ * Lint Error Tooltip for CodeMirror
+ * Shows lint errors in a popover when hovering over line numbers
+ */
+
+let activeTooltip = null;
+
+/**
+ * Get lint errors for a specific line from the editor's lint state
+ * @param {CodeMirror} editor - The CodeMirror editor instance
+ * @param {number} lineNumber - The 0-indexed line number
+ * @returns {Array} Array of lint error annotations
+ */
+function getLintErrorsForLine(editor, lineNumber) {
+  if (!editor) return [];
+
+  const errors = [];
+  const lintState = editor.state.lint;
+
+  if (lintState && lintState.marked) {
+    lintState.marked.forEach((mark) => {
+      if (mark.__annotation) {
+        // Use annotation's from position directly (mark.find() can return null if lines array is empty)
+        const annotationLine = mark.__annotation.from?.line;
+
+        if (annotationLine === lineNumber) {
+          // Avoid duplicate messages
+          if (!errors.find((e) => e.message === mark.__annotation.message)) {
+            errors.push(mark.__annotation);
+          }
+        }
+      }
+    });
+  }
+
+  return errors;
+}
+
+/**
+ * Show the lint error tooltip next to the target element
+ * @param {Array} errors - Array of lint error annotations
+ * @param {HTMLElement} targetElement - The element to position the tooltip near
+ * @param {HTMLElement} container - The container to append the tooltip to
+ */
+function showLintTooltip(errors, targetElement, container) {
+  hideLintTooltip();
+
+  const tooltip = document.createElement('div');
+  tooltip.className = 'lint-error-tooltip';
+
+  errors.forEach((error, index) => {
+    const errorDiv = document.createElement('div');
+    errorDiv.className = `lint-tooltip-message ${error.severity || 'error'}`;
+    errorDiv.textContent = error.message;
+    tooltip.appendChild(errorDiv);
+  });
+
+  container.appendChild(tooltip);
+  activeTooltip = tooltip;
+
+  // Position the tooltip
+  const rect = targetElement.getBoundingClientRect();
+  tooltip.style.left = `${rect.right + 8}px`;
+  tooltip.style.top = `${rect.top + (rect.height / 2)}px`;
+  tooltip.style.transform = 'translateY(-50%)';
+}
+
+/**
+ * Hide and remove the active lint error tooltip
+ */
+function hideLintTooltip() {
+  if (activeTooltip) {
+    activeTooltip.remove();
+    activeTooltip = null;
+  }
+}
+
+/**
+ * Setup lint error tooltip functionality for a CodeMirror editor
+ * Shows lint errors when hovering over line numbers
+ *
+ * @param {CodeMirror} editor - The CodeMirror editor instance
+ * @returns {Function} Cleanup function to remove event listeners
+ */
+export function setupLintErrorTooltip(editor) {
+  const wrapper = editor.getWrapperElement();
+  // Get the StyledWrapper container (parent of CodeMirror wrapper)
+  const container = wrapper.closest('.graphiql-container') || wrapper.parentElement;
+
+  const handleMouseOver = (e) => {
+    const target = e.target;
+
+    // Check if hovering over a line number element
+    if (target.classList.contains('CodeMirror-linenumber')) {
+      const lineNumber = parseInt(target.textContent, 10) - 1; // 0-indexed
+
+      if (isNaN(lineNumber) || lineNumber < 0) {
+        hideLintTooltip();
+        return;
+      }
+
+      const lintErrors = getLintErrorsForLine(editor, lineNumber);
+
+      if (lintErrors.length > 0) {
+        showLintTooltip(lintErrors, target, container);
+      } else {
+        hideLintTooltip();
+      }
+    } else if (!target.closest('.lint-error-tooltip')) {
+      hideLintTooltip();
+    }
+  };
+
+  const handleMouseOut = (e) => {
+    const relatedTarget = e.relatedTarget;
+    // Don't hide if moving to another line number or the tooltip
+    if (relatedTarget
+      && (relatedTarget.classList?.contains('CodeMirror-linenumber')
+        || relatedTarget.closest?.('.lint-error-tooltip'))) {
+      return;
+    }
+    hideLintTooltip();
+  };
+
+  const handleScroll = () => {
+    hideLintTooltip();
+  };
+
+  // Add event listeners
+  wrapper.addEventListener('mouseover', handleMouseOver);
+  wrapper.addEventListener('mouseout', handleMouseOut);
+  editor.on('scroll', handleScroll);
+
+  // Return cleanup function
+  return () => {
+    wrapper.removeEventListener('mouseover', handleMouseOver);
+    wrapper.removeEventListener('mouseout', handleMouseOut);
+    editor.off('scroll', handleScroll);
+    hideLintTooltip();
+  };
+}
diff --git a/packages/bruno-app/src/utils/codemirror/mock-data-hints.js b/packages/bruno-app/src/utils/codemirror/mock-data-hints.js
index fb03e9f11..8339e606b 100644
--- a/packages/bruno-app/src/utils/codemirror/mock-data-hints.js
+++ b/packages/bruno-app/src/utils/codemirror/mock-data-hints.js
@@ -1,6 +1,6 @@
 import { mockDataFunctions } from '@usebruno/common';
 
-const MOCK_FUNCTION_SUGGESTIONS = Object.keys(mockDataFunctions).map(key => `$${key}`);
+const MOCK_FUNCTION_SUGGESTIONS = Object.keys(mockDataFunctions).map((key) => `$${key}`);
 
 export const getMockDataHints = (cm) => {
   const cursor = cm.getCursor();
@@ -12,7 +12,7 @@ export const getMockDataHints = (cm) => {
   const wordMatch = match[1];
   if (!wordMatch) return null;
 
-  const suggestions = MOCK_FUNCTION_SUGGESTIONS.filter(name => name.startsWith(`$${wordMatch}`));
+  const suggestions = MOCK_FUNCTION_SUGGESTIONS.filter((name) => name.startsWith(`$${wordMatch}`));
   if (!suggestions.length) return null;
 
   const startPos = { line: cursor.line, ch: currentString.lastIndexOf('{{$') + 2 }; // +2 accounts for `{{`
@@ -20,6 +20,6 @@ export const getMockDataHints = (cm) => {
   return {
     list: suggestions,
     from: startPos,
-    to: cm.getCursor(),
+    to: cm.getCursor()
   };
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/utils/collections/index.js b/packages/bruno-app/src/utils/collections/index.js
index 160b05c81..04331b527 100644
--- a/packages/bruno-app/src/utils/collections/index.js
+++ b/packages/bruno-app/src/utils/collections/index.js
@@ -1,4 +1,4 @@
-import {cloneDeep, isEqual, sortBy, filter, map, isString, findIndex, find, each, get } from 'lodash';
+import { cloneDeep, isEqual, sortBy, filter, map, isString, findIndex, find, each, get } from 'lodash';
 import { uuid } from 'utils/common';
 import { buildPersistedEnvVariables } from 'utils/environments';
 import { sortByNameThenSequence } from 'utils/common/index';
@@ -146,7 +146,7 @@ export const areItemsLoading = (folder) => {
   if (!folder || folder.isLoading) {
     return true;
   }
-  
+
   let flattenedItems = flattenItems(folder.items);
   return flattenedItems?.reduce((isLoading, i) => {
     if (i?.loading) {
@@ -154,13 +154,13 @@ export const areItemsLoading = (folder) => {
     }
     return isLoading;
   }, false);
-}
+};
 
 export const getItemsLoadStats = (folder) => {
   let loadingCount = 0;
   let flattenedItems = flattenItems(folder.items);
-  flattenedItems?.forEach(i => {
-    if(i?.loading) {
+  flattenedItems?.forEach((i) => {
+    if (i?.loading) {
       loadingCount += 1;
     }
   });
@@ -168,7 +168,7 @@ export const getItemsLoadStats = (folder) => {
     loading: loadingCount,
     total: flattenedItems?.length
   };
-}
+};
 
 export const transformCollectionToSaveToExportAsFile = (collection, options = {}) => {
   const copyHeaders = (headers) => {
@@ -228,9 +228,9 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
         filePath: param.filePath,
         contentType: param.contentType,
         selected: param.selected
-      }
+      };
     });
-  }
+  };
 
   const copyExamples = (examples = []) => {
     return map(examples, (example) => {
@@ -286,7 +286,7 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
         return;
       }
 
-      const isGrpcRequest = si.type === 'grpc-request'
+      const isGrpcRequest = si.type === 'grpc-request';
 
       const di = {
         uid: si.uid,
@@ -330,7 +330,6 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
           di.request.protoPath = si.request.protoPath;
           delete di.request.params;
         }
-        
 
         // Handle auth object dynamically
         di.request.auth = {
@@ -371,7 +370,7 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
               password: get(si.request, 'auth.ntlm.password', ''),
               domain: get(si.request, 'auth.ntlm.domain', '')
             };
-            break;            
+            break;
           case 'oauth2':
             let grantType = get(si.request, 'auth.oauth2.grantType', '');
             switch (grantType) {
@@ -392,7 +391,7 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
                   tokenQueryKey: get(si.request, 'auth.oauth2.tokenQueryKey', ''),
                   autoFetchToken: get(si.request, 'auth.oauth2.autoFetchToken', true),
                   autoRefreshToken: get(si.request, 'auth.oauth2.autoRefreshToken', true),
-                  additionalParameters: get(si.request, 'auth.oauth2.additionalParameters', {}),
+                  additionalParameters: get(si.request, 'auth.oauth2.additionalParameters', {})
                 };
                 break;
               case 'authorization_code':
@@ -413,7 +412,7 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
                   tokenQueryKey: get(si.request, 'auth.oauth2.tokenQueryKey', ''),
                   autoFetchToken: get(si.request, 'auth.oauth2.autoFetchToken', true),
                   autoRefreshToken: get(si.request, 'auth.oauth2.autoRefreshToken', true),
-                  additionalParameters: get(si.request, 'auth.oauth2.additionalParameters', {}),
+                  additionalParameters: get(si.request, 'auth.oauth2.additionalParameters', {})
                 };
                 break;
               case 'implicit':
@@ -429,7 +428,7 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
                   tokenHeaderPrefix: get(si.request, 'auth.oauth2.tokenHeaderPrefix', 'Bearer'),
                   tokenQueryKey: get(si.request, 'auth.oauth2.tokenQueryKey', ''),
                   autoFetchToken: get(si.request, 'auth.oauth2.autoFetchToken', true),
-                  additionalParameters: get(si.request, 'auth.oauth2.additionalParameters', {}),
+                  additionalParameters: get(si.request, 'auth.oauth2.additionalParameters', {})
                 };
                 break;
               case 'client_credentials':
@@ -447,7 +446,7 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
                   tokenQueryKey: get(si.request, 'auth.oauth2.tokenQueryKey', ''),
                   autoFetchToken: get(si.request, 'auth.oauth2.autoFetchToken', true),
                   autoRefreshToken: get(si.request, 'auth.oauth2.autoRefreshToken', true),
-                  additionalParameters: get(si.request, 'auth.oauth2.additionalParameters', {}),
+                  additionalParameters: get(si.request, 'auth.oauth2.additionalParameters', {})
                 };
                 break;
             }
@@ -474,10 +473,10 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
         }
 
         if (di.request.body.mode === 'grpc') {
-          di.request.body.grpc = di.request.body.grpc.map(({name, content}, index) => ({
+          di.request.body.grpc = di.request.body.grpc.map(({ name, content }, index) => ({
             name: name ? name : `message ${index + 1}`,
             content: replaceTabsWithSpaces(content)
-          }))
+          }));
         }
 
         if (di.request.body.mode === 'ws') {
@@ -684,7 +683,7 @@ export const transformRequestToSaveToFilesystem = (item) => {
   if (_item.type === 'grpc-request') {
     itemToSave.request.methodType = _item.request.methodType;
     itemToSave.request.protoPath = _item.request.protoPath;
-    delete itemToSave.request.params
+    delete itemToSave.request.params;
   }
 
   if (_item.type === 'ws-request') {
@@ -727,7 +726,7 @@ export const transformRequestToSaveToFilesystem = (item) => {
   if (itemToSave.request.body.mode === 'grpc') {
     itemToSave.request.body = {
       ...itemToSave.request.body,
-      grpc: itemToSave.request.body.grpc.map(({name, content}, index) => ({
+      grpc: itemToSave.request.body.grpc.map(({ name, content }, index) => ({
         name: name ? name : `message ${index + 1}`,
         content: replaceTabsWithSpaces(content)
       }))
@@ -895,7 +894,7 @@ export const humanizeRequestAuthMode = (mode) => {
     case 'ntlm': {
       label = 'NTLM';
       break;
-    }     
+    }
     case 'oauth2': {
       label = 'OAuth 2.0';
       break;
@@ -1070,7 +1069,7 @@ export const getDefaultRequestPaneTab = (item) => {
 
 export const getGlobalEnvironmentVariables = ({ globalEnvironments, activeGlobalEnvironmentUid }) => {
   let variables = {};
-  const environment = globalEnvironments?.find(env => env?.uid === activeGlobalEnvironmentUid);
+  const environment = globalEnvironments?.find((env) => env?.uid === activeGlobalEnvironmentUid);
   if (environment) {
     each(environment.variables, (variable) => {
       if (variable.name && variable.enabled) {
@@ -1082,7 +1081,7 @@ export const getGlobalEnvironmentVariables = ({ globalEnvironments, activeGlobal
 };
 
 export const getGlobalEnvironmentVariablesMasked = ({ globalEnvironments, activeGlobalEnvironmentUid }) => {
-  const environment = globalEnvironments?.find(env => env?.uid === activeGlobalEnvironmentUid);
+  const environment = globalEnvironments?.find((env) => env?.uid === activeGlobalEnvironmentUid);
 
   if (environment && Array.isArray(environment.variables)) {
     return environment.variables
@@ -1093,7 +1092,6 @@ export const getGlobalEnvironmentVariablesMasked = ({ globalEnvironments, active
   return [];
 };
 
-
 export const getEnvironmentVariables = (collection) => {
   let variables = {};
   if (collection) {
@@ -1154,18 +1152,19 @@ export const getTotalRequestCountInCollection = (collection) => {
 };
 
 export const getAllVariables = (collection, item) => {
-  if(!collection) return {};
+  if (!collection) return {};
   const envVariables = getEnvironmentVariables(collection);
   const requestTreePath = getTreePathFromCollectionToItem(collection, item);
   let { collectionVariables, folderVariables, requestVariables } = mergeVars(collection, requestTreePath);
   const pathParams = getPathParams(item);
   const { globalEnvironmentVariables = {} } = collection;
 
-  const { processEnvVariables = {}, runtimeVariables = {} } = collection;
+  const { processEnvVariables = {}, runtimeVariables = {}, promptVariables = {} } = collection;
   const mergedVariables = {
     ...folderVariables,
     ...requestVariables,
-    ...runtimeVariables
+    ...runtimeVariables,
+    ...promptVariables
   };
 
   const mergedVariablesGlobal = {
@@ -1174,7 +1173,8 @@ export const getAllVariables = (collection, item) => {
     ...folderVariables,
     ...requestVariables,
     ...runtimeVariables,
-  }
+    ...promptVariables
+  };
 
   const maskedEnvVariables = getEnvironmentVariablesMasked(collection) || [];
   const maskedGlobalEnvVariables = collection?.globalEnvSecrets || [];
@@ -1184,7 +1184,7 @@ export const getAllVariables = (collection, item) => {
 
   const uniqueMaskedVariables = [...new Set([...filteredMaskedEnvVariables, ...filteredMaskedGlobalEnvVariables])];
 
-  const oauth2CredentialVariables = getFormattedCollectionOauth2Credentials({ oauth2Credentials: collection?.oauth2Credentials })
+  const oauth2CredentialVariables = getFormattedCollectionOauth2Credentials({ oauth2Credentials: collection?.oauth2Credentials });
 
   return {
     ...globalEnvironmentVariables,
@@ -1194,6 +1194,7 @@ export const getAllVariables = (collection, item) => {
     ...requestVariables,
     ...oauth2CredentialVariables,
     ...runtimeVariables,
+    ...promptVariables,
     pathParams: {
       ...pathParams
     },
@@ -1206,6 +1207,44 @@ export const getAllVariables = (collection, item) => {
   };
 };
 
+// Merge headers from collection, folders, and request
+export const mergeHeaders = (collection, request, requestTreePath) => {
+  let headers = new Map();
+
+  // Add collection headers first
+  const collectionHeaders = collection?.draft?.root ? get(collection, 'draft.root.request.headers', []) : get(collection, 'root.request.headers', []);
+  collectionHeaders.forEach((header) => {
+    if (header.enabled) {
+      headers.set(header.name, header);
+    }
+  });
+
+  // Add folder headers next, traversing from root to leaf
+  if (requestTreePath && requestTreePath.length > 0) {
+    for (let i of requestTreePath) {
+      if (i.type === 'folder') {
+        const folderHeaders = i?.draft ? get(i, 'draft.request.headers', []) : get(i, 'root.request.headers', []);
+        folderHeaders.forEach((header) => {
+          if (header.enabled) {
+            headers.set(header.name, header);
+          }
+        });
+      }
+    }
+  }
+
+  // Add request headers last (they take precedence)
+  const requestHeaders = request.headers || [];
+  requestHeaders.forEach((header) => {
+    if (header.enabled) {
+      headers.set(header.name, header);
+    }
+  });
+
+  // Convert Map back to array
+  return Array.from(headers.values());
+};
+
 export const maskInputValue = (value) => {
   if (!value || typeof value !== 'string') {
     return '';
@@ -1239,15 +1278,21 @@ const mergeVars = (collection, requestTreePath = []) => {
     }
   });
   for (let i of requestTreePath) {
+    if (!i) {
+      continue;
+    }
+
     if (i.type === 'folder') {
-      let vars = get(i, 'root.request.vars.req', []);
+      // Check draft first, then fall back to root
+      const folderRoot = i.draft || i.root;
+      let vars = get(folderRoot, 'request.vars.req', []);
       vars.forEach((_var) => {
         if (_var.enabled) {
           folderVariables[_var.name] = _var.value;
         }
       });
     } else {
-      let vars = get(i, 'request.vars.req', []);
+      let vars = i.draft ? get(i, 'draft.request.vars.req', []) : get(i, 'request.vars.req', []);
       vars.forEach((_var) => {
         if (_var.enabled) {
           requestVariables[_var.name] = _var.value;
@@ -1295,7 +1340,6 @@ export const getFormattedCollectionOauth2Credentials = ({ oauth2Credentials = []
   return credentialsVariables;
 };
 
-
 // item sequence utils - START
 
 export const resetSequencesInFolder = (folderItems) => {
@@ -1327,7 +1371,7 @@ export const getReorderedItemsInTargetDirectory = ({ items, targetItemUid, dragg
   const draggedItem = findItem(itemsWithFixedSequences, draggedItemUid);
   const targetSequence = targetItem?.seq;
   const draggedSequence = draggedItem?.seq;
-  itemsWithFixedSequences?.forEach(item => {
+  itemsWithFixedSequences?.forEach((item) => {
     const isDraggedItem = item?.uid === draggedItemUid;
     const isBetween = isItemBetweenSequences(item?.seq, draggedSequence, targetSequence);
     if (isBetween) {
@@ -1339,15 +1383,15 @@ export const getReorderedItemsInTargetDirectory = ({ items, targetItemUid, dragg
     }
   });
   // only return items that have been reordered
-  return itemsWithFixedSequences.filter(item => 
-    items?.find(originalItem => originalItem?.uid === item?.uid)?.seq !== item?.seq
+  return itemsWithFixedSequences.filter((item) =>
+    items?.find((originalItem) => originalItem?.uid === item?.uid)?.seq !== item?.seq
   );
 };
 
 export const getReorderedItemsInSourceDirectory = ({ items }) => {
   const itemsWithFixedSequences = resetSequencesInFolder(cloneDeep(items));
-  return itemsWithFixedSequences.filter(item => 
-    items?.find(originalItem => originalItem?.uid === item?.uid)?.seq !== item?.seq
+  return itemsWithFixedSequences.filter((item) =>
+    items?.find((originalItem) => originalItem?.uid === item?.uid)?.seq !== item?.seq
   );
 };
 
@@ -1359,9 +1403,9 @@ export const calculateDraggedItemNewPathname = ({ draggedItem, targetItem, dropT
   const isTargetItemAFolder = isItemAFolder(targetItem);
 
   if (dropType === 'inside' && (isTargetItemAFolder || isTargetTheCollection)) {
-    return path.join(targetItemPathname, draggedItemFilename)
+    return path.join(targetItemPathname, draggedItemFilename);
   } else if (dropType === 'adjacent') {
-    return path.join(targetItemDirname, draggedItemFilename)
+    return path.join(targetItemDirname, draggedItemFilename);
   }
   return null;
 };
@@ -1371,10 +1415,10 @@ export const calculateDraggedItemNewPathname = ({ draggedItem, targetItem, dropT
 export const getUniqueTagsFromItems = (items = []) => {
   const allTags = new Set();
   const getTags = (items) => {
-    items.forEach(item => {
+    items.forEach((item) => {
       if (isItemARequest(item)) {
         const tags = item.draft ? get(item, 'draft.tags', []) : get(item, 'tags', []);
-        tags.forEach(tag => allTags.add(tag));
+        tags.forEach((tag) => allTags.add(tag));
       }
       if (item.items) {
         getTags(item.items);
@@ -1385,10 +1429,9 @@ export const getUniqueTagsFromItems = (items = []) => {
   return Array.from(allTags).sort();
 };
 
-
 export const getRequestItemsForCollectionRun = ({ recursive, items = [], tags }) => {
   let requestItems = [];
-  
+
   if (recursive) {
     requestItems = flattenItems(items);
   } else {
@@ -1400,7 +1443,7 @@ export const getRequestItemsForCollectionRun = ({ recursive, items = [], tags })
   }
 
   const requestTypes = ['http-request', 'graphql-request'];
-  requestItems = requestItems.filter(request => requestTypes.includes(request.type));
+  requestItems = requestItems.filter((request) => requestTypes.includes(request.type));
 
   if (tags && tags.include && tags.exclude) {
     const includeTags = tags.include ? tags.include : [];
@@ -1472,3 +1515,117 @@ export const getInitialExampleName = (item) => {
     counter++;
   }
 };
+
+// Get the scope and raw value of a variable by checking all scopes in priority order
+export const getVariableScope = (variableName, collection, item) => {
+  if (!variableName || !collection) {
+    return null;
+  }
+
+  // 1. Check Request Variables (highest priority)
+  if (item) {
+    const requestVars = item.draft ? get(item, 'draft.request.vars.req', []) : get(item, 'request.vars.req', []);
+    const requestVar = requestVars.find((v) => v.name === variableName && v.enabled);
+    if (requestVar) {
+      return {
+        type: 'request',
+        value: requestVar.value,
+        data: { item, variable: requestVar }
+      };
+    }
+  }
+
+  // 2. Check Folder Variables
+  const requestTreePath = getTreePathFromCollectionToItem(collection, item);
+  for (let i = requestTreePath.length - 1; i >= 0; i--) {
+    const pathItem = requestTreePath[i];
+    if (!pathItem) {
+      continue;
+    }
+
+    if (pathItem.type === 'folder') {
+      // Check draft first, then fall back to root
+      const folderRoot = pathItem.draft || pathItem.root;
+      const folderVars = get(folderRoot, 'request.vars.req', []);
+      const folderVar = folderVars.find((v) => v.name === variableName && v.enabled);
+      if (folderVar) {
+        return {
+          type: 'folder',
+          value: folderVar.value,
+          data: { folder: pathItem, variable: folderVar }
+        };
+      }
+    }
+  }
+
+  // 3. Check Environment Variables
+  if (collection.activeEnvironmentUid) {
+    const environment = findEnvironmentInCollection(collection, collection.activeEnvironmentUid);
+    if (environment && environment.variables) {
+      const envVar = environment.variables.find((v) => v.name === variableName && v.enabled);
+      if (envVar) {
+        return {
+          type: 'environment',
+          value: envVar.value,
+          data: { environment, variable: envVar }
+        };
+      }
+    }
+  }
+
+  // 4. Check Collection Variables
+  // Check draft first, then fall back to root
+  const collectionRoot = (collection.draft && collection.draft.root) || collection.root || {};
+  const collectionVars = get(collectionRoot, 'request.vars.req', []);
+  const collectionVar = collectionVars.find((v) => v.name === variableName && v.enabled);
+  if (collectionVar) {
+    return {
+      type: 'collection',
+      value: collectionVar.value,
+      data: { collection, variable: collectionVar }
+    };
+  }
+
+  // 5. Check Global Environment Variables
+  const { globalEnvironmentVariables = {} } = collection;
+  if (globalEnvironmentVariables && globalEnvironmentVariables[variableName]) {
+    return {
+      type: 'global',
+      value: globalEnvironmentVariables[variableName],
+      data: { variableName, value: globalEnvironmentVariables[variableName] }
+    };
+  }
+
+  // 6. Check Runtime Variables (set during request execution via scripts)
+  const { runtimeVariables = {} } = collection;
+  if (runtimeVariables && runtimeVariables[variableName]) {
+    return {
+      type: 'runtime',
+      value: runtimeVariables[variableName],
+      data: { variableName, value: runtimeVariables[variableName], readonly: true }
+    };
+  }
+
+  // Process.env variables are not checked here
+
+  return null;
+};
+
+// Check if a variable is marked as secret
+export const isVariableSecret = (scopeInfo) => {
+  if (!scopeInfo) {
+    return false;
+  }
+
+  // Only environment variables can be marked as secret
+  if (scopeInfo.type === 'environment') {
+    return !!scopeInfo.data.variable?.secret;
+  }
+
+  // Global variables are not checked here
+  if (scopeInfo.type === 'global') {
+    return false;
+  }
+
+  return false;
+};
diff --git a/packages/bruno-app/src/utils/collections/index.spec.js b/packages/bruno-app/src/utils/collections/index.spec.js
new file mode 100644
index 000000000..7ff987b1e
--- /dev/null
+++ b/packages/bruno-app/src/utils/collections/index.spec.js
@@ -0,0 +1,37 @@
+const { describe, it, expect } = require('@jest/globals');
+import { mergeHeaders } from './index';
+
+describe('mergeHeaders', () => {
+  it('should include headers from collection, folder and request (with correct precedence)', () => {
+    const collection = {
+      root: {
+        request: {
+          headers: [
+            { name: 'X-Collection', value: 'c', enabled: true }
+          ]
+        }
+      }
+    };
+
+    const folder = {
+      type: 'folder',
+      root: {
+        request: {
+          headers: [
+            { name: 'X-Folder', value: 'f', enabled: true }
+          ]
+        }
+      }
+    };
+
+    const request = {
+      headers: [
+        { name: 'X-Request', value: 'r', enabled: true }
+      ]
+    };
+
+    const headers = mergeHeaders(collection, request, [folder]);
+    const names = headers.map((h) => h.name);
+    expect(names).toEqual(expect.arrayContaining(['X-Collection', 'X-Folder', 'X-Request']));
+  });
+});
diff --git a/packages/bruno-app/src/utils/common/codemirror.js b/packages/bruno-app/src/utils/common/codemirror.js
index 9f2624e88..56729ee39 100644
--- a/packages/bruno-app/src/utils/common/codemirror.js
+++ b/packages/bruno-app/src/utils/common/codemirror.js
@@ -1,5 +1,6 @@
 import get from 'lodash/get';
 import { mockDataFunctions } from '@usebruno/common';
+import { PROMPT_VARIABLE_TEXT_PATTERN } from '@usebruno/common/utils';
 
 const CodeMirror = require('codemirror');
 
@@ -12,7 +13,7 @@ const pathFoundInVariables = (path, obj) => {
  * Defines a custom CodeMirror mode for Bruno variables highlighting.
  * This function creates a specialized mode that can highlight both Bruno template
  * variables (in the format {{variable}}) and URL path parameters (in the format /:param).
- * 
+ *
  * @param {Object} _variables - The variables object containing data to validate against
  * @param {string} mode - The base CodeMirror mode to extend (e.g., 'javascript', 'application/json')
  * @param {boolean} highlightPathParams - Whether to highlight URL path parameters
@@ -30,6 +31,12 @@ export const defineCodeMirrorBrunoVariablesMode = (_variables, mode, highlightPa
           while ((ch = stream.next()) != null) {
             if (ch === '}' && stream.peek() === '}') {
               stream.eat('}');
+
+              // Prompt variable: starts with '?', no leading/trailing spaces, no braces
+              if (PROMPT_VARIABLE_TEXT_PATTERN.test(word)) {
+                return `variable-prompt`;
+              }
+
               // Check if it's a mock variable (starts with $) and exists in mockDataFunctions
               const isMockVariable = word.startsWith('$') && mockDataFunctions.hasOwnProperty(word.substring(1));
               const found = isMockVariable || pathFoundInVariables(word, variables);
diff --git a/packages/bruno-app/src/utils/common/constants.js b/packages/bruno-app/src/utils/common/constants.js
new file mode 100644
index 000000000..f21b90b83
--- /dev/null
+++ b/packages/bruno-app/src/utils/common/constants.js
@@ -0,0 +1 @@
+export const REQUEST_TYPES = ['http-request', 'graphql-request', 'grpc-request', 'ws-request'];
diff --git a/packages/bruno-app/src/utils/common/folders-requests-sorting.spec.js b/packages/bruno-app/src/utils/common/folders-requests-sorting.spec.js
index fbcf71379..262b69c63 100644
--- a/packages/bruno-app/src/utils/common/folders-requests-sorting.spec.js
+++ b/packages/bruno-app/src/utils/common/folders-requests-sorting.spec.js
@@ -95,7 +95,7 @@ describe('sortByNameThenSequence', () => {
       expect(result).toEqual([
         { name: 'folder_1', seq: 1 },
         { name: 'folder_3', seq: 1 },
-        { name: 'folder_2', seq: 2 },
+        { name: 'folder_2', seq: 2 }
       ]);
     });
 
@@ -371,4 +371,4 @@ describe('sortByNameThenSequence', () => {
       ]);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-app/src/utils/common/index.js b/packages/bruno-app/src/utils/common/index.js
index e94fd8be6..419d4a402 100644
--- a/packages/bruno-app/src/utils/common/index.js
+++ b/packages/bruno-app/src/utils/common/index.js
@@ -79,7 +79,6 @@ export const normalizeFileName = (name) => {
 };
 
 export const getContentType = (headers) => {
-
   // Return empty string for invalid headers
   if (!headers || typeof headers !== 'object' || Object.keys(headers).length === 0) {
     return '';
@@ -111,8 +110,7 @@ export const getContentType = (headers) => {
   }
 
   return contentType;
-}
-
+};
 
 export const startsWith = (str, search) => {
   if (!str || !str.length || typeof str !== 'string') {
@@ -182,17 +180,17 @@ export const generateUidBasedOnHash = (str) => {
   return `${hash}`.padEnd(21, '0');
 };
 
-export const stringifyIfNot = v => typeof v === 'string' ? v : String(v);
+export const stringifyIfNot = (v) => typeof v === 'string' ? v : String(v);
 
 export const getEncoding = (headers) => {
   // Parse the charset from content type: https://stackoverflow.com/a/33192813
   const charsetMatch = /charset=([^()<>@,;:"/[\]?.=\s]*)/i.exec(headers?.['content-type'] || '');
   return charsetMatch?.[1];
-}
+};
 
 export const multiLineMsg = (...messages) => {
-  return messages.filter(m => m !== undefined && m !== null && m !== '').join('\n');
-}
+  return messages.filter((m) => m !== undefined && m !== null && m !== '').join('\n');
+};
 
 export const formatSize = (bytes) => {
   // Handle invalid inputs
@@ -211,19 +209,19 @@ export const formatSize = (bytes) => {
   }
 
   return (bytes / (1024 * 1024 * 1024)).toFixed(1) + 'GB';
-}
+};
 
-export const sortByNameThenSequence = items => {
-  const isSeqValid = seq => Number.isFinite(seq) && Number.isInteger(seq) && seq > 0;
+export const sortByNameThenSequence = (items) => {
+  const isSeqValid = (seq) => Number.isFinite(seq) && Number.isInteger(seq) && seq > 0;
 
   // Sort folders alphabetically by name
   const alphabeticallySorted = [...items].sort((a, b) => a.name && b.name && a.name.localeCompare(b.name));
 
   // Extract folders without 'seq'
-  const withoutSeq = alphabeticallySorted.filter(f => !isSeqValid(f['seq']));
+  const withoutSeq = alphabeticallySorted.filter((f) => !isSeqValid(f['seq']));
 
   // Extract folders with 'seq' and sort them by 'seq'
-  const withSeq = alphabeticallySorted.filter(f => isSeqValid(f['seq'])).sort((a, b) => a.seq - b.seq);
+  const withSeq = alphabeticallySorted.filter((f) => isSeqValid(f['seq'])).sort((a, b) => a.seq - b.seq);
 
   const sortedItems = withoutSeq;
 
@@ -242,7 +240,7 @@ export const sortByNameThenSequence = items => {
       const newGroup = Array.isArray(existingItem)
         ? [...existingItem, item]
         : [existingItem, item];
-      
+
       withoutSeq.splice(position, 1, newGroup);
     } else {
       // Insert item at the specified position
diff --git a/packages/bruno-app/src/utils/common/ipc.js b/packages/bruno-app/src/utils/common/ipc.js
index 3559737f2..b1d1871c3 100644
--- a/packages/bruno-app/src/utils/common/ipc.js
+++ b/packages/bruno-app/src/utils/common/ipc.js
@@ -11,4 +11,4 @@ export const callIpc = (channel, ...args) => {
   }
 
   return ipcRenderer.invoke(channel, ...args);
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/utils/common/path.js b/packages/bruno-app/src/utils/common/path.js
index 9ce10c33b..7f18551db 100644
--- a/packages/bruno-app/src/utils/common/path.js
+++ b/packages/bruno-app/src/utils/common/path.js
@@ -2,9 +2,9 @@ import platform from 'platform';
 import path from 'path';
 
 const isWindowsOS = () => {
-    const os = platform.os;
-    const osFamily = os.family.toLowerCase();
-    return osFamily.includes('windows');
+  const os = platform.os;
+  const osFamily = os.family.toLowerCase();
+  return osFamily.includes('windows');
 };
 
 /**
diff --git a/packages/bruno-app/src/utils/common/platform.js b/packages/bruno-app/src/utils/common/platform.js
index dc1d7d984..3ba2c549f 100644
--- a/packages/bruno-app/src/utils/common/platform.js
+++ b/packages/bruno-app/src/utils/common/platform.js
@@ -10,12 +10,11 @@ export const isElectron = () => {
   return window.ipcRenderer ? true : false;
 };
 
-export const resolveRequestFilename = (name) => {
-  return `${trim(name)}.bru`;
+export const resolveRequestFilename = (name, extension = 'bru') => {
+  return `${trim(name)}.${extension}`;
 };
 
 export const getSubdirectoriesFromRoot = (rootPath, pathname) => {
-
   const relativePath = path.relative(rootPath, pathname);
   return relativePath ? relativePath.split(path.sep) : [];
 };
diff --git a/packages/bruno-app/src/utils/common/regex.js b/packages/bruno-app/src/utils/common/regex.js
index a8e4c6eee..8e7c796b5 100644
--- a/packages/bruno-app/src/utils/common/regex.js
+++ b/packages/bruno-app/src/utils/common/regex.js
@@ -1,56 +1,56 @@
 const invalidCharacters = /[<>:"/\\|?*\x00-\x1F]/g; // replace invalid characters with hyphens
 const reservedDeviceNames = /^(CON|PRN|AUX|NUL|COM[0-9]|LPT[0-9])$/i;
 const firstCharacter = /^[^\s\-<>:"/\\|?*\x00-\x1F]/; // no space, hyphen and `invalidCharacters`
-const middleCharacters = /^[^<>:"/\\|?*\x00-\x1F]*$/;   // no `invalidCharacters`
+const middleCharacters = /^[^<>:"/\\|?*\x00-\x1F]*$/; // no `invalidCharacters`
 const lastCharacter = /[^.\s<>:"/\\|?*\x00-\x1F]$/; // no dot, space and `invalidCharacters`
 
 export const variableNameRegex = /^[\w-.]*$/;
 
 export const sanitizeName = (name) => {
-    name = name
-        .replace(invalidCharacters, '-') // replace invalid characters with hyphens
-        .replace(/^[\s\-]+/, '') // remove leading spaces and hyphens
-        .replace(/[.\s]+$/, ''); // remove trailing dots and spaces
-    return name;
+  name = name
+    .replace(invalidCharacters, '-') // replace invalid characters with hyphens
+    .replace(/^[\s\-]+/, '') // remove leading spaces and hyphens
+    .replace(/[.\s]+$/, ''); // remove trailing dots and spaces
+  return name;
 };
 
 export const validateName = (name) => {
-    if (!name) return false;
-    if (name.length > 255) return false;          // max name length
+  if (!name) return false;
+  if (name.length > 255) return false; // max name length
 
-    if (reservedDeviceNames.test(name)) return false; // windows reserved names
+  if (reservedDeviceNames.test(name)) return false; // windows reserved names
 
-    return (
-        firstCharacter.test(name) &&
-        middleCharacters.test(name) &&
-        lastCharacter.test(name)
-    );
+  return (
+    firstCharacter.test(name)
+    && middleCharacters.test(name)
+    && lastCharacter.test(name)
+  );
 };
 
 export const validateNameError = (name) => {
-    if (!name) return "Name cannot be empty.";
+  if (!name) return 'Name cannot be empty.';
 
-    if (name.length > 255) {
-        return "Name cannot exceed 255 characters.";
+  if (name.length > 255) {
+    return 'Name cannot exceed 255 characters.';
+  }
+
+  if (reservedDeviceNames.test(name)) {
+    return 'Name cannot be a reserved device name.';
+  }
+
+  if (!firstCharacter.test(name[0])) {
+    return 'Invalid first character.';
+  }
+
+  for (let i = 1; i < name.length - 1; i++) {
+    if (!middleCharacters.test(name[i])) {
+      return `Invalid character '${name[i]}' at position ${i + 1}.`;
     }
+  }
 
-    if (reservedDeviceNames.test(name)) {
-        return "Name cannot be a reserved device name.";
-    }
+  if (!lastCharacter.test(name[name.length - 1])) {
+    return 'Invalid last character.';
+  }
 
-    if (!firstCharacter.test(name[0])) {
-        return "Invalid first character.";
-    }
-
-    for (let i = 1; i < name.length - 1; i++) {
-        if (!middleCharacters.test(name[i])) {
-            return `Invalid character '${name[i]}' at position ${i + 1}.`;
-        }
-    }
-
-    if (!lastCharacter.test(name[name.length - 1])) {
-        return "Invalid last character.";
-    }
-
-    return '';
-};
\ No newline at end of file
+  return '';
+};
diff --git a/packages/bruno-app/src/utils/common/regex.spec.js b/packages/bruno-app/src/utils/common/regex.spec.js
index 3994a2b2d..a4ce6eecf 100644
--- a/packages/bruno-app/src/utils/common/regex.spec.js
+++ b/packages/bruno-app/src/utils/common/regex.spec.js
@@ -110,7 +110,6 @@ describe('regex validators', () => {
       expect(sanitizeName('สวัสดีชาวโลก!?@#$%^&*()')).toBe('สวัสดีชาวโลก!-@#$%^&-()');
       expect(sanitizeName('γειά σου κόσμος!?@#$%^&*()')).toBe('γειά σου κόσμος!-@#$%^&-()');
     });
-    
   });
 });
 
@@ -124,7 +123,7 @@ describe('sanitizeName and validateName', () => {
       'file/with?invalid*chars'
     ];
 
-    validNames.forEach(name => {
+    validNames.forEach((name) => {
       const sanitized = sanitizeName(name);
       expect(validateName(sanitized)).toBe(true);
     });
@@ -132,8 +131,8 @@ describe('sanitizeName and validateName', () => {
 
   it('should sanitize and then validate names with reserved device names', () => {
     const reservedNames = ['CON', 'PRN', 'AUX', 'NUL', 'COM1', 'LPT2'];
-    
-    reservedNames.forEach(name => {
+
+    reservedNames.forEach((name) => {
       const sanitized = sanitizeName(name);
       expect(validateName(sanitized)).toBe(false);
     });
@@ -143,10 +142,10 @@ describe('sanitizeName and validateName', () => {
     const invalidNames = [
       '  <>:"/\\|?*  ',
       '   ...   ',
-      '    ',
+      '    '
     ];
 
-    invalidNames.forEach(name => {
+    invalidNames.forEach((name) => {
       const sanitized = sanitizeName(name);
       expect(validateName(sanitized)).toBe(false);
     });
@@ -158,7 +157,7 @@ describe('sanitizeName and validateName', () => {
       '   COM1   '
     ];
 
-    mixedNames.forEach(name => {
+    mixedNames.forEach((name) => {
       const sanitized = sanitizeName(name);
       expect(validateName(sanitized)).toBe(false);
     });
diff --git a/packages/bruno-app/src/utils/common/setupPolyfills.js b/packages/bruno-app/src/utils/common/setupPolyfills.js
index 8d42d17b9..1bb2504c9 100644
--- a/packages/bruno-app/src/utils/common/setupPolyfills.js
+++ b/packages/bruno-app/src/utils/common/setupPolyfills.js
@@ -1,24 +1,24 @@
 export const setupPolyfills = () => {
   // polyfill required to make react-pdf
-  if (typeof Promise.withResolvers === "undefined") {
+  if (typeof Promise.withResolvers === 'undefined') {
     if (typeof window !== 'undefined') {
       window.Promise.withResolvers = function () {
-        let resolve, reject
+        let resolve, reject;
         const promise = new Promise((res, rej) => {
-          resolve = res
-          reject = rej
-        })
-        return { promise, resolve, reject }
-      }
+          resolve = res;
+          reject = rej;
+        });
+        return { promise, resolve, reject };
+      };
     } else {
       global.Promise.withResolvers = function () {
-        let resolve, reject
+        let resolve, reject;
         const promise = new Promise((res, rej) => {
-          resolve = res
-          reject = rej
-        })
-        return { promise, resolve, reject }
-      }
+          resolve = res;
+          reject = rej;
+        });
+        return { promise, resolve, reject };
+      };
     }
   }
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/utils/curl/content-type.js b/packages/bruno-app/src/utils/curl/content-type.js
new file mode 100644
index 000000000..0a1e54610
--- /dev/null
+++ b/packages/bruno-app/src/utils/curl/content-type.js
@@ -0,0 +1,29 @@
+const normalizeContentType = (contentType) => {
+  if (!contentType || typeof contentType !== 'string') {
+    return '';
+  }
+
+  return contentType.toLowerCase();
+};
+
+export const isJsonLikeContentType = (contentType) => {
+  const normalized = normalizeContentType(contentType);
+
+  return normalized.includes('application/json') || normalized.includes('+json');
+};
+
+export const isXmlLikeContentType = (contentType) => {
+  const normalized = normalizeContentType(contentType);
+
+  return normalized.includes('application/xml') || normalized.includes('+xml') || normalized.includes('text/xml');
+};
+
+export const isPlainTextContentType = (contentType) => {
+  const normalized = normalizeContentType(contentType);
+
+  return normalized.includes('text/plain');
+};
+
+export const isStructuredContentType = (contentType) => {
+  return isJsonLikeContentType(contentType) || isXmlLikeContentType(contentType) || isPlainTextContentType(contentType);
+};
diff --git a/packages/bruno-app/src/utils/curl/curl-to-json.js b/packages/bruno-app/src/utils/curl/curl-to-json.js
index 21daf8283..262f73ea7 100644
--- a/packages/bruno-app/src/utils/curl/curl-to-json.js
+++ b/packages/bruno-app/src/utils/curl/curl-to-json.js
@@ -10,6 +10,7 @@ import parseCurlCommand from './parse-curl';
 import * as querystring from 'query-string';
 import * as jsesc from 'jsesc';
 import { buildQueryString } from '@usebruno/common/utils';
+import { isStructuredContentType } from './content-type';
 
 function getContentType(headers = {}) {
   const contentType = Object.keys(headers).find((key) => key.toLowerCase() === 'content-type');
@@ -18,7 +19,7 @@ function getContentType(headers = {}) {
 }
 
 function repr(value, isKey) {
-  return isKey ? "'" + jsesc(value, { quotes: 'single' }) + "'" : value;
+  return isKey ? '\'' + jsesc(value, { quotes: 'single' }) + '\'' : value;
 }
 
 /**
@@ -34,7 +35,7 @@ function getDataString(request) {
 
   const contentType = getContentType(request.headers);
 
-  if (contentType && (contentType.includes('application/json') || contentType.includes('application/xml') || contentType.includes('text/plain'))) {
+  if (isStructuredContentType(contentType)) {
     return { data: request.data };
   }
 
@@ -91,7 +92,7 @@ function getFilesString(request) {
       {
         filePath: repr(filePath),
         contentType: request.headers['Content-Type'],
-        selected: true,
+        selected: true
       }
     ];
 
diff --git a/packages/bruno-app/src/utils/curl/curl-to-json.spec.js b/packages/bruno-app/src/utils/curl/curl-to-json.spec.js
index 058064391..e85b12a9b 100644
--- a/packages/bruno-app/src/utils/curl/curl-to-json.spec.js
+++ b/packages/bruno-app/src/utils/curl/curl-to-json.spec.js
@@ -27,7 +27,7 @@ describe('curlToJson', () => {
       raw_url: 'https://www.usebruno.com',
       method: 'get',
       headers: {
-        Accept: 'application/json, text/plain, */*',
+        'Accept': 'application/json, text/plain, */*',
         'Accept-Language': 'en-US,en;q=0.9,hi;q=0.8'
       }
     });
@@ -50,11 +50,11 @@ describe('curlToJson', () => {
       raw_url: 'https://www.usebruno.com',
       method: 'post',
       headers: {
-        Accept: 'application/json, text/plain, */*',
+        'Accept': 'application/json, text/plain, */*',
         'Accept-Language': 'en-US,en;q=0.9,hi;q=0.8',
         'Content-Type': 'application/json;charset=utf-8',
-        Origin: 'https://www.usebruno.com',
-        Referer: 'https://www.usebruno.com/'
+        'Origin': 'https://www.usebruno.com',
+        'Referer': 'https://www.usebruno.com/'
       },
       data: '{"email":"test@usebruno.com","password":"test"}'
     });
@@ -71,7 +71,7 @@ describe('curlToJson', () => {
       raw_url: 'https://www.usebruno.com',
       method: 'get',
       headers: {
-        cookie: "val_1=''; val_2=\\^373:0\\^373:0; val_3=hello"
+        cookie: 'val_1=\'\'; val_2=\\^373:0\\^373:0; val_3=hello'
       }
     });
   });
@@ -104,11 +104,11 @@ describe('curlToJson', () => {
       raw_url: 'https://www.usebruno.com',
       method: 'post',
       headers: {
-        Accept: 'application/json, text/plain, */*',
+        'Accept': 'application/json, text/plain, */*',
         'Accept-Language': 'en-US,en;q=0.9,hi;q=0.8',
         'Content-Type': 'application/json;charset=utf-8',
-        Origin: 'https://www.usebruno.com',
-        Referer: 'https://www.usebruno.com/'
+        'Origin': 'https://www.usebruno.com',
+        'Referer': 'https://www.usebruno.com/'
       },
       isDataBinary: true,
       data: [
@@ -120,4 +120,37 @@ describe('curlToJson', () => {
       ]
     });
   });
+
+  it('should parse custom json content-types', () => {
+    const curlCommand = `curl 'https://api.example.com/test'
+    -H 'content-type: application/x.custom+json;version=1'
+    --data-raw '{"test":"data"}'
+    `;
+
+    const result = curlToJson(curlCommand);
+
+    expect(result).toEqual({
+      url: 'https://api.example.com/test',
+      raw_url: 'https://api.example.com/test',
+      method: 'post',
+      headers: {
+        'content-type': 'application/x.custom+json;version=1'
+      },
+      data: '{"test":"data"}'
+    });
+  });
+
+  it('should parse vendor tree json content-types', () => {
+    const curlCommand = `curl --request POST \\
+      --url https://api.example.com/orders/42/preferences \\
+      --header 'accept: */*' \\
+      --header 'content-type: application/vnd.vendor+json' \\
+      --data '{\\n  "data": {\\n    "type": "order-preferences",\\n    "attributes": {\\n      "notes": "Leave at door",\\n      "priority": true\\n    }\\n  }\\n}'`;
+
+    const result = curlToJson(curlCommand);
+    expect(result.data).toContain('"type": "order-preferences"');
+    expect(result.data).toContain('"notes": "Leave at door"');
+    expect(result.data).toContain('"priority": true');
+    expect(result.headers['content-type']).toBe('application/vnd.vendor+json');
+  });
 });
diff --git a/packages/bruno-app/src/utils/curl/index.js b/packages/bruno-app/src/utils/curl/index.js
index 3fa30a95f..f288fccc8 100644
--- a/packages/bruno-app/src/utils/curl/index.js
+++ b/packages/bruno-app/src/utils/curl/index.js
@@ -1,6 +1,7 @@
 import { forOwn } from 'lodash';
 import curlToJson from './curl-to-json';
 import { prettifyJsonString } from 'utils/common/index';
+import { isJsonLikeContentType, isPlainTextContentType, isXmlLikeContentType } from './content-type';
 
 export const getRequestFromCurlCommand = (curlCommand, requestType = 'http-request') => {
   const parseFormData = (parsedBody) => {
@@ -39,9 +40,9 @@ export const getRequestFromCurlCommand = (curlCommand, requestType = 'http-reque
     }
 
     const parsedHeaders = request?.headers;
-    const headers =
-      parsedHeaders &&
-      Object.keys(parsedHeaders).map((key) => ({ name: key, value: parsedHeaders[key], enabled: true }));
+    const headers
+      = parsedHeaders
+        && Object.keys(parsedHeaders).map((key) => ({ name: key, value: parsedHeaders[key], enabled: true }));
 
     const contentType = headers?.find((h) => h.name.toLowerCase() === 'content-type')?.value;
     const parsedBody = request.data;
@@ -59,25 +60,27 @@ export const getRequestFromCurlCommand = (curlCommand, requestType = 'http-reque
     };
 
     if (parsedBody && contentType && typeof contentType === 'string') {
-      if (requestType === 'graphql-request' && (contentType.includes('application/json') || contentType.includes('application/graphql'))) {
+      const normalizedContentType = contentType.toLowerCase();
+
+      if (requestType === 'graphql-request' && (isJsonLikeContentType(contentType) || normalizedContentType.includes('application/graphql'))) {
         body.mode = 'graphql';
         body.graphql = parseGraphQL(parsedBody);
       } else if (requestType === 'http-request' && request.isDataBinary) {
         body.mode = 'file';
         body.file = parsedBody;
-      }else if (contentType.includes('application/json')) {
+      } else if (isJsonLikeContentType(contentType)) {
         body.mode = 'json';
         body.json = prettifyJsonString(parsedBody);
-      } else if (contentType.includes('xml')) {
+      } else if (isXmlLikeContentType(contentType) || normalizedContentType.includes('xml')) {
         body.mode = 'xml';
         body.xml = parsedBody;
-      } else if (contentType.includes('application/x-www-form-urlencoded')) {
+      } else if (normalizedContentType.includes('application/x-www-form-urlencoded')) {
         body.mode = 'formUrlEncoded';
         body.formUrlEncoded = parseFormData(parsedBody);
-      } else if (contentType.includes('multipart/form-data')) {
+      } else if (normalizedContentType.includes('multipart/form-data')) {
         body.mode = 'multipartForm';
         body.multipartForm = parsedBody;
-      } else if (contentType.includes('text/plain')) {
+      } else if (isPlainTextContentType(contentType)) {
         body.mode = 'text';
         body.text = parsedBody;
       }
diff --git a/packages/bruno-app/src/utils/curl/parse-curl.js b/packages/bruno-app/src/utils/curl/parse-curl.js
index cf499d187..e7493b5f2 100644
--- a/packages/bruno-app/src/utils/curl/parse-curl.js
+++ b/packages/bruno-app/src/utils/curl/parse-curl.js
@@ -441,7 +441,6 @@ const postBuildProcessRequest = (request) => {
     // remove data and isQuery from request as they are no longer needed
     delete request.data;
     delete request.isQuery;
-
   } else if (request.data) {
     // if data is present, set method to POST unless the method is explicitly set
     if (!request.method || request.method === 'HEAD') {
@@ -483,7 +482,7 @@ const cleanCurlCommand = (curlCommand) => {
   // Handle escape sequences
   curlCommand = curlCommand.replace(/\$('.*')/g, (match, group) => group);
   // Convert escaped single quotes to shell quote pattern
-  curlCommand = curlCommand.replace(/\\'(?!')/g, "'\\''");
+  curlCommand = curlCommand.replace(/\\'(?!')/g, '\'\\\'\'');
   // Fix concatenated HTTP methods
   curlCommand = fixConcatenatedMethods(curlCommand);
 
diff --git a/packages/bruno-app/src/utils/curl/parse-curl.spec.js b/packages/bruno-app/src/utils/curl/parse-curl.spec.js
index e0da77d37..8701d980c 100644
--- a/packages/bruno-app/src/utils/curl/parse-curl.spec.js
+++ b/packages/bruno-app/src/utils/curl/parse-curl.spec.js
@@ -318,9 +318,9 @@ describe('parseCurlCommand', () => {
       expect(result).toEqual({
         method: 'get',
         headers: {
-          'Cookie': 'session=abc123'
+          Cookie: 'session=abc123'
         },
-        cookieString: "session=abc123",
+        cookieString: 'session=abc123',
         cookies: {
           session: 'abc123'
         },
@@ -337,9 +337,9 @@ describe('parseCurlCommand', () => {
       expect(result).toEqual({
         method: 'get',
         headers: {
-          'Cookie': 'session=abc123; user=john'
+          Cookie: 'session=abc123; user=john'
         },
-        cookieString: "session=abc123; user=john",
+        cookieString: 'session=abc123; user=john',
         cookies: {
           session: 'abc123',
           user: 'john'
@@ -357,9 +357,9 @@ describe('parseCurlCommand', () => {
       expect(result).toEqual({
         method: 'get',
         headers: {
-          'Cookie': 'session=abc123; user=john'
+          Cookie: 'session=abc123; user=john'
         },
-        cookieString: "session=abc123; user=john",
+        cookieString: 'session=abc123; user=john',
         cookies: {
           session: 'abc123',
           user: 'john'
@@ -378,15 +378,15 @@ describe('parseCurlCommand', () => {
       expect(result).toEqual({
         method: 'get',
         headers: {
-          'Cookie': 'session=abc123; user=john; path=/; domain=example.com; expires=Thu, 01 Jan 1970 00:00:00 GMT; secure; HttpOnly'
+          Cookie: 'session=abc123; user=john; path=/; domain=example.com; expires=Thu, 01 Jan 1970 00:00:00 GMT; secure; HttpOnly'
         },
-        cookieString: "session=abc123; user=john; path=/; domain=example.com; expires=Thu, 01 Jan 1970 00:00:00 GMT; secure; HttpOnly",
+        cookieString: 'session=abc123; user=john; path=/; domain=example.com; expires=Thu, 01 Jan 1970 00:00:00 GMT; secure; HttpOnly',
         cookies: {
           session: 'abc123',
           user: 'john',
           path: '/',
           domain: 'example.com',
-          expires: 'Thu, 01 Jan 1970 00:00:00 GMT',
+          expires: 'Thu, 01 Jan 1970 00:00:00 GMT'
         },
         url: 'https://api.example.com',
         urlWithoutQuery: 'https://api.example.com'
diff --git a/packages/bruno-app/src/utils/exporters/postman-collection.js b/packages/bruno-app/src/utils/exporters/postman-collection.js
index 65fc7e1ca..06e8c3f0a 100644
--- a/packages/bruno-app/src/utils/exporters/postman-collection.js
+++ b/packages/bruno-app/src/utils/exporters/postman-collection.js
@@ -2,7 +2,6 @@ import * as FileSaver from 'file-saver';
 import { brunoToPostman } from '@usebruno/converters';
 
 export const exportCollection = (collection) => {
-
   const collectionToExport = brunoToPostman(collection);
 
   const fileName = `${collection.name}.json`;
diff --git a/packages/bruno-app/src/utils/importers/bruno-collection.js b/packages/bruno-app/src/utils/importers/bruno-collection.js
index d940c0397..6757d0e8a 100644
--- a/packages/bruno-app/src/utils/importers/bruno-collection.js
+++ b/packages/bruno-app/src/utils/importers/bruno-collection.js
@@ -1,7 +1,6 @@
 import { BrunoError } from 'utils/common/error';
 import { validateSchema, transformItemsInCollection, updateUidsInCollection, hydrateSeqInCollection } from './common';
 
-
 export const processBrunoCollection = async (jsonData) => {
   try {
     let collection = hydrateSeqInCollection(jsonData);
diff --git a/packages/bruno-app/src/utils/importers/insomnia-collection.js b/packages/bruno-app/src/utils/importers/insomnia-collection.js
index 5e41b5832..ca2af6a6c 100644
--- a/packages/bruno-app/src/utils/importers/insomnia-collection.js
+++ b/packages/bruno-app/src/utils/importers/insomnia-collection.js
@@ -1,7 +1,6 @@
 import { BrunoError } from 'utils/common/error';
 import { insomniaToBruno } from '@usebruno/converters';
 
-
 export const convertInsomniaToBruno = (data) => {
   try {
     return insomniaToBruno(data);
diff --git a/packages/bruno-app/src/utils/importers/postman-collection.js b/packages/bruno-app/src/utils/importers/postman-collection.js
index 28bfddf05..f4c369570 100644
--- a/packages/bruno-app/src/utils/importers/postman-collection.js
+++ b/packages/bruno-app/src/utils/importers/postman-collection.js
@@ -14,8 +14,8 @@ const readFile = (files) => {
 const postmanToBruno = (collection) => {
   return new Promise((resolve, reject) => {
     window.ipcRenderer.invoke('renderer:convert-postman-to-bruno', collection)
-      .then(result => resolve(result))
-      .catch(err => {
+      .then((result) => resolve(result))
+      .catch((err) => {
         console.error('Error converting Postman to Bruno via Electron:', err);
         reject(new BrunoError('Conversion failed'));
       });
diff --git a/packages/bruno-app/src/utils/network/grpc-event-listeners.js b/packages/bruno-app/src/utils/network/grpc-event-listeners.js
index 4362b9e98..95a09a70c 100644
--- a/packages/bruno-app/src/utils/network/grpc-event-listeners.js
+++ b/packages/bruno-app/src/utils/network/grpc-event-listeners.js
@@ -15,9 +15,8 @@ const useGrpcEventListeners = () => {
 
     // Handle gRPC requestSent event
     const removeGrpcRequestSentListener = ipcRenderer.on('grpc:request', (requestId, collectionUid, eventData) => {
-
       dispatch(runGrpcRequestEvent({
-        eventType: "request",
+        eventType: 'request',
         itemUid: requestId,
         collectionUid: collectionUid,
         requestUid: requestId,
@@ -26,9 +25,8 @@ const useGrpcEventListeners = () => {
     });
 
     const removeGrpcMessageSentListener = ipcRenderer.on('grpc:message', (requestId, collectionUid, eventData) => {
-
       dispatch(runGrpcRequestEvent({
-        eventType: "message",
+        eventType: 'message',
         itemUid: requestId,
         collectionUid: collectionUid,
         requestUid: requestId,
@@ -38,7 +36,6 @@ const useGrpcEventListeners = () => {
 
     // Handle gRPC response event (for unary calls and streaming)
     const removeGrpcResponseListener = ipcRenderer.on(`grpc:response`, (requestId, collectionUid, data) => {
-      
       dispatch(grpcResponseReceived({
         itemUid: requestId,
         collectionUid: collectionUid,
@@ -49,7 +46,6 @@ const useGrpcEventListeners = () => {
 
     // Handle gRPC metadata
     const removeGrpcMetadataListener = ipcRenderer.on(`grpc:metadata`, (requestId, collectionUid, data) => {
-      
       dispatch(grpcResponseReceived({
         itemUid: requestId,
         collectionUid: collectionUid,
@@ -57,10 +53,9 @@ const useGrpcEventListeners = () => {
         eventData: data
       }));
     });
-    
+
     // Handle gRPC status updates
-    const removeGrpcStatusListener = ipcRenderer.on(`grpc:status`, (requestId, collectionUid, data) => {   
-      
+    const removeGrpcStatusListener = ipcRenderer.on(`grpc:status`, (requestId, collectionUid, data) => {
       dispatch(grpcResponseReceived({
         itemUid: requestId,
         collectionUid: collectionUid,
@@ -68,10 +63,9 @@ const useGrpcEventListeners = () => {
         eventData: data
       }));
     });
-    
+
     // Handle gRPC errors
     const removeGrpcErrorListener = ipcRenderer.on(`grpc:error`, (requestId, collectionUid, data) => {
-      
       dispatch(grpcResponseReceived({
         itemUid: requestId,
         collectionUid: collectionUid,
@@ -79,10 +73,9 @@ const useGrpcEventListeners = () => {
         eventData: data
       }));
     });
-    
+
     // Handle gRPC end event
     const removeGrpcEndListener = ipcRenderer.on(`grpc:server-end-stream`, (requestId, collectionUid, data) => {
-      
       dispatch(grpcResponseReceived({
         itemUid: requestId,
         collectionUid: collectionUid,
@@ -90,10 +83,9 @@ const useGrpcEventListeners = () => {
         eventData: data
       }));
     });
-    
+
     // Handle gRPC cancel event
     const removeGrpcCancelListener = ipcRenderer.on(`grpc:server-cancel-stream`, (requestId, collectionUid, data) => {
-      
       dispatch(grpcResponseReceived({
         itemUid: requestId,
         collectionUid: collectionUid,
@@ -103,7 +95,6 @@ const useGrpcEventListeners = () => {
     });
 
     const removeGrpcConnectionsChangedListener = ipcRenderer.on(`grpc:connections-changed`, (data) => {
-      
       dispatch(updateActiveConnectionsInStore(data));
     });
 
@@ -118,8 +109,7 @@ const useGrpcEventListeners = () => {
       removeGrpcCancelListener();
       removeGrpcConnectionsChangedListener();
     };
-      
   }, [isElectron]);
 };
 
-export default useGrpcEventListeners;
\ No newline at end of file
+export default useGrpcEventListeners;
diff --git a/packages/bruno-app/src/utils/network/index.js b/packages/bruno-app/src/utils/network/index.js
index 7c1e3b74a..0cf24d4ae 100644
--- a/packages/bruno-app/src/utils/network/index.js
+++ b/packages/bruno-app/src/utils/network/index.js
@@ -8,8 +8,9 @@ export const sendNetworkRequest = async (item, collection, environment, runtimeV
         .then((response) => {
           // if there is an error, we return the response object as is
           if (response?.error) {
-            resolve(response)
+            resolve(response);
           }
+
           resolve({
             state: 'success',
             data: response.data,
@@ -20,7 +21,8 @@ export const sendNetworkRequest = async (item, collection, environment, runtimeV
             status: response.status,
             statusText: response.statusText,
             duration: response.duration,
-            timeline: response.timeline
+            timeline: response.timeline,
+            stream: response.stream
           });
         })
         .catch((err) => reject(err));
@@ -31,19 +33,17 @@ export const sendNetworkRequest = async (item, collection, environment, runtimeV
 export const sendGrpcRequest = async (item, collection, environment, runtimeVariables) => {
   return new Promise((resolve, reject) => {
     startGrpcRequest(item, collection, environment, runtimeVariables)
-        .then((initialState) => {
-          // Return an initial state object to update the UI
-          // The real response data will be handled by event listeners
-          resolve({
-            ...initialState,
-            timeline: []
-          });
-        })
-        .catch((err) => reject(err));
+      .then((initialState) => {
+        // Return an initial state object to update the UI
+        // The real response data will be handled by event listeners
+        resolve({
+          ...initialState,
+          timeline: []
+        });
+      })
+      .catch((err) => reject(err));
   });
-}
-
-
+};
 
 const sendHttpRequest = async (item, collection, environment, runtimeVariables) => {
   return new Promise((resolve, reject) => {
@@ -83,19 +83,19 @@ export const startGrpcRequest = async (item, collection, environment, runtimeVar
   return new Promise((resolve, reject) => {
     const { ipcRenderer } = window;
     const request = item.draft ? item.draft : item;
-    
+
     ipcRenderer.invoke('grpc:start-connection', {
-      request, 
-      collection, 
-      environment, 
+      request,
+      collection,
+      environment,
       runtimeVariables
     })
-    .then(() => {
-      resolve();
-    })
-    .catch(err => {
-      reject(err);
-    });
+      .then(() => {
+        resolve();
+      })
+      .catch((err) => {
+        reject(err);
+      });
   });
 };
 
@@ -188,7 +188,7 @@ export const isGrpcConnectionActive = async (connectionId) => {
   return new Promise((resolve, reject) => {
     const { ipcRenderer } = window;
     ipcRenderer.invoke('grpc:is-connection-active', connectionId)
-      .then(response => {
+      .then((response) => {
         if (response.success) {
           resolve(response.isActive);
         } else {
@@ -197,7 +197,7 @@ export const isGrpcConnectionActive = async (connectionId) => {
           resolve(false);
         }
       })
-      .catch(err => {
+      .catch((err) => {
         console.error('Failed to check connection status:', err);
         // On error, assume the connection is not active
         resolve(false);
@@ -215,14 +215,14 @@ export const isGrpcConnectionActive = async (connectionId) => {
 export const generateGrpcSampleMessage = async (methodPath, existingMessage = null, options = {}) => {
   return new Promise((resolve, reject) => {
     const { ipcRenderer } = window;
-    
-    ipcRenderer.invoke('grpc:generate-sample-message', { 
-      methodPath, 
-      existingMessage, 
-      options 
+
+    ipcRenderer.invoke('grpc:generate-sample-message', {
+      methodPath,
+      existingMessage,
+      options
     })
-    .then(resolve)
-    .catch(reject);
+      .then(resolve)
+      .catch(reject);
   });
 };
 
@@ -241,25 +241,45 @@ export const connectWS = async (item, collection, environment, runtimeVariables,
   });
 };
 
-export const sendWsRequest = (item, collection, environment, runtimeVariables) => {
-  return new Promise(async (resolve, reject) => {
-    const ensureConnection = async () => {
-      const connectionStatus = await isWsConnectionActive(item.uid);
-      if (!connectionStatus.isActive) {
-        await connectWS(item, collection, environment, runtimeVariables, { connectOnly: true });
-      }
-    };
-    const { request } = item.draft ? item.draft : item;
-    queueWsMessage(item, collection.uid, request.body.ws[0].content)
-      .then((initialState) => {
-        // Return an initial state object to update the UI
-        // The real response data will be handled by event listeners
-        resolve({
-          ...initialState
-        });
-      })
-      .catch((err) => reject(err));
-    await ensureConnection();
+export const sendWsRequest = async (item, collection, environment, runtimeVariables) => {
+  const ensureConnection = async () => {
+    const connectionStatus = await isWsConnectionActive(item.uid);
+    if (!connectionStatus.isActive) {
+      await connectWS(item, collection, environment, runtimeVariables, { connectOnly: true });
+    }
+  };
+
+  await ensureConnection();
+
+  // Use queueWsMessage helper to queue all messages with proper variable interpolation
+  const result = await queueWsMessage(item, collection, environment, runtimeVariables, null);
+
+  if (result.success) {
+    return {};
+  } else {
+    throw new Error(result.error || 'Failed to queue messages');
+  }
+};
+
+/**
+ * Queues a message to an existing WebSocket connection with variable interpolation
+ * @param {Object} item - The request item
+ * @param {Object} collection - The collection object
+ * @param {Object} environment - The environment variables
+ * @param {Object} runtimeVariables - The runtime variables
+ * @param {string} messageContent - The message content to queue (or null to queue all messages)
+ * @returns {Promise<Object>} - The result of the queue operation
+ */
+export const queueWsMessage = async (item, collection, environment, runtimeVariables, messageContent) => {
+  return new Promise((resolve, reject) => {
+    const { ipcRenderer } = window;
+    ipcRenderer.invoke('renderer:ws:queue-message', {
+      item,
+      collection,
+      environment,
+      runtimeVariables,
+      messageContent
+    }).then(resolve).catch(reject);
   });
 };
 
@@ -287,20 +307,6 @@ export const startWsConnection = async (item, collection, environment, runtimeVa
   });
 };
 
-/**
- * Sends a message to an existing WebSocket connection
- * @param {string} requestId - The request ID to send a message to
- * @param {string} collectionUid - The collection ID the message is for
- * @param {*} message - The message
- * @returns {Promise<Object>} - The result of the send operation
- */
-export const queueWsMessage = async (item, collectionUid, message) => {
-  return new Promise((resolve, reject) => {
-    const { ipcRenderer } = window;
-    ipcRenderer.invoke('renderer:ws:queue-message', item.uid, collectionUid, message).then(resolve).catch(reject);
-  });
-};
-
 /**
  * Sends a message to an existing WebSocket connection
  * @param {string} requestId - The request ID to send a message to
@@ -337,3 +343,15 @@ export const isWsConnectionActive = async (requestId) => {
     ipcRenderer.invoke('renderer:ws:is-connection-active', requestId).then(resolve).catch(reject);
   });
 };
+
+/**
+ * Get the connection status of a WebSocket connection
+ * @param {string} requestId - The request ID to get the connection status of
+ * @returns {Promise<Object>} - The result of the get operation
+ */
+export const getWsConnectionStatus = async (requestId) => {
+  return new Promise((resolve, reject) => {
+    const { ipcRenderer } = window;
+    ipcRenderer.invoke('renderer:ws:connection-status', requestId).then(resolve).catch(reject);
+  });
+};
diff --git a/packages/bruno-app/src/utils/tabs/index.js b/packages/bruno-app/src/utils/tabs/index.js
index 392b0835b..e66b9f148 100644
--- a/packages/bruno-app/src/utils/tabs/index.js
+++ b/packages/bruno-app/src/utils/tabs/index.js
@@ -17,4 +17,4 @@ export const scrollToTheActiveTab = () => {
   if (activeTab) {
     activeTab.scrollIntoView({ behavior: 'smooth', block: 'start' });
   }
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-app/src/utils/terminal.js b/packages/bruno-app/src/utils/terminal.js
new file mode 100644
index 000000000..0933f56f3
--- /dev/null
+++ b/packages/bruno-app/src/utils/terminal.js
@@ -0,0 +1,32 @@
+import { openConsole, setActiveTab } from 'providers/ReduxStore/slices/logs';
+import { getSessionId } from 'components/Devtools/Console/TerminalTab';
+
+/**
+ * Opens the devtools console and switches to the terminal tab
+ * Optionally opens/switches to a terminal session at a specific CWD
+ * @param {Function} dispatch - Redux dispatch function
+ * @param {string} [cwd] - Optional CWD path. If provided, checks for existing session at that CWD or creates new one
+ */
+export const openDevtoolsAndSwitchToTerminal = async (dispatch, cwd = null) => {
+  // Open console if closed
+  dispatch(openConsole());
+
+  // Switch to terminal tab
+  dispatch(setActiveTab('terminal'));
+
+  // If CWD is provided, dispatch event to TerminalTab to handle session selection/creation
+  if (cwd) {
+    // Small delay to ensure terminal tab is mounted
+    setTimeout(() => {
+      window.dispatchEvent(new CustomEvent('terminal:open-at-cwd', { detail: { cwd } }));
+    }, 100);
+  }
+};
+
+/**
+ * Gets the current terminal session ID if a terminal session is running
+ * @returns {string|null} The session ID if terminal session exists, null otherwise
+ */
+export const getSessionID = () => {
+  return getSessionId();
+};
diff --git a/packages/bruno-app/src/utils/tests/collections/grpc-export-import.spec.js b/packages/bruno-app/src/utils/tests/collections/grpc-export-import.spec.js
index 9596e50d4..3fb13ddde 100644
--- a/packages/bruno-app/src/utils/tests/collections/grpc-export-import.spec.js
+++ b/packages/bruno-app/src/utils/tests/collections/grpc-export-import.spec.js
@@ -47,7 +47,7 @@ describe('gRPC Export/Import', () => {
             name: 'Streaming Request',
             request: {
               url: 'grpc://localhost:50051',
-              method: '/randomService/randomMethod',    
+              method: '/randomService/randomMethod',
               methodType: 'bidi-streaming',
               protoPath: 'proto/streaming.proto',
               headers: [],
diff --git a/packages/bruno-app/src/utils/tests/collections/items-sequencing.spec.js b/packages/bruno-app/src/utils/tests/collections/items-sequencing.spec.js
index adfb5dab9..5c103eaab 100644
--- a/packages/bruno-app/src/utils/tests/collections/items-sequencing.spec.js
+++ b/packages/bruno-app/src/utils/tests/collections/items-sequencing.spec.js
@@ -6,33 +6,32 @@ describe('resetSequencesInFolder', () => {
       items: [
         { uid: '1', seq: 1 },
         { uid: '2', seq: 3 },
-        { uid: '3', seq: 6 },
-      ],
+        { uid: '3', seq: 6 }
+      ]
     };
 
     const fixedFolder = resetSequencesInFolder(folder.items);
     expect(fixedFolder).toEqual([
       { uid: '1', seq: 1 },
       { uid: '2', seq: 2 },
-      { uid: '3', seq: 3 },
+      { uid: '3', seq: 3 }
     ]);
   });
 
-
   it('should fix the sequences in the folder 2', () => {
     const folder = {
       items: [
         { uid: '1', seq: 3 },
         { uid: '2', seq: 1 },
-        { uid: '3', seq: 2 },
-      ],
+        { uid: '3', seq: 2 }
+      ]
     };
 
     const fixedFolder = resetSequencesInFolder(folder.items);
     expect(fixedFolder).toEqual([
       { uid: '2', seq: 1 },
       { uid: '3', seq: 2 },
-      { uid: '1', seq: 3 },
+      { uid: '1', seq: 3 }
     ]);
   });
 
@@ -42,7 +41,7 @@ describe('resetSequencesInFolder', () => {
         { uid: '1', seq: 1 },
         { uid: '2', type: 'folder' },
         { uid: '3', type: 'folder' },
-        { uid: '4', seq: 7 },
+        { uid: '4', seq: 7 }
       ]
     };
 
@@ -51,7 +50,7 @@ describe('resetSequencesInFolder', () => {
       { uid: '1', seq: 1 },
       { uid: '2', seq: 2, type: 'folder' },
       { uid: '3', seq: 3, type: 'folder' },
-      { uid: '4', seq: 4 },
+      { uid: '4', seq: 4 }
     ]);
   });
 
@@ -61,8 +60,8 @@ describe('resetSequencesInFolder', () => {
         { uid: '1', seq: 2 },
         { uid: '2', seq: 2 },
         { uid: '3', seq: 3 },
-        { uid: '4', seq: 1 },
-      ],
+        { uid: '4', seq: 1 }
+      ]
     };
 
     const fixedFolder = resetSequencesInFolder(folder.items);
@@ -70,7 +69,7 @@ describe('resetSequencesInFolder', () => {
       { uid: '4', seq: 1 },
       { uid: '1', seq: 2 },
       { uid: '2', seq: 3 },
-      { uid: '3', seq: 4 },
+      { uid: '3', seq: 4 }
     ]);
   });
 });
diff --git a/packages/bruno-app/src/utils/url/index.spec.js b/packages/bruno-app/src/utils/url/index.spec.js
index f3ff35074..db6af815a 100644
--- a/packages/bruno-app/src/utils/url/index.spec.js
+++ b/packages/bruno-app/src/utils/url/index.spec.js
@@ -293,7 +293,7 @@ describe('Url Utils - interpolateUrl, interpolateUrlPathParams', () => {
     const url = '{{host}}/api/:id/path?foo={{foo}}&bar={{bar}}&baz={{process.env.baz}}';
     const expectedUrl = 'https://example.com/api/:id/path?foo=foo_value&bar=bar_value&baz=baz_value';
 
-    const result = interpolateUrl({ url, variables: { host: 'https://example.com', foo: 'foo_value', bar: 'bar_value', 'process.env.baz': 'baz_value' } });
+    const result = interpolateUrl({ url, variables: { 'host': 'https://example.com', 'foo': 'foo_value', 'bar': 'bar_value', 'process.env.baz': 'baz_value' } });
 
     expect(result).toEqual(expectedUrl);
   });
@@ -313,7 +313,7 @@ describe('Url Utils - interpolateUrl, interpolateUrlPathParams', () => {
     const params = [{ name: 'id', type: 'path', enabled: true, value: '123' }];
     const expectedUrl = 'https://example.com/api/123/path?foo=foo_value&bar=bar_value&baz=baz_value';
 
-    const intermediateResult = interpolateUrl({ url, variables: { host: 'https://example.com', foo: 'foo_value', bar: 'bar_value', 'process.env.baz': 'baz_value' } });
+    const intermediateResult = interpolateUrl({ url, variables: { 'host': 'https://example.com', 'foo': 'foo_value', 'bar': 'bar_value', 'process.env.baz': 'baz_value' } });
     const result = interpolateUrlPathParams(intermediateResult, params);
 
     expect(result).toEqual(expectedUrl);
diff --git a/packages/bruno-app/src/utils/workspaces/index.js b/packages/bruno-app/src/utils/workspaces/index.js
new file mode 100644
index 000000000..545e12a88
--- /dev/null
+++ b/packages/bruno-app/src/utils/workspaces/index.js
@@ -0,0 +1,119 @@
+// Utility functions for workspace pinning and reordering
+
+export const sortWorkspaces = (workspaces, preferences) => {
+  const pinnedUids = preferences?.workspaces?.pinnedWorkspaceUids || [];
+  const pinnedOrder = preferences?.workspaces?.pinnedOrder || [];
+  const unpinnedOrder = preferences?.workspaces?.unpinnedOrder || [];
+
+  const defaultWs = workspaces.find((w) => w.type === 'default');
+  const pinnedWs = workspaces.filter((w) => w.type !== 'default' && pinnedUids.includes(w.uid));
+  const unpinnedWs = workspaces.filter((w) => w.type !== 'default' && !pinnedUids.includes(w.uid));
+
+  const sortedPinned = [...pinnedWs].sort((a, b) => {
+    const aIndex = pinnedOrder.indexOf(a.uid);
+    const bIndex = pinnedOrder.indexOf(b.uid);
+
+    if (aIndex !== -1 && bIndex !== -1) {
+      return aIndex - bIndex;
+    }
+    if (aIndex !== -1) return -1;
+    if (bIndex !== -1) return 1;
+
+    return (a.name || '').localeCompare(b.name || '');
+  });
+
+  const sortedUnpinned = [...unpinnedWs].sort((a, b) => {
+    const aIndex = unpinnedOrder.indexOf(a.uid);
+    const bIndex = unpinnedOrder.indexOf(b.uid);
+
+    if (aIndex !== -1 && bIndex !== -1) {
+      return aIndex - bIndex;
+    }
+    if (aIndex !== -1) return -1;
+    if (bIndex !== -1) return 1;
+
+    return (a.name || '').localeCompare(b.name || '');
+  });
+
+  // Combine: default -> pinned -> unpinned
+  return [
+    ...(defaultWs ? [defaultWs] : []),
+    ...sortedPinned,
+    ...sortedUnpinned
+  ];
+};
+
+export const toggleWorkspacePin = (workspaceUid, preferences) => {
+  const pinnedUids = preferences?.workspaces?.pinnedWorkspaceUids || [];
+  const pinnedOrder = preferences?.workspaces?.pinnedOrder || [];
+  const unpinnedOrder = preferences?.workspaces?.unpinnedOrder || [];
+
+  const isPinned = pinnedUids.includes(workspaceUid);
+
+  if (isPinned) {
+    return {
+      ...preferences,
+      workspaces: {
+        ...preferences.workspaces,
+        pinnedWorkspaceUids: pinnedUids.filter((uid) => uid !== workspaceUid),
+        pinnedOrder: pinnedOrder.filter((uid) => uid !== workspaceUid),
+        unpinnedOrder: [...unpinnedOrder, workspaceUid]
+      }
+    };
+  } else {
+    return {
+      ...preferences,
+      workspaces: {
+        ...(preferences?.workspaces || {}),
+        pinnedWorkspaceUids: [...pinnedUids, workspaceUid],
+        pinnedOrder: [...pinnedOrder, workspaceUid],
+        unpinnedOrder: unpinnedOrder.filter((uid) => uid !== workspaceUid)
+      }
+    };
+  }
+};
+
+export const reorderWorkspaces = (draggedUid, targetUid, dropPosition, preferences) => {
+  const pinnedUids = preferences?.workspaces?.pinnedWorkspaceUids || [];
+  const pinnedOrder = preferences?.workspaces?.pinnedOrder || [];
+  const unpinnedOrder = preferences?.workspaces?.unpinnedOrder || [];
+
+  const isDraggedPinned = pinnedUids.includes(draggedUid);
+  const isTargetPinned = pinnedUids.includes(targetUid);
+
+  if (isDraggedPinned !== isTargetPinned) {
+    return preferences;
+  }
+
+  const orderArray = isDraggedPinned ? [...pinnedOrder] : [...unpinnedOrder];
+
+  const filteredOrder = orderArray.filter((uid) => uid !== draggedUid);
+
+  let targetIndex = filteredOrder.indexOf(targetUid);
+
+  if (targetIndex === -1) {
+    filteredOrder.push(targetUid);
+    targetIndex = filteredOrder.length - 1;
+  }
+
+  const insertIndex = dropPosition === 'after' ? targetIndex + 1 : targetIndex;
+  filteredOrder.splice(insertIndex, 0, draggedUid);
+
+  if (isDraggedPinned) {
+    return {
+      ...preferences,
+      workspaces: {
+        ...(preferences?.workspaces || {}),
+        pinnedOrder: filteredOrder
+      }
+    };
+  } else {
+    return {
+      ...preferences,
+      workspaces: {
+        ...(preferences?.workspaces || {}),
+        unpinnedOrder: filteredOrder
+      }
+    };
+  }
+};
diff --git a/packages/bruno-cli/package.json b/packages/bruno-cli/package.json
index c298273b4..806f43152 100644
--- a/packages/bruno-cli/package.json
+++ b/packages/bruno-cli/package.json
@@ -53,7 +53,6 @@
     "@usebruno/js": "0.12.0",
     "@usebruno/lang": "0.12.0",
     "@usebruno/requests": "^0.1.0",
-    "@usebruno/vm2": "^3.9.13",
     "aws4-axios": "^3.3.0",
     "axios": "^1.8.3",
     "axios-ntlm": "^1.4.2",
@@ -65,7 +64,7 @@
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "iconv-lite": "^0.6.3",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "lodash": "^4.17.21",
     "qs": "^6.11.0",
     "socks-proxy-agent": "^8.0.2",
diff --git a/packages/bruno-cli/src/commands/import.js b/packages/bruno-cli/src/commands/import.js
index 78701ea36..2ee8d838b 100644
--- a/packages/bruno-cli/src/commands/import.js
+++ b/packages/bruno-cli/src/commands/import.js
@@ -75,7 +75,7 @@ const isUrl = (str) => {
 const readOpenApiFile = async (source, options = {}) => {
   try {
     let content;
-    
+
     if (isUrl(source)) {
       // Handle URL input
       console.log(chalk.yellow(`Fetching specification from URL: ${source}`));
@@ -83,22 +83,22 @@ const readOpenApiFile = async (source, options = {}) => {
         const axiosOptions = {
           timeout: 30000, // 30 second timeout
           maxContentLength: 10 * 1024 * 1024,
-          validateStatus: status => status >= 200 && status < 300 
+          validateStatus: (status) => status >= 200 && status < 300
         };
-        
+
         // Skip SSL certificate validation if insecure flag is set
         if (options.insecure) {
           console.log(chalk.yellow('Warning: SSL certificate verification is disabled. Use with caution.'));
           axiosOptions.httpsAgent = new (require('https')).Agent({ rejectUnauthorized: false });
         }
-        
+
         const response = await axios.get(source, axiosOptions);
         content = response.data;
       } catch (error) {
         if (error.code === 'ECONNABORTED') {
           throw new Error('Request timed out. The server took too long to respond.');
-        } else if (error.code === 'CERT_HAS_EXPIRED' || error.code === 'DEPTH_ZERO_SELF_SIGNED_CERT' || 
-                   error.code === 'ERR_TLS_CERT_ALTNAME_INVALID') {
+        } else if (error.code === 'CERT_HAS_EXPIRED' || error.code === 'DEPTH_ZERO_SELF_SIGNED_CERT'
+          || error.code === 'ERR_TLS_CERT_ALTNAME_INVALID') {
           throw new Error(`SSL Certificate error: ${error.code}. Try using --insecure if you trust this source.`);
         } else if (error.response) {
           throw new Error(`Failed to fetch from URL: ${error.response.status} ${error.response.statusText}`);
@@ -108,7 +108,7 @@ const readOpenApiFile = async (source, options = {}) => {
           throw new Error(`Error fetching URL: ${error.message}`);
         }
       }
-      
+
       // If response is already an object, return it directly
       if (typeof content === 'object' && content !== null) {
         return content;
@@ -120,7 +120,7 @@ const readOpenApiFile = async (source, options = {}) => {
       }
       content = fs.readFileSync(source, 'utf8');
     }
-    
+
     // If content is a string, try to parse as JSON or YAML
     if (typeof content === 'string') {
       try {
@@ -133,7 +133,7 @@ const readOpenApiFile = async (source, options = {}) => {
         }
       }
     }
-    
+
     return content;
   } catch (error) {
     // Let the specific error handling from above propagate
@@ -247,7 +247,7 @@ const handler = async (argv) => {
       // Convert WSDL to Bruno format
       brunoCollection = await wsdlToBruno(wsdlContent);
     }
-    
+
     // Override collection name if provided
     if (collectionName) {
       brunoCollection.name = collectionName;
@@ -260,17 +260,17 @@ const handler = async (argv) => {
       console.log(chalk.green(`Bruno collection saved as JSON to ${outputPath}`));
     } else if (output) {
       const resolvedOutput = path.resolve(output);
-      
+
       // Check if output is an existing directory
       const isOutputDirectory = await exists(resolvedOutput) && isDirectory(resolvedOutput);
-      
+
       // Determine the final output directory
       let outputDir;
       if (isOutputDirectory) {
         // If output is an existing directory, use collection name to create a subdirectory
         const dirName = sanitizeName(brunoCollection.name);
         outputDir = path.join(resolvedOutput, dirName);
-        
+
         // Check if this subfolder already exists
         if (await exists(outputDir)) {
           const dirContents = fs.readdirSync(outputDir);
@@ -285,14 +285,14 @@ const handler = async (argv) => {
       } else {
         // If output doesn't exist or is not a directory, use it directly
         outputDir = resolvedOutput;
-        
+
         // Check if parent directory exists
         const parentDir = path.dirname(outputDir);
         if (!await exists(parentDir)) {
           console.error(chalk.red(`Parent directory does not exist: ${parentDir}`));
           process.exit(1);
         }
-        
+
         fs.mkdirSync(outputDir, { recursive: true });
       }
 
@@ -313,4 +313,4 @@ module.exports = {
   isUrl,
   readOpenApiFile,
   readWSDLFile
-}; 
\ No newline at end of file
+};
diff --git a/packages/bruno-cli/src/commands/run.js b/packages/bruno-cli/src/commands/run.js
index c4a7502ee..ce0b6d3dc 100644
--- a/packages/bruno-cli/src/commands/run.js
+++ b/packages/bruno-cli/src/commands/run.js
@@ -7,7 +7,7 @@ const { exists, isFile, isDirectory } = require('../utils/filesystem');
 const { runSingleRequest } = require('../runner/run-single-request');
 const { getEnvVars } = require('../utils/bru');
 const { parseEnvironmentJson } = require('../utils/environment');
-const { isRequestTagsIncluded } = require("@usebruno/common")
+const { isRequestTagsIncluded } = require('@usebruno/common');
 const makeJUnitOutput = require('../reporters/junit');
 const makeHtmlOutput = require('../reporters/html');
 const { rpad } = require('../utils/common');
@@ -98,11 +98,11 @@ const printRunSummary = (results) => {
     totalPostResponseTests,
     passedPostResponseTests,
     failedPostResponseTests
-  }
+  };
 };
 
 const getJsSandboxRuntime = (sandbox) => {
-  return sandbox === 'safe' ? 'quickjs' : 'vm2';
+  return sandbox === 'safe' ? 'quickjs' : 'nodevm';
 };
 
 const builder = async (yargs) => {
@@ -140,8 +140,8 @@ const builder = async (yargs) => {
       type: 'string'
     })
     .option('sandbox', {
-      describe: 'Javascript sandbox to use; available sandboxes are "developer" (default) or "safe"',
-      default: 'developer',
+      describe: 'Javascript sandbox to use; available sandboxes are "safe" (default) or "developer"',
+      default: 'safe',
       type: 'string'
     })
     .option('output', {
@@ -199,8 +199,8 @@ const builder = async (yargs) => {
       default: false
     })
     .option('delay', {
-      type:"number",
-      description: "Delay between each requests (in miliseconds)"
+      type: 'number',
+      description: 'Delay between each requests (in miliseconds)'
     })
     .option('tags', {
       type: 'string',
@@ -393,8 +393,8 @@ const handler = async function (argv) {
           const match = value.match(/^([^=]+)=(.*)$/);
           if (!match) {
             console.error(
-              chalk.red(`Overridable environment variable not correct: use name=value - presented: `) +
-              chalk.dim(`${value}`)
+              chalk.red(`Overridable environment variable not correct: use name=value - presented: `)
+              + chalk.dim(`${value}`)
             );
             process.exit(constants.EXIT_STATUS.ERROR_INCORRECT_ENV_OVERRIDE);
           }
@@ -483,7 +483,7 @@ const handler = async function (argv) {
       recursive = true;
     }
 
-    const resolvedPaths = paths.map(p => path.resolve(process.cwd(), p));
+    const resolvedPaths = paths.map((p) => path.resolve(process.cwd(), p));
 
     for (const resolvedPath of resolvedPaths) {
       const pathExists = await exists(resolvedPath);
@@ -499,13 +499,13 @@ const handler = async function (argv) {
       requestItems = requestItems.filter((item) => {
         const requestHasTests = hasExecutableTestInScript(item.request?.tests);
         const requestHasActiveAsserts = item.request?.assertions.some((x) => x.enabled) || false;
-        
+
         const preRequestScript = item.request?.script?.req;
         const requestHasPreRequestTests = hasExecutableTestInScript(preRequestScript);
-        
+
         const postResponseScript = item.request?.script?.res;
         const requestHasPostResponseTests = hasExecutableTestInScript(postResponseScript);
-        
+
         return requestHasTests || requestHasActiveAsserts || requestHasPreRequestTests || requestHasPostResponseTests;
       });
     }
@@ -540,13 +540,13 @@ const handler = async function (argv) {
         }
         reject(`bru.runRequest: invalid request path - ${itemPathname}`);
       });
-    }
+    };
 
     let currentRequestIndex = 0;
     let nJumps = 0; // count the number of jumps to avoid infinite loops
     while (currentRequestIndex < requestItems.length) {
       const requestItem = cloneDeep(requestItems[currentRequestIndex]);
-      const { pathname } = requestItem;
+      const { name, pathname } = requestItem;
 
       const start = process.hrtime();
       const result = await runSingleRequest(
@@ -564,19 +564,20 @@ const handler = async function (argv) {
 
       const isLastRun = currentRequestIndex === requestItems.length - 1;
       const isValidDelay = !Number.isNaN(delay) && delay > 0;
-      if(isValidDelay && !isLastRun){
-        console.log(chalk.yellow(`Waiting for ${delay}ms or ${(delay/1000).toFixed(3)}s before next request.`));
+      if (isValidDelay && !isLastRun) {
+        console.log(chalk.yellow(`Waiting for ${delay}ms or ${(delay / 1000).toFixed(3)}s before next request.`));
         await new Promise((resolve) => setTimeout(resolve, delay));
       }
 
-      if(Number.isNaN(delay) && !isLastRun){
+      if (Number.isNaN(delay) && !isLastRun) {
         console.log(chalk.red(`Ignoring delay because it's not a valid number.`));
       }
 
       results.push({
         ...result,
         runtime: process.hrtime(start)[0] + process.hrtime(start)[1] / 1e9,
-        suitename: pathname.replace('.bru', '')
+        suitename: pathname.replace('.bru', ''),
+        name
       });
 
       if (reporterSkipAllHeaders) {
@@ -609,7 +610,6 @@ const handler = async function (argv) {
         });
       }
 
-
       // bail if option is set and there is a failure
       if (bail) {
         const requestFailure = result?.error && !result?.skipped;
@@ -642,7 +642,7 @@ const handler = async function (argv) {
         if (nextRequestIdx >= 0) {
           currentRequestIndex = nextRequestIdx;
         } else {
-          console.error("Could not find request with name '" + nextRequestName + "'");
+          console.error('Could not find request with name \'' + nextRequestName + '\'');
           currentRequestIndex++;
         }
       } else {
@@ -655,6 +655,9 @@ const handler = async function (argv) {
     const totalTime = results.reduce((acc, res) => acc + res.response.responseTime, 0);
     console.log(chalk.dim(chalk.grey(`Ran all requests - ${totalTime} ms`)));
 
+    // Extract environment name from envVars if available
+    const environmentName = envVars?.__name__ || null;
+
     const formatKeys = Object.keys(formats);
     if (formatKeys && formatKeys.length > 0) {
       const outputJson = {
@@ -663,13 +666,12 @@ const handler = async function (argv) {
       };
 
       const reporters = {
-        'json': (path) => fs.writeFileSync(path, JSON.stringify(outputJson, null, 2)),
-        'junit': (path) => makeJUnitOutput(results, path),
-        'html': (path) => makeHtmlOutput(outputJson, path, runCompletionTime),
-      }
+        json: (path) => fs.writeFileSync(path, JSON.stringify(outputJson, null, 2)),
+        junit: (path) => makeJUnitOutput(results, path),
+        html: (path) => makeHtmlOutput(outputJson, path, runCompletionTime, environmentName)
+      };
 
-      for (const formatter of Object.keys(formats))
-      {
+      for (const formatter of Object.keys(formats)) {
         const reportPath = formats[formatter];
         const reporter = reporters[formatter];
 
diff --git a/packages/bruno-cli/src/index.js b/packages/bruno-cli/src/index.js
index 038667072..f92f9ce0a 100644
--- a/packages/bruno-cli/src/index.js
+++ b/packages/bruno-cli/src/index.js
@@ -20,7 +20,7 @@ const run = async () => {
     .commandDir('commands')
     .epilogue(CLI_EPILOGUE)
     .usage('Usage: $0 <command> [options]')
-    .demandCommand(1, "Woof!! Let's play with some APIs!!")
+    .demandCommand(1, 'Woof!! Let\'s play with some APIs!!')
     .help('h')
     .alias('h', 'help');
 };
diff --git a/packages/bruno-cli/src/reporters/html.js b/packages/bruno-cli/src/reporters/html.js
index 0c7975cd3..b6647ac8c 100644
--- a/packages/bruno-cli/src/reporters/html.js
+++ b/packages/bruno-cli/src/reporters/html.js
@@ -2,7 +2,7 @@ const fs = require('fs');
 const { generateHtmlReport } = require('@usebruno/common/runner');
 const { CLI_VERSION } = require('../constants');
 
-const makeHtmlOutput = async (results, outputPath, runCompletionTime) => {
+const makeHtmlOutput = async (results, outputPath, runCompletionTime, environment = null) => {
   let runnerResults = results;
   if (!results) {
     runnerResults = [];
@@ -16,10 +16,8 @@ const makeHtmlOutput = async (results, outputPath, runCompletionTime) => {
   } else if (Array.isArray(results)) {
     runnerResults = results;
   }
-  
-  const environment = runnerResults.length > 0 ? runnerResults[0].environment : null;
-  
-  const htmlString = generateHtmlReport({ 
+
+  const htmlString = generateHtmlReport({
     runnerResults: runnerResults,
     version: `usebruno v${CLI_VERSION}`,
     environment: environment,
diff --git a/packages/bruno-cli/src/reporters/junit.js b/packages/bruno-cli/src/reporters/junit.js
index e4a622722..aa2b0eb2e 100644
--- a/packages/bruno-cli/src/reporters/junit.js
+++ b/packages/bruno-cli/src/reporters/junit.js
@@ -15,7 +15,7 @@ const makeJUnitOutput = async (results, outputPath) => {
     const totalTests = assertionTestCount + testCount;
 
     const suite = {
-      '@name': result.suitename,
+      '@name': result.name,
       '@errors': 0,
       '@failures': 0,
       '@skipped': 0,
@@ -23,49 +23,48 @@ const makeJUnitOutput = async (results, outputPath) => {
       '@timestamp': new Date().toISOString().split('Z')[0],
       '@hostname': os.hostname(),
       '@time': result.runtime.toFixed(3),
-      testcase: []
+      'testcase': []
     };
 
-    result.assertionResults &&
-      result.assertionResults.forEach((assertion) => {
-        const testcase = {
-          '@name': `${assertion.lhsExpr} ${assertion.rhsExpr}`,
-          '@status': assertion.status,
-          '@classname': result.request.url,
-          '@time': (result.runtime / totalTests).toFixed(3)
-        };
+    result.assertionResults
+    && result.assertionResults.forEach((assertion) => {
+      const testcase = {
+        '@name': `${assertion.lhsExpr} ${assertion.rhsExpr}`,
+        '@status': assertion.status,
+        '@classname': result.request.url,
+        '@time': (result.runtime / totalTests).toFixed(3)
+      };
 
-        if (assertion.status === 'fail') {
-          suite['@failures']++;
+      if (assertion.status === 'fail') {
+        suite['@failures']++;
 
-          testcase.failure = [{ '@type': 'failure', '@message': assertion.error }];
-        }
+        testcase.failure = [{ '@type': 'failure', '@message': assertion.error }];
+      }
 
-        suite.testcase.push(testcase);
-      });
+      suite.testcase.push(testcase);
+    });
 
-    result.testResults &&
-      result.testResults.forEach((test) => {
-        const testcase = {
-          '@name': test.description,
-          '@status': test.status,
-          '@classname': result.request.url,
-          '@time': (result.runtime / totalTests).toFixed(3)
-        };
+    result.testResults
+    && result.testResults.forEach((test) => {
+      const testcase = {
+        '@name': test.description,
+        '@status': test.status,
+        '@classname': result.request.url,
+        '@time': (result.runtime / totalTests).toFixed(3)
+      };
 
-        if (test.status === 'fail') {
-          suite['@failures']++;
+      if (test.status === 'fail') {
+        suite['@failures']++;
 
-          testcase.failure = [{ '@type': 'failure', '@message': test.error }];
-        }
+        testcase.failure = [{ '@type': 'failure', '@message': test.error }];
+      }
 
-        suite.testcase.push(testcase);
-      });
+      suite.testcase.push(testcase);
+    });
 
     if (result?.skipped) {
       suite['@skipped'] = 1;
-    }
-    else if (result.error) {
+    } else if (result.error) {
       suite['@errors'] = 1;
       suite['@tests'] = 1;
       suite.testcase = [
@@ -74,7 +73,7 @@ const makeJUnitOutput = async (results, outputPath) => {
           '@status': 'fail',
           '@classname': result.request.url,
           '@time': result.runtime.toFixed(3),
-          error: [{ '@type': 'error', '@message': result.error }]
+          'error': [{ '@type': 'error', '@message': result.error }]
         }
       ];
     }
diff --git a/packages/bruno-cli/src/runner/interpolate-vars.js b/packages/bruno-cli/src/runner/interpolate-vars.js
index 3ed8ba735..b2f614e7e 100644
--- a/packages/bruno-cli/src/runner/interpolate-vars.js
+++ b/packages/bruno-cli/src/runner/interpolate-vars.js
@@ -89,10 +89,10 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
   } else if (contentType === 'multipart/form-data') {
     if (Array.isArray(request?.data) && !(request.data instanceof FormData)) {
       try {
-        request.data = request?.data?.map(d => ({
+        request.data = request?.data?.map((d) => ({
           ...d,
           value: _interpolate(d?.value)
-        }));   
+        }));
       } catch (err) {}
     }
   } else {
@@ -263,10 +263,10 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
   if (request.ntlmConfig) {
     request.ntlmConfig.username = _interpolate(request.ntlmConfig.username) || '';
     request.ntlmConfig.password = _interpolate(request.ntlmConfig.password) || '';
-    request.ntlmConfig.domain = _interpolate(request.ntlmConfig.domain) || '';    
+    request.ntlmConfig.domain = _interpolate(request.ntlmConfig.domain) || '';
   }
 
-  if(request?.auth) delete request.auth;
+  if (request?.auth) delete request.auth;
 
   if (request) return request;
 };
diff --git a/packages/bruno-cli/src/runner/prepare-request.js b/packages/bruno-cli/src/runner/prepare-request.js
index 607676d36..aeadc2109 100644
--- a/packages/bruno-cli/src/runner/prepare-request.js
+++ b/packages/bruno-cli/src/runner/prepare-request.js
@@ -66,7 +66,7 @@ const prepareRequest = async (item = {}, collection = {}) => {
       if (collectionAuth.apikey?.placement === 'header') {
         axiosRequest.headers[collectionAuth.apikey?.key] = collectionAuth.apikey?.value;
       }
-      
+
       if (collectionAuth.apikey?.placement === 'queryparams') {
         if (axiosRequest.url && collectionAuth.apikey?.key) {
           try {
@@ -89,7 +89,7 @@ const prepareRequest = async (item = {}, collection = {}) => {
 
     if (collectionAuth.mode === 'oauth2') {
       const grantType = get(collectionAuth, 'oauth2.grantType');
-      
+
       if (grantType === 'client_credentials') {
         axiosRequest.oauth2 = {
           grantType,
@@ -226,7 +226,7 @@ const prepareRequest = async (item = {}, collection = {}) => {
 
     if (request.auth.mode === 'oauth2') {
       const grantType = get(request, 'auth.oauth2.grantType');
-      
+
       if (grantType === 'client_credentials') {
         axiosRequest.oauth2 = {
           grantType: grantType,
@@ -265,12 +265,12 @@ const prepareRequest = async (item = {}, collection = {}) => {
         };
       }
     }
-    
+
     if (request.auth.mode === 'apikey') {
       if (request.auth.apikey?.placement === 'header') {
         axiosRequest.headers[request.auth.apikey?.key] = request.auth.apikey?.value;
       }
-      
+
       if (request.auth.apikey?.placement === 'queryparams') {
         if (axiosRequest.url && request.auth.apikey?.key) {
           try {
diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js
index 171a1a659..72511b3a2 100644
--- a/packages/bruno-cli/src/runner/run-single-request.js
+++ b/packages/bruno-cli/src/runner/run-single-request.js
@@ -25,12 +25,65 @@ const { NtlmClient } = require('axios-ntlm');
 const { addDigestInterceptor } = require('@usebruno/requests');
 const { getCACertificates } = require('@usebruno/requests');
 const { getOAuth2Token } = require('../utils/oauth2');
-const { encodeUrl, buildFormUrlEncodedPayload } = require('@usebruno/common').utils;
+const { encodeUrl, buildFormUrlEncodedPayload, extractPromptVariables } = require('@usebruno/common').utils;
 
 const onConsoleLog = (type, args) => {
   console[type](...args);
 };
 
+const getCACertHostRegex = (domain) => {
+  return '^https:\\/\\/' + domain.replaceAll('.', '\\.').replaceAll('*', '.*');
+};
+
+/**
+ * Extract prompt variables from a request
+ * Tries to respect the hierarchy of the variables and avoid unnecessary prompts as much as possible
+ * Note: TO BE CALLED ONLY AFTER THE PREPARE REQUEST
+ *
+ * @param {*} request - request object built by prepareRequest
+ * @returns {string[]} An array of extracted prompt variables
+ */
+const extractPromptVariablesForRequest = ({ request, collection, envVariables, runtimeVariables, processEnvVars, brunoConfig }) => {
+  const { vars, collectionVariables, folderVariables, requestVariables, ...requestObj } = request;
+
+  const allVariables = {
+    ...envVariables,
+    ...collectionVariables,
+    ...folderVariables,
+    ...requestVariables,
+    ...runtimeVariables,
+    process: {
+      env: {
+        ...processEnvVars
+      }
+    }
+  };
+
+  const prompts = extractPromptVariables(requestObj);
+  prompts.push(...extractPromptVariables(allVariables));
+
+  const interpolationOptions = {
+    envVars: envVariables,
+    runtimeVariables,
+    processEnvVars
+  };
+
+  // client certificate config
+  const clientCertConfig = get(brunoConfig, 'clientCertificates.certs', []);
+  for (let clientCert of clientCertConfig) {
+    const domain = interpolateString(clientCert?.domain, interpolationOptions);
+    if (domain) {
+      const hostRegex = getCACertHostRegex(domain);
+      if (request.url.match(hostRegex)) {
+        prompts.push(...extractPromptVariables(clientCert));
+      }
+    }
+  }
+
+  // return unique prompt variables
+  return Array.from(new Set(prompts));
+};
+
 const runSingleRequest = async function (
   item,
   collectionPath,
@@ -74,6 +127,39 @@ const runSingleRequest = async function (
 
     request = await prepareRequest(item, collection);
 
+    // Detect prompt variables before proceeding
+    const promptVars = extractPromptVariablesForRequest({ request, collection, envVariables, runtimeVariables, processEnvVars, brunoConfig });
+
+    if (promptVars.length > 0) {
+      const errorMsg = `Prompt variables detected in request. CLI execution is not supported for requests with prompt variables. \nPrompts: ${promptVars.join(', ')}`;
+      console.log(chalk.yellow(stripExtension(relativeItemPathname) + ' Skipped:') + chalk.dim(` (${errorMsg})`));
+      return {
+        test: {
+          filename: relativeItemPathname
+        },
+        request: {
+          method: request.method,
+          url: request.url,
+          headers: request.headers,
+          data: request.data
+        },
+        response: {
+          status: 'skipped',
+          statusText: errorMsg,
+          data: null,
+          responseTime: 0
+        },
+        error: null,
+        status: 'skipped',
+        skipped: true,
+        assertionResults: [],
+        testResults: [],
+        preRequestTestResults: [],
+        postResponseTestResults: [],
+        shouldStopRunnerExecution
+      };
+    }
+
     request.__bruno__executionMode = 'cli';
 
     const scriptingConfig = get(brunoConfig, 'scripts', {});
@@ -81,7 +167,7 @@ const runSingleRequest = async function (
 
     // run pre request script
     const requestScriptFile = get(request, 'script.req');
-    const collectionName = collection?.brunoConfig?.name
+    const collectionName = collection?.brunoConfig?.name;
     if (requestScriptFile?.length) {
       const scriptRuntime = new ScriptRuntime({ runtime: scriptingConfig?.runtime });
       const result = await scriptRuntime.runRequestScript(
@@ -150,7 +236,7 @@ const runSingleRequest = async function (
     const insecure = get(options, 'insecure', false);
     const noproxy = get(options, 'noproxy', false);
     const httpsAgentRequestFields = {};
-    
+
     if (insecure) {
       httpsAgentRequestFields['rejectUnauthorized'] = false;
     } else {
@@ -172,7 +258,7 @@ const runSingleRequest = async function (
       const domain = interpolateString(clientCert?.domain, interpolationOptions);
       const type = clientCert?.type || 'cert';
       if (domain) {
-        const hostRegex = '^https:\\/\\/' + domain.replaceAll('.', '\\.').replaceAll('*', '.*');
+        const hostRegex = getCACertHostRegex(domain);
         if (request.url.match(hostRegex)) {
           if (type === 'cert') {
             try {
@@ -205,7 +291,7 @@ const runSingleRequest = async function (
 
     const collectionProxyConfig = get(brunoConfig, 'proxy', {});
     const collectionProxyEnabled = get(collectionProxyConfig, 'enabled', false);
-    
+
     if (noproxy) {
       // If noproxy flag is set, don't use any proxy
       proxyMode = 'off';
@@ -297,40 +383,40 @@ const runSingleRequest = async function (
       });
     }
 
-    //set cookies if enabled
+    // set cookies if enabled
     if (!options.disableCookies) {
       const cookieString = getCookieStringForUrl(request.url);
       if (cookieString && typeof cookieString === 'string' && cookieString.length) {
         const existingCookieHeaderName = Object.keys(request.headers).find(
-            name => name.toLowerCase() === 'cookie'
+          (name) => name.toLowerCase() === 'cookie'
         );
         const existingCookieString = existingCookieHeaderName ? request.headers[existingCookieHeaderName] : '';
-    
+
         // Helper function to parse cookies into an object
         const parseCookies = (str) => str.split(';').reduce((cookies, cookie) => {
-            const [name, ...rest] = cookie.split('=');
-            if (name && name.trim()) {
-                cookies[name.trim()] = rest.join('=').trim();
-            }
-            return cookies;
+          const [name, ...rest] = cookie.split('=');
+          if (name && name.trim()) {
+            cookies[name.trim()] = rest.join('=').trim();
+          }
+          return cookies;
         }, {});
-    
+
         const mergedCookies = {
-            ...parseCookies(existingCookieString),
-            ...parseCookies(cookieString),
+          ...parseCookies(existingCookieString),
+          ...parseCookies(cookieString)
         };
-    
+
         const combinedCookieString = Object.entries(mergedCookies)
-            .map(([name, value]) => `${name}=${value}`)
-            .join('; ');
-    
+          .map(([name, value]) => `${name}=${value}`)
+          .join('; ');
+
         request.headers[existingCookieHeaderName || 'Cookie'] = combinedCookieString;
       }
     }
 
     // stringify the request url encoded params
     const contentTypeHeader = Object.keys(request.headers).find(
-      name => name.toLowerCase() === 'content-type'
+      (name) => name.toLowerCase() === 'content-type'
     );
 
     if (contentTypeHeader && request.headers[contentTypeHeader] === 'application/x-www-form-urlencoded') {
@@ -376,7 +462,7 @@ const runSingleRequest = async function (
         const token = await getOAuth2Token(request.oauth2);
         if (token) {
           const { tokenPlacement = 'header', tokenHeaderPrefix = '', tokenQueryKey = 'access_token' } = request.oauth2;
-          
+
           if (tokenPlacement === 'header' && token) {
             request.headers['Authorization'] = `${tokenHeaderPrefix} ${token}`.trim();
           } else if (tokenPlacement === 'url') {
@@ -392,14 +478,13 @@ const runSingleRequest = async function (
       } catch (error) {
         console.error('OAuth2 token fetch error:', error.message);
       }
-      
+
       // Remove oauth2 config from request to prevent it from being sent
       delete request.oauth2;
     }
 
     let response, responseTime;
     try {
-      
       // Set timeout from request settings, default to 0 (no timeout)
       const requestTimeout = request.settings?.timeout || 0;
       if (requestTimeout > 0) {
@@ -416,7 +501,6 @@ const runSingleRequest = async function (
         delete request.ntlmConfig;
       }
 
-
       if (request.awsv4config) {
         // todo: make this happen in prepare-request.js
         // interpolate the aws v4 config
@@ -451,7 +535,7 @@ const runSingleRequest = async function (
       responseTime = response.headers.get('request-duration');
       response.headers.delete('request-duration');
 
-      //save cookies if enabled
+      // save cookies if enabled
       if (!options.disableCookies) {
         saveCookies(request.url, response.headers);
       }
@@ -485,7 +569,7 @@ const runSingleRequest = async function (
             url: null,
             responseTime: 0
           },
-          error: err?.message || err?.errors?.map(e => e?.message)?.at(0) || err?.code || 'Request Failed!',
+          error: err?.message || err?.errors?.map((e) => e?.message)?.at(0) || err?.code || 'Request Failed!',
           status: 'error',
           assertionResults: [],
           testResults: [],
@@ -500,28 +584,13 @@ const runSingleRequest = async function (
     response.responseTime = responseTime;
 
     console.log(
-      chalk.green(stripExtension(relativeItemPathname)) +
-      chalk.dim(` (${response.status} ${response.statusText}) - ${responseTime} ms`)
+      chalk.green(stripExtension(relativeItemPathname))
+      + chalk.dim(` (${response.status} ${response.statusText}) - ${responseTime} ms`)
     );
 
     // Log pre-request test results
     logResults(preRequestTestResults, 'Pre-Request Tests');
 
-    // run post-response vars
-    const postResponseVars = get(item, 'request.vars.res');
-    if (postResponseVars?.length) {
-      const varsRuntime = new VarsRuntime({ runtime: scriptingConfig?.runtime });
-      varsRuntime.runPostResponseVars(
-        postResponseVars,
-        request,
-        response,
-        envVariables,
-        runtimeVariables,
-        collectionPath,
-        processEnvVars
-      );
-    }
-
     // run post response script
     const responseScriptFile = get(request, 'script.res');
     if (responseScriptFile?.length) {
@@ -534,7 +603,7 @@ const runSingleRequest = async function (
           envVariables,
           runtimeVariables,
           collectionPath,
-          null,
+          onConsoleLog,
           processEnvVars,
           scriptingConfig,
           runSingleRequestByPathname,
@@ -582,7 +651,7 @@ const runSingleRequest = async function (
           envVariables,
           runtimeVariables,
           collectionPath,
-          null,
+          onConsoleLog,
           processEnvVars,
           scriptingConfig,
           runSingleRequestByPathname,
@@ -604,7 +673,6 @@ const runSingleRequest = async function (
       }
     }
 
-
     logResults(assertionResults, 'Assertions');
 
     return {
diff --git a/packages/bruno-cli/src/utils/axios-instance.js b/packages/bruno-cli/src/utils/axios-instance.js
index 4bba1af73..d6162089e 100644
--- a/packages/bruno-cli/src/utils/axios-instance.js
+++ b/packages/bruno-cli/src/utils/axios-instance.js
@@ -33,17 +33,16 @@ const createRedirectConfig = (error, redirectUrl) => {
   if (METHOD_CHANGING_REDIRECTS.includes(statusCode) && originalMethod !== 'head') {
     requestConfig.method = 'get';
     requestConfig.data = undefined;
-    
+
     // Clean up headers that are no longer relevant
     delete requestConfig.headers['content-length'];
     delete requestConfig.headers['Content-Length'];
-    delete requestConfig.headers['content-type']; 
+    delete requestConfig.headers['content-type'];
     delete requestConfig.headers['Content-Type'];
   } else {
     // For 307, 308 and other status codes: preserve method and body
-    if (requestConfig.data && typeof requestConfig.data === 'object' && 
-        requestConfig.data.constructor && requestConfig.data.constructor.name === 'FormData') {
-      
+    if (requestConfig.data && typeof requestConfig.data === 'object'
+      && requestConfig.data.constructor && requestConfig.data.constructor.name === 'FormData') {
       const formData = requestConfig.data;
       if (formData._released || (formData._streams && formData._streams.length === 0)) {
         if (error.config._originalMultipartData && error.config.collectionPath) {
@@ -51,7 +50,7 @@ const createRedirectConfig = (error, redirectUrl) => {
           requestConfig.data = recreatedForm;
           const formHeaders = recreatedForm.getHeaders();
           Object.assign(requestConfig.headers, formHeaders);
-          
+
           // preserve the original data for potential future redirects
           requestConfig._originalMultipartData = error.config._originalMultipartData;
           requestConfig.collectionPath = error.config.collectionPath;
@@ -80,7 +79,7 @@ function makeAxiosInstance({ requestMaxRedirects = 5, disableCookies } = {}) {
     proxy: false,
     maxRedirects: 0,
     headers: {
-      "User-Agent": `bruno-runtime/${CLI_VERSION}`
+      'User-Agent': `bruno-runtime/${CLI_VERSION}`
     }
   });
 
@@ -133,7 +132,7 @@ function makeAxiosInstance({ requestMaxRedirects = 5, disableCookies } = {}) {
             redirectUrl = URL.resolve(error.config.url, locationHeader);
           }
 
-          if (!disableCookies){
+          if (!disableCookies) {
             saveCookies(error.config.url, error.response.headers);
           }
 
diff --git a/packages/bruno-cli/src/utils/bru.js b/packages/bruno-cli/src/utils/bru.js
index 58d4a520a..c132891e1 100644
--- a/packages/bruno-cli/src/utils/bru.js
+++ b/packages/bruno-cli/src/utils/bru.js
@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const { 
+const {
   parseRequest: _parseRequest,
   parseCollection: _parseCollection
 } = require('@usebruno/filestore');
@@ -24,7 +24,7 @@ const collectionBruToJson = (bru) => {
     const sequence = _.get(json, 'meta.seq');
     if (json?.meta) {
       transformedJson.meta = {
-        name: json.meta.name,
+        name: json.meta.name
       };
 
       if (sequence) {
@@ -94,11 +94,11 @@ const bruToJson = (bru) => {
 
     if (requestType === 'grpc-request') {
       const selectedMethod = _.get(json, 'grpc.method');
-      if(selectedMethod) transformedJson.request.method = selectedMethod;
+      if (selectedMethod) transformedJson.request.method = selectedMethod;
       const selectedMethodType = _.get(json, 'grpc.methodType');
-      if(selectedMethodType) transformedJson.request.methodType = selectedMethodType;
+      if (selectedMethodType) transformedJson.request.methodType = selectedMethodType;
       const protoPath = _.get(json, 'grpc.protoPath');
-      if(protoPath) transformedJson.request.protoPath = protoPath;
+      if (protoPath) transformedJson.request.protoPath = protoPath;
       transformedJson.request.auth.mode = _.get(json, 'grpc.auth', 'none');
       transformedJson.request.body = _.get(json, 'body', {
         mode: 'grpc',
diff --git a/packages/bruno-cli/src/utils/collection.js b/packages/bruno-cli/src/utils/collection.js
index 068cbff41..8358bc47d 100644
--- a/packages/bruno-cli/src/utils/collection.js
+++ b/packages/bruno-cli/src/utils/collection.js
@@ -9,7 +9,7 @@ const chalk = require('chalk');
 
 const createCollectionJsonFromPathname = (collectionPath) => {
   const environmentsPath = path.join(collectionPath, `environments`);
-    
+
   // get the collection bruno json config [<collection-path>/bruno.json]
   const brunoConfig = getCollectionBrunoJsonConfig(collectionPath);
 
@@ -29,17 +29,16 @@ const createCollectionJsonFromPathname = (collectionPath) => {
       if (stats.isDirectory()) {
         if (filePath === environmentsPath) continue;
         if (filePath.startsWith('.git') || filePath.startsWith('node_modules')) continue;
-        
+
         // get the folder root
-        let folderItem = { name: file, pathname: filePath, type: 'folder', items: traverse(filePath) }
+        let folderItem = { name: file, pathname: filePath, type: 'folder', items: traverse(filePath) };
         const folderBruJson = getFolderRoot(filePath);
         if (folderBruJson) {
           folderItem.root = folderBruJson;
           folderItem.seq = folderBruJson.meta.seq;
         }
         currentDirItems.push(folderItem);
-      }
-      else {
+      } else {
         if (['collection.bru', 'folder.bru'].includes(file)) continue;
         if (path.extname(filePath) !== '.bru') continue;
 
@@ -78,7 +77,7 @@ const createCollectionJsonFromPathname = (collectionPath) => {
     root: collectionRoot,
     pathname: collectionPath,
     items: collectionItems
-  }
+  };
 
   return collection;
 };
@@ -96,7 +95,7 @@ const getCollectionBrunoJsonConfig = (dir) => {
   const brunoConfigFile = fs.readFileSync(brunoJsonPath, 'utf8');
   const brunoConfig = JSON.parse(brunoConfigFile);
   return brunoConfig;
-}
+};
 
 const getCollectionRoot = (dir) => {
   const collectionRootPath = path.join(dir, 'collection.bru');
@@ -191,7 +190,7 @@ const mergeVars = (collection, request, requestTreePath) => {
   request.folderVariables = folderVariables;
   request.requestVariables = requestVariables;
 
-  if(request?.vars) {
+  if (request?.vars) {
     request.vars.req = Array.from(reqVars, ([name, value]) => ({
       name,
       value,
@@ -199,41 +198,23 @@ const mergeVars = (collection, request, requestTreePath) => {
       type: 'request'
     }));
   }
+};
 
-  let resVars = new Map();
-  let collectionResponseVars = get(collectionRoot, 'request.vars.res', []);
-  collectionResponseVars.forEach((_var) => {
-    if (_var.enabled) {
-      resVars.set(_var.name, _var.value);
-    }
-  });
-  for (let i of requestTreePath) {
-    if (i.type === 'folder') {
-      const folderRoot = i?.draft || i?.root;
-      let vars = get(folderRoot, 'request.vars.res', []);
-      vars.forEach((_var) => {
-        if (_var.enabled) {
-          resVars.set(_var.name, _var.value);
-        }
-      });
-    } else {
-      const vars = i?.draft ? get(i, 'draft.request.vars.res', []) : get(i, 'request.vars.res', []);
-      vars.forEach((_var) => {
-        if (_var.enabled) {
-          resVars.set(_var.name, _var.value);
-        }
-      });
-    }
-  }
-
-  if(request?.vars) {
-    request.vars.res = Array.from(resVars, ([name, value]) => ({
-      name,
-      value,
-      enabled: true,
-      type: 'response'
-    }));
+/**
+ * Wraps a script in an IIFE closure to isolate its scope
+ * @param {string} script - The script code to wrap
+ * @returns {string} The wrapped script
+ */
+const wrapScriptInClosure = (script) => {
+  if (!script || script.trim() === '') {
+    return '';
   }
+  // Wrap script in async IIFE to create isolated scope
+  // This prevents variable re-declaration errors and allows early returns
+  // to only affect the current script segment
+  return `await (async () => {
+${script}
+})();`;
 };
 
 const mergeScripts = (collection, request, requestTreePath, scriptFlow) => {
@@ -265,18 +246,51 @@ const mergeScripts = (collection, request, requestTreePath, scriptFlow) => {
     }
   }
 
-  request.script.req = compact([collectionPreReqScript, ...combinedPreReqScript, request?.script?.req || '']).join(os.EOL);
+  // Wrap each script segment in its own closure and join them
+  // This allows each script to run separately with its own scope,
+  // preventing variable re-declaration errors and allowing early returns
+  // to only affect that specific script segment
+  const preReqScripts = [
+    collectionPreReqScript,
+    ...combinedPreReqScript,
+    request?.script?.req || ''
+  ];
+  request.script.req = compact(preReqScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
 
+  // Handle post-response scripts based on scriptFlow
   if (scriptFlow === 'sequential') {
-    request.script.res = compact([collectionPostResScript, ...combinedPostResScript, request?.script?.res || '']).join(os.EOL);
+    const postResScripts = [
+      collectionPostResScript,
+      ...combinedPostResScript,
+      request?.script?.res || ''
+    ];
+    request.script.res = compact(postResScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
   } else {
-    request.script.res = compact([request?.script?.res || '', ...combinedPostResScript.reverse(), collectionPostResScript]).join(os.EOL);
+    // Reverse order for non-sequential flow
+    const postResScripts = [
+      request?.script?.res || '',
+      ...[...combinedPostResScript].reverse(),
+      collectionPostResScript
+    ];
+    request.script.res = compact(postResScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
   }
 
+  // Handle tests based on scriptFlow
   if (scriptFlow === 'sequential') {
-    request.tests = compact([collectionTests, ...combinedTests, request?.tests || '']).join(os.EOL);
+    const testScripts = [
+      collectionTests,
+      ...combinedTests,
+      request?.tests || ''
+    ];
+    request.tests = compact(testScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
   } else {
-    request.tests = compact([request?.tests || '', ...combinedTests.reverse(), collectionTests]).join(os.EOL);
+    // Reverse order for non-sequential flow
+    const testScripts = [
+      request?.tests || '',
+      ...[...combinedTests].reverse(),
+      collectionTests
+    ];
+    request.tests = compact(testScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
   }
 };
 
@@ -344,7 +358,7 @@ const mergeAuth = (collection, request, requestTreePath) => {
   if (request.auth && request.auth.mode === 'inherit') {
     request.auth = effectiveAuth;
   }
-}
+};
 
 const getAllRequestsInFolder = (folderItems = [], recursive = true) => {
   let requests = [];
@@ -365,12 +379,11 @@ const getAllRequestsInFolder = (folderItems = [], recursive = true) => {
 
 const getAllRequestsAtFolderRoot = (folderItems = []) => {
   return getAllRequestsInFolder(folderItems, false);
-}
+};
 
-const getCallStack = (resolvedPaths = [], collection, {recursive}) => {
+const getCallStack = (resolvedPaths = [], collection, { recursive }) => {
   let requestItems = [];
 
-
   if (!resolvedPaths || !resolvedPaths.length) {
     return requestItems;
   }
@@ -415,7 +428,7 @@ const safeWriteFileSync = (filePath, content) => {
 
 /**
  * Creates a Bruno collection directory structure from a Bruno collection object
- * 
+ *
  * @param {Object} collection - The Bruno collection object
  * @param {string} dirPath - The output directory path
  */
@@ -427,9 +440,9 @@ const createCollectionFromBrunoObject = async (collection, dirPath) => {
     type: 'collection',
     ignore: ['node_modules', '.git']
   };
-  
+
   fs.writeFileSync(
-    path.join(dirPath, 'bruno.json'), 
+    path.join(dirPath, 'bruno.json'),
     JSON.stringify(brunoConfig, null, 2)
   );
 
@@ -459,7 +472,7 @@ const createCollectionFromBrunoObject = async (collection, dirPath) => {
 
 /**
  * Recursively processes collection items to create files and folders
- * 
+ *
  * @param {Array} items - Collection items
  * @param {string} currentPath - Current directory path
  */
@@ -522,17 +535,17 @@ const processCollectionItems = async (items = [], currentPath) => {
   }
 };
 
-const sortByNameThenSequence = items => {
-  const isSeqValid = seq => Number.isFinite(seq) && Number.isInteger(seq) && seq > 0;
+const sortByNameThenSequence = (items) => {
+  const isSeqValid = (seq) => Number.isFinite(seq) && Number.isInteger(seq) && seq > 0;
 
   // Sort folders alphabetically by name
   const alphabeticallySorted = [...items].sort((a, b) => a.name && b.name && a.name.localeCompare(b.name));
 
   // Extract folders without 'seq'
-  const withoutSeq = alphabeticallySorted.filter(f => !isSeqValid(f['seq']));
+  const withoutSeq = alphabeticallySorted.filter((f) => !isSeqValid(f['seq']));
 
   // Extract folders with 'seq' and sort them by 'seq'
-  const withSeq = alphabeticallySorted.filter(f => isSeqValid(f['seq'])).sort((a, b) => a.seq - b.seq);
+  const withSeq = alphabeticallySorted.filter((f) => isSeqValid(f['seq'])).sort((a, b) => a.seq - b.seq);
 
   const sortedItems = withoutSeq;
 
@@ -551,7 +564,7 @@ const sortByNameThenSequence = items => {
       const newGroup = Array.isArray(existingItem)
         ? [...existingItem, item]
         : [existingItem, item];
-      
+
       withoutSeq.splice(position, 1, newGroup);
     } else {
       // Insert item at the specified position
@@ -563,7 +576,6 @@ const sortByNameThenSequence = items => {
   return sortedItems.flat();
 };
 
-
 module.exports = {
   createCollectionJsonFromPathname,
   mergeHeaders,
@@ -576,4 +588,4 @@ module.exports = {
   getAllRequestsInFolder,
   getAllRequestsAtFolderRoot,
   getCallStack
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-cli/src/utils/filesystem.js b/packages/bruno-cli/src/utils/filesystem.js
index e06d962c8..8c589f06a 100644
--- a/packages/bruno-cli/src/utils/filesystem.js
+++ b/packages/bruno-cli/src/utils/filesystem.js
@@ -120,41 +120,41 @@ const getSubDirectories = (dir) => {
 
 /**
  * Sanitizes a filename to make it safe for filesystem operations
- * 
+ *
  * @param {string} name - The name to sanitize
  * @returns {string} - The sanitized name
  */
 const sanitizeName = (name) => {
   if (!name) return '';
-  
+
   const invalidCharacters = /[<>:"/\\|?*\x00-\x1F]/g;
   return name
-    .replace(invalidCharacters, '-')       // replace invalid characters with hyphens
-    .replace(/^[.\s-]+/, '')               // remove leading dots, hyphens and spaces
-    .replace(/[.\s]+$/, '');               // remove trailing dots and spaces (keep trailing hyphens)
+    .replace(invalidCharacters, '-') // replace invalid characters with hyphens
+    .replace(/^[.\s-]+/, '') // remove leading dots, hyphens and spaces
+    .replace(/[.\s]+$/, ''); // remove trailing dots and spaces (keep trailing hyphens)
 };
 
 /**
  * Validates if a name is valid for the filesystem
- * 
+ *
  * @param {string} name - The name to validate
  * @returns {boolean} - True if the name is valid, false otherwise
  */
 const validateName = (name) => {
   if (!name) return false;
-  
+
   const reservedDeviceNames = /^(CON|PRN|AUX|NUL|COM[0-9]|LPT[0-9])$/i;
   const firstCharacter = /^[^.\s\-\<>:"/\\|?*\x00-\x1F]/; // no dot, space, or hyphen at start
-  const middleCharacters = /^[^<>:"/\\|?*\x00-\x1F]*$/;   // no invalid characters
-  const lastCharacter = /[^.\s]$/;  // no dot or space at end, hyphen allowed
-  
-  if (name.length > 255) return false;          // max name length
+  const middleCharacters = /^[^<>:"/\\|?*\x00-\x1F]*$/; // no invalid characters
+  const lastCharacter = /[^.\s]$/; // no dot or space at end, hyphen allowed
+
+  if (name.length > 255) return false; // max name length
   if (reservedDeviceNames.test(name)) return false; // windows reserved names
 
   return (
-    firstCharacter.test(name) &&
-    middleCharacters.test(name) &&
-    lastCharacter.test(name)
+    firstCharacter.test(name)
+    && middleCharacters.test(name)
+    && lastCharacter.test(name)
   );
 };
 
diff --git a/packages/bruno-cli/src/utils/form-data.js b/packages/bruno-cli/src/utils/form-data.js
index eab5d5824..9bff10442 100644
--- a/packages/bruno-cli/src/utils/form-data.js
+++ b/packages/bruno-cli/src/utils/form-data.js
@@ -39,4 +39,4 @@ const createFormData = (data, collectionPath) => {
 
 module.exports = {
   createFormData
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-cli/src/utils/proxy-util.js b/packages/bruno-cli/src/utils/proxy-util.js
index 2a93d517e..3d3be5045 100644
--- a/packages/bruno-cli/src/utils/proxy-util.js
+++ b/packages/bruno-cli/src/utils/proxy-util.js
@@ -79,15 +79,14 @@ class PatchedHttpsProxyAgent extends HttpsProxyAgent {
   }
 }
 
-
 const getSystemProxyEnvVariables = () => {
   const { http_proxy, HTTP_PROXY, https_proxy, HTTPS_PROXY, no_proxy, NO_PROXY } = process.env;
   return {
     http_proxy: http_proxy || HTTP_PROXY,
     https_proxy: https_proxy || HTTPS_PROXY,
     no_proxy: no_proxy || NO_PROXY
-  }; 
-}
+  };
+};
 
 module.exports = {
   shouldUseProxy,
diff --git a/packages/bruno-cli/src/utils/request.js b/packages/bruno-cli/src/utils/request.js
index 6a75a3cc7..44f3fd6a0 100644
--- a/packages/bruno-cli/src/utils/request.js
+++ b/packages/bruno-cli/src/utils/request.js
@@ -1,28 +1,27 @@
-
 // Check for meaningful test() calls (not commented out or in strings)
 const hasExecutableTestInScript = (script) => {
   if (!script) return false;
-  
+
   // Remove single-line comments (// ...) and multi-line comments (/* ... */)
   let cleanScript = script
-    .replace(/\/\/.*$/gm, '')  // Remove line comments
+    .replace(/\/\/.*$/gm, '') // Remove line comments
     .replace(/\/\*[\s\S]*?\*\//g, ''); // Remove block comments
-  
+
   // Remove string literals to avoid matching test() inside strings
   cleanScript = cleanScript
-    .replace(/"(?:[^"\\]|\\.)*"/g, '""')  // Remove double-quoted strings
-    .replace(/'(?:[^'\\]|\\.)*'/g, "''")  // Remove single-quoted strings
+    .replace(/"(?:[^"\\]|\\.)*"/g, '""') // Remove double-quoted strings
+    .replace(/'(?:[^'\\]|\\.)*'/g, '\'\'') // Remove single-quoted strings
     .replace(/`(?:[^`\\]|\\.)*`/g, '``'); // Remove template literals
-  
+
   // Look for standalone test() calls (not object method calls like obj.test())
   // Find all test( occurrences and check they're not preceded by dots
   let hasValidTest = false;
   let searchFrom = 0;
-  
+
   while (true) {
     const index = cleanScript.indexOf('test', searchFrom);
     if (index === -1) break;
-    
+
     // Check if this looks like test( with optional whitespace
     const afterTest = cleanScript.substring(index + 4);
     if (/^\s*\(/.test(afterTest)) {
@@ -32,13 +31,13 @@ const hasExecutableTestInScript = (script) => {
         break;
       }
     }
-    
+
     searchFrom = index + 1;
   }
-  
+
   return hasValidTest;
 };
 
 module.exports = {
   hasExecutableTestInScript
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-cli/tests/reporters/html.spec.js b/packages/bruno-cli/tests/reporters/html.spec.js
new file mode 100644
index 000000000..43e82eaa5
--- /dev/null
+++ b/packages/bruno-cli/tests/reporters/html.spec.js
@@ -0,0 +1,73 @@
+const { describe, it, expect } = require('@jest/globals');
+const fs = require('fs');
+
+const mockGenerateHtmlReport = jest.fn(() => '<html>Mock HTML</html>');
+
+jest.mock('@usebruno/common/runner', () => ({
+  generateHtmlReport: mockGenerateHtmlReport
+}));
+
+const makeHtmlOutput = require('../../src/reporters/html');
+
+describe('makeHtmlOutput', () => {
+  let writeFileSyncSpy;
+
+  beforeEach(() => {
+    mockGenerateHtmlReport.mockClear();
+    writeFileSyncSpy = jest.spyOn(fs, 'writeFileSync').mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('should pass environment parameter to generateHtmlReport when provided', async () => {
+    const mockResults = {
+      results: [],
+      summary: {
+        totalRequests: 0,
+        passedRequests: 0,
+        failedRequests: 0,
+        errorRequests: 0,
+        skippedRequests: 0,
+        totalAssertions: 0,
+        passedAssertions: 0,
+        failedAssertions: 0,
+        totalTests: 0,
+        passedTests: 0,
+        failedTests: 0
+      }
+    };
+
+    await makeHtmlOutput(mockResults, '/tmp/test.html', '2024-01-15T14:30:45.123Z', 'production');
+
+    expect(mockGenerateHtmlReport).toHaveBeenCalledWith(expect.objectContaining({
+      environment: 'production'
+    }));
+  });
+
+  it('should pass null environment when not provided', async () => {
+    const mockResults = {
+      results: [],
+      summary: {
+        totalRequests: 0,
+        passedRequests: 0,
+        failedRequests: 0,
+        errorRequests: 0,
+        skippedRequests: 0,
+        totalAssertions: 0,
+        passedAssertions: 0,
+        failedAssertions: 0,
+        totalTests: 0,
+        passedTests: 0,
+        failedTests: 0
+      }
+    };
+
+    await makeHtmlOutput(mockResults, '/tmp/test.html', '2024-01-15T14:30:45.123Z');
+
+    expect(mockGenerateHtmlReport).toHaveBeenCalledWith(expect.objectContaining({
+      environment: null
+    }));
+  });
+});
diff --git a/packages/bruno-cli/tests/reporters/junit.spec.js b/packages/bruno-cli/tests/reporters/junit.spec.js
index 5d2154a88..f29bc0340 100644
--- a/packages/bruno-cli/tests/reporters/junit.spec.js
+++ b/packages/bruno-cli/tests/reporters/junit.spec.js
@@ -22,7 +22,7 @@ describe('makeJUnitOutput', () => {
     const results = [
       {
         description: 'description provided',
-        suitename: 'Tests/Suite A',
+        name: 'Tests/Suite A',
         request: {
           method: 'GET',
           url: 'https://ima.test'
@@ -47,7 +47,7 @@ describe('makeJUnitOutput', () => {
           method: 'GET',
           url: 'https://imanother.test'
         },
-        suitename: 'Tests/Suite B',
+        name: 'Tests/Suite B',
         testResults: [
           {
             lhsExpr: 'res.status',
@@ -98,7 +98,7 @@ describe('makeJUnitOutput', () => {
     const results = [
       {
         description: 'description provided',
-        suitename: 'Tests/Suite A',
+        name: 'Tests/Suite A',
         request: {
           method: 'GET',
           url: 'https://ima.test'
diff --git a/packages/bruno-cli/tests/runner/collection-json-from-pathname.spec.js b/packages/bruno-cli/tests/runner/collection-json-from-pathname.spec.js
index 8cab346cd..b26a08443 100644
--- a/packages/bruno-cli/tests/runner/collection-json-from-pathname.spec.js
+++ b/packages/bruno-cli/tests/runner/collection-json-from-pathname.spec.js
@@ -1,19 +1,19 @@
-const path = require("node:path");
+const path = require('node:path');
 const { describe, it, expect } = require('@jest/globals');
 const constants = require('../../src/constants');
 const { createCollectionJsonFromPathname } = require('../../src/utils/collection');
 
 describe('create collection json from pathname', () => {
-  it("should throw an error when the pathname is not a valid bruno collection root", () => {
+  it('should throw an error when the pathname is not a valid bruno collection root', () => {
     const invalidCollectionPathname = path.join(__dirname, './fixtures/collection-invalid');
     jest.spyOn(console, 'error').mockImplementation(() => { });
     let mockProcessExit = jest.spyOn(process, 'exit').mockImplementation((code) => { throw new Error(code); });
     try { createCollectionJsonFromPathname(invalidCollectionPathname); } catch { }
     expect(mockProcessExit).toHaveBeenCalledWith(constants.EXIT_STATUS.ERROR_NOT_IN_COLLECTION);
     jest.restoreAllMocks();
-  })
+  });
 
-  it("creates a bruno collection json from the collection bru files", () => {
+  it('creates a bruno collection json from the collection bru files', () => {
     const collectionPathname = path.join(__dirname, './fixtures/collection-json-from-pathname/collection');
     const outputCollectionJson = createCollectionJsonFromPathname(collectionPathname);
 
@@ -21,10 +21,10 @@ describe('create collection json from pathname', () => {
     expect(c).toBeDefined();
 
     /* collection bruno.json */
-    expect(c).toHaveProperty('brunoConfig.version', "1");
+    expect(c).toHaveProperty('brunoConfig.version', '1');
     expect(c).toHaveProperty('brunoConfig.name', 'collection');
     expect(c).toHaveProperty('brunoConfig.type', 'collection');
-    expect(c).toHaveProperty('brunoConfig.ignore', ["node_modules", ".git"]);
+    expect(c).toHaveProperty('brunoConfig.ignore', ['node_modules', '.git']);
     expect(c).toHaveProperty('brunoConfig.proxy.enabled', false);
     expect(c).toHaveProperty('brunoConfig.proxy.protocol', 'http');
     expect(c).toHaveProperty('brunoConfig.proxy.hostname', '<proxy-hostname>');
@@ -169,4 +169,4 @@ describe('create collection json from pathname', () => {
     // tests
     expect(c).toHaveProperty('items[4].request.tests', 'test(\"request level script\", function() {\n  expect(\"test\").to.equal(\"test\");\n});');
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-cli/tests/runner/prepare-request.spec.js b/packages/bruno-cli/tests/runner/prepare-request.spec.js
index 14e5b5af4..61dd143fd 100644
--- a/packages/bruno-cli/tests/runner/prepare-request.spec.js
+++ b/packages/bruno-cli/tests/runner/prepare-request.spec.js
@@ -62,11 +62,11 @@ describe('prepare-request: prepareRequest', () => {
     describe('API Key Authentication', () => {
       it('If collection auth is apikey in header', async () => {
         collection.root.request.auth = {
-          mode: "apikey",
+          mode: 'apikey',
           apikey: {
-            key: "x-api-key",
-            value: "{{apiKey}}",
-            placement: "header"
+            key: 'x-api-key',
+            value: '{{apiKey}}',
+            placement: 'header'
           }
         };
 
@@ -76,11 +76,11 @@ describe('prepare-request: prepareRequest', () => {
 
       it('If collection auth is apikey in header and request has existing headers', async () => {
         collection.root.request.auth = {
-          mode: "apikey",
+          mode: 'apikey',
           apikey: {
-            key: "x-api-key",
-            value: "{{apiKey}}",
-            placement: "header"
+            key: 'x-api-key',
+            value: '{{apiKey}}',
+            placement: 'header'
           }
         };
 
@@ -92,11 +92,11 @@ describe('prepare-request: prepareRequest', () => {
 
       it('If collection auth is apikey in query parameters', async () => {
         collection.root.request.auth = {
-          mode: "apikey",
+          mode: 'apikey',
           apikey: {
-            key: "x-api-key",
-            value: "{{apiKey}}",
-            placement: "queryparams"
+            key: 'x-api-key',
+            value: '{{apiKey}}',
+            placement: 'queryparams'
           }
         };
 
@@ -172,7 +172,7 @@ describe('prepare-request: prepareRequest', () => {
         };
 
         const result = await prepareRequest(item, collection);
-        
+
         expect(result.oauth2).toBeDefined();
         expect(result.oauth2.grantType).toBe('client_credentials');
         expect(result.oauth2.accessTokenUrl).toBe('https://auth.example.com/token');
@@ -204,7 +204,7 @@ describe('prepare-request: prepareRequest', () => {
         };
 
         const result = await prepareRequest(item, collection);
-        
+
         expect(result.oauth2).toBeDefined();
         expect(result.oauth2.grantType).toBe('password');
         expect(result.oauth2.accessTokenUrl).toBe('https://auth.example.com/token');
@@ -298,7 +298,7 @@ describe('prepare-request: prepareRequest', () => {
         };
 
         const result = await prepareRequest(item, collection);
-        
+
         const expected = {
           username: 'testUser',
           password: 'testPass123'
@@ -345,11 +345,11 @@ describe('prepare-request: prepareRequest', () => {
     describe('API Key Authentication', () => {
       it('If request auth is apikey in header', async () => {
         item.request.auth = {
-          mode: "apikey",
+          mode: 'apikey',
           apikey: {
-            key: "x-api-key",
-            value: "{{apiKey}}",
-            placement: "header"
+            key: 'x-api-key',
+            value: '{{apiKey}}',
+            placement: 'header'
           }
         };
 
@@ -359,11 +359,11 @@ describe('prepare-request: prepareRequest', () => {
 
       it('If request auth is apikey in header and request has existing headers', async () => {
         item.request.auth = {
-          mode: "apikey",
+          mode: 'apikey',
           apikey: {
-            key: "x-api-key",
-            value: "{{apiKey}}",
-            placement: "header"
+            key: 'x-api-key',
+            value: '{{apiKey}}',
+            placement: 'header'
           }
         };
 
@@ -375,11 +375,11 @@ describe('prepare-request: prepareRequest', () => {
 
       it('If request auth is apikey in query parameters', async () => {
         item.request.auth = {
-          mode: "apikey",
+          mode: 'apikey',
           apikey: {
-            key: "x-api-key",
-            value: "{{apiKey}}",
-            placement: "queryparams"
+            key: 'x-api-key',
+            value: '{{apiKey}}',
+            placement: 'queryparams'
           }
         };
 
diff --git a/packages/bruno-cli/tests/runner/report-metadata.spec.js b/packages/bruno-cli/tests/runner/report-metadata.spec.js
index 9732e4aeb..2db861b35 100644
--- a/packages/bruno-cli/tests/runner/report-metadata.spec.js
+++ b/packages/bruno-cli/tests/runner/report-metadata.spec.js
@@ -49,4 +49,4 @@ describe('HTML Report Generation', () => {
     expect(htmlString).toContain('{{ totalDataReceived }}');
     expect(htmlString).toContain('{{ averageResponseTime }}');
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-cli/tests/utils/common.spec.js b/packages/bruno-cli/tests/utils/common.spec.js
index bd4c1e7e0..16707f906 100644
--- a/packages/bruno-cli/tests/utils/common.spec.js
+++ b/packages/bruno-cli/tests/utils/common.spec.js
@@ -306,4 +306,4 @@ describe('hasExecutableTestInScript', () => {
       expect(hasExecutableTestInScript(script)).toBe(true);
     });
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-common/src/interpolate/index.spec.ts b/packages/bruno-common/src/interpolate/index.spec.ts
index b47be2fdd..98d4e3223 100644
--- a/packages/bruno-common/src/interpolate/index.spec.ts
+++ b/packages/bruno-common/src/interpolate/index.spec.ts
@@ -7,9 +7,9 @@ const calculateAgeFromBirthDate = (birthDate = BRUNO_BIRTH_DATE) => {
   const today = new Date();
   let age = today.getFullYear() - birthDate.getFullYear();
 
-  const hasBirthdayPassedThisYear =
-    today.getMonth() > birthDate.getMonth() ||
-    (today.getMonth() === birthDate.getMonth() && today.getDate() >= birthDate.getDate());
+  const hasBirthdayPassedThisYear
+    = today.getMonth() > birthDate.getMonth()
+      || (today.getMonth() === birthDate.getMonth() && today.getDate() >= birthDate.getDate());
 
   if (!hasBirthdayPassedThisYear) {
     age--;
@@ -25,7 +25,7 @@ describe('interpolate', () => {
     const inputString = 'Hello, my name is {{user.name}} and I am {{user.age}} years old';
     const inputObject = {
       'user.name': 'Bruno',
-      user: {
+      'user': {
         age: BRUNO_AGE
       }
     };
@@ -51,8 +51,8 @@ describe('interpolate', () => {
   it('should handle all valid keys', () => {
     const inputObject = {
       user: {
-        full_name: 'Bruno',
-        age: BRUNO_AGE,
+        'full_name': 'Bruno',
+        'age': BRUNO_AGE,
         'fav-food': ['egg', 'meat'],
         'want.attention': true
       }
@@ -77,7 +77,7 @@ describe('interpolate', () => {
     const inputString = 'Hello, my name is {{ user.name }} and I am {{user.age}} years old';
     const inputObject = {
       'user.name': 'Bruno',
-      user: {
+      'user': {
         age: BRUNO_AGE
       }
     };
@@ -92,7 +92,7 @@ describe('interpolate', () => {
     const inputObject = {
       data: {
         'user.name': 'Bruno',
-        user: {
+        'user': {
           name: 'Not _Bruno_',
           age: BRUNO_AGE
         }
@@ -198,7 +198,7 @@ describe('interpolate - recursive', () => {
     const inputObject = {
       'user.message': 'Hello, my name is {{user.name}} and I am {{user.age}} years old',
       'user.name': 'Bruno',
-      user: {
+      'user': {
         age: BRUNO_AGE
       }
     };
@@ -214,7 +214,7 @@ describe('interpolate - recursive', () => {
       'user.message': 'Hello, my name is {{user.name}} and I am {{user.age}} years old',
       'user.name': 'Bruno {{user.lastName}}',
       'user.lastName': 'Dog',
-      user: {
+      'user': {
         age: BRUNO_AGE
       }
     };
@@ -231,7 +231,7 @@ describe('interpolate - recursive', () => {
       'user.full_name': '{{user.name}}',
       'user.name': 'Bruno {{user.lastName}}',
       'user.lastName': 'Dog',
-      user: {
+      'user': {
         age: BRUNO_AGE
       }
     };
@@ -245,7 +245,7 @@ describe('interpolate - recursive', () => {
     const inputString = '{{user.message}}';
     const inputObject = {
       'user.message': 'Hello, my name is {{user.name}} and I am {{user.age}} years old',
-      user: {
+      'user': {
         age: BRUNO_AGE
       }
     };
@@ -265,8 +265,8 @@ describe('interpolate - recursive', () => {
     const inputObject = {
       user: {
         message,
-        full_name: 'Bruno',
-        age: BRUNO_AGE,
+        'full_name': 'Bruno',
+        'age': BRUNO_AGE,
         'fav-food': ['egg', 'meat'],
         'want.attention': true
       }
@@ -381,7 +381,7 @@ describe('interpolate - object handling', () => {
   it('should stringify simple objects', () => {
     const inputString = 'User: {{user}}';
     const inputObject = {
-      'user': { name: 'Bruno', age: BRUNO_AGE }
+      user: { name: 'Bruno', age: BRUNO_AGE }
     };
 
     const result = interpolate(inputString, inputObject);
@@ -403,9 +403,9 @@ describe('interpolate - object handling', () => {
   it('should stringify nested objects', () => {
     const inputString = 'User: {{user}}';
     const inputObject = {
-      'user': {
+      user: {
         name: 'Bruno',
-         age: BRUNO_AGE,
+        age: BRUNO_AGE,
         preferences: {
           food: ['egg', 'meat'],
           toys: { favorite: 'ball' }
@@ -432,7 +432,7 @@ describe('interpolate - object handling', () => {
   it('should handle null values correctly', () => {
     const inputString = 'User: {{user}}';
     const inputObject = {
-      'user': null
+      user: null
     };
 
     const result = interpolate(inputString, inputObject);
@@ -443,8 +443,8 @@ describe('interpolate - object handling', () => {
   it('should handle objects with nested interpolation', () => {
     const inputString = 'User: {{user}}';
     const inputObject = {
-      'user': { 
-        name: 'Bruno', 
+      'user': {
+        name: 'Bruno',
         message: '{{user.greeting}}'
       },
       'user.greeting': 'Hello there!'
@@ -458,7 +458,7 @@ describe('interpolate - object handling', () => {
   it('should handle objects within arrays', () => {
     const inputString = 'Items: {{items}}';
     const inputObject = {
-      'items': [
+      items: [
         { id: 1, name: 'Toy' },
         { id: 2, name: 'Bone' },
         { id: 3, name: 'Ball', colors: ['red', 'blue'] }
@@ -503,7 +503,7 @@ describe('interpolate - mock variable interpolation', () => {
 
   it('should escape special characters in mock variable values and produce valid JSON when escapeJSONStrings is true', () => {
     const inputString = '{"escapedValue": "{{$randomLoremParagraphs}}"}';
-  
+
     expect(() => {
       const result = interpolate(inputString, {}, { escapeJSONStrings: true });
       JSON.parse(result); // This should not throw an error
@@ -512,7 +512,7 @@ describe('interpolate - mock variable interpolation', () => {
 
   it('should not produce valid JSON when escapeJSONStrings is false', () => {
     const inputString = '{"escapedValue": "{{$randomLoremParagraphs}}"}';
-  
+
     expect(() => {
       const result = interpolate(inputString, {}, { escapeJSONStrings: false });
       JSON.parse(result); // This should throw an error
@@ -521,13 +521,13 @@ describe('interpolate - mock variable interpolation', () => {
 
   it('should throw an error when producing invalid JSON regardless of escapeJSONStrings option', () => {
     const inputString = '{"escapedValue": "{{$randomLoremParagraphs}}"}';
-  
+
     // Test without providing the options argument
     expect(() => {
       const result = interpolate(inputString, {});
       JSON.parse(result); // This should throw an error
     }).toThrow();
-  
+
     // Test with escapeJSONStrings explicitly set to false
     expect(() => {
       const result = interpolate(inputString, {}, { escapeJSONStrings: false });
@@ -540,7 +540,7 @@ describe('interpolate - Date() handling', () => {
   it('should interpolate Date() using JSON.stringify', () => {
     const inputString = 'Date is {{date}}';
     const inputObject = {
-      date: new Date("2025-04-17T15:33:41.117Z")
+      date: new Date('2025-04-17T15:33:41.117Z')
     };
 
     const jsonStringifiedDate = JSON.stringify(inputObject.date);
@@ -548,27 +548,27 @@ describe('interpolate - Date() handling', () => {
 
     expect(result).toBe('Date is "2025-04-17T15:33:41.117Z"');
     expect(result).toBe(`Date is ${jsonStringifiedDate}`);
-  })
+  });
 
   it('should interpolate Date() when its nested in an object', () => {
     const inputString = 'Date is {{date}}';
     const inputObject = {
       date: {
-        now: new Date("2025-04-17T15:33:41.117Z")
+        now: new Date('2025-04-17T15:33:41.117Z')
       }
     };
 
     const result = interpolate(inputString, inputObject);
 
     expect(result).toBe('Date is {"now":"2025-04-17T15:33:41.117Z"}');
-  })
+  });
 });
 
 describe('interpolate - moment() handling', () => {
   it('should interpolate moment() using JSON.stringify', () => {
     const inputString = 'Date is {{date}}';
     const inputObject = {
-      date: moment("2025-04-17T15:33:41.117Z")
+      date: moment('2025-04-17T15:33:41.117Z')
     };
 
     const jsonStringifiedDate = JSON.stringify(inputObject.date);
@@ -576,18 +576,18 @@ describe('interpolate - moment() handling', () => {
 
     expect(result).toBe('Date is "2025-04-17T15:33:41.117Z"');
     expect(result).toBe(`Date is ${jsonStringifiedDate}`);
-  })
+  });
 
   it('should interpolate moment() when its nested in an object', () => {
     const inputString = 'Date is {{date}}';
     const inputObject = {
       date: {
-        now: moment("2025-04-17T15:33:41.117Z")
+        now: moment('2025-04-17T15:33:41.117Z')
       }
     };
 
     const result = interpolate(inputString, inputObject);
 
     expect(result).toBe('Date is {"now":"2025-04-17T15:33:41.117Z"}');
-  })
-})
\ No newline at end of file
+  });
+});
diff --git a/packages/bruno-common/src/interpolate/index.ts b/packages/bruno-common/src/interpolate/index.ts
index daa10ab98..4cd8a2b16 100644
--- a/packages/bruno-common/src/interpolate/index.ts
+++ b/packages/bruno-common/src/interpolate/index.ts
@@ -12,7 +12,7 @@
  */
 
 import { mockDataFunctions } from '../utils/faker-functions';
-import { get } from "lodash-es";
+import { get } from 'lodash-es';
 
 const interpolate = (
   str: string,
@@ -96,4 +96,4 @@ const replace = (
   return resultStr;
 };
 
-export default interpolate;
\ No newline at end of file
+export default interpolate;
diff --git a/packages/bruno-common/src/runner/index.ts b/packages/bruno-common/src/runner/index.ts
index 3e3c842b0..e5040fded 100644
--- a/packages/bruno-common/src/runner/index.ts
+++ b/packages/bruno-common/src/runner/index.ts
@@ -1,4 +1,4 @@
-import { generateHtmlReport } from "./reports/html/generate-report";
-import { getRunnerSummary } from "./runner-summary";
+import { generateHtmlReport } from './reports/html/generate-report';
+import { getRunnerSummary } from './runner-summary';
 
-export { generateHtmlReport, getRunnerSummary };
\ No newline at end of file
+export { generateHtmlReport, getRunnerSummary };
diff --git a/packages/bruno-common/src/runner/reports/html/generate-report.ts b/packages/bruno-common/src/runner/reports/html/generate-report.ts
index e08ddce29..7d140af51 100644
--- a/packages/bruno-common/src/runner/reports/html/generate-report.ts
+++ b/packages/bruno-common/src/runner/reports/html/generate-report.ts
@@ -1,6 +1,6 @@
-import { T_RunnerResults } from "../../types";
-import { isHtmlContentType, getContentType, redactImageData, encodeBase64 } from "../../utils";
-import htmlTemplateString from "./template";
+import { T_RunnerResults } from '../../types';
+import { isHtmlContentType, getContentType, redactImageData, encodeBase64 } from '../../utils';
+import htmlTemplateString from './template';
 
 const generateHtmlReport = ({
   runnerResults,
@@ -32,10 +32,10 @@ const generateHtmlReport = ({
             data: response?.data ? redactImageData(response?.data, responseContentType) : response?.data,
             isHtml: isHtmlContentType(responseContentType)
           }
-        }
+        };
       }),
       summary
-    }
+    };
   });
   const htmlString = htmlTemplateString(encodeBase64(JSON.stringify({
     results: resultsWithSummaryAndCleanData,
@@ -46,4 +46,4 @@ const generateHtmlReport = ({
   return htmlString;
 };
 
-export { generateHtmlReport }
\ No newline at end of file
+export { generateHtmlReport };
diff --git a/packages/bruno-common/src/runner/reports/html/template.ts b/packages/bruno-common/src/runner/reports/html/template.ts
index 44589b81d..ca49cb337 100644
--- a/packages/bruno-common/src/runner/reports/html/template.ts
+++ b/packages/bruno-common/src/runner/reports/html/template.ts
@@ -1,4 +1,4 @@
-export const htmlTemplateString = (resutsJsonString: string) =>`<!DOCTYPE html>
+export const htmlTemplateString = (resutsJsonString: string) => `<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/packages/bruno-common/src/runner/runner-summary.ts b/packages/bruno-common/src/runner/runner-summary.ts
index 4fb276a29..3e99e676f 100644
--- a/packages/bruno-common/src/runner/runner-summary.ts
+++ b/packages/bruno-common/src/runner/runner-summary.ts
@@ -1,4 +1,4 @@
-import { T_RunnerRequestExecutionResult, T_RunSummary } from "./types";
+import { T_RunnerRequestExecutionResult, T_RunSummary } from './types';
 
 // todo: this is generic, not specific to html, can be moved out of the report/html sub-package
 export const getRunnerSummary = (results: T_RunnerRequestExecutionResult[]): T_RunSummary => {
@@ -35,7 +35,7 @@ export const getRunnerSummary = (results: T_RunnerRequestExecutionResult[]): T_R
 
     let anyFailed = false;
     for (const testResult of testResults || []) {
-      if (testResult.status === "pass") {
+      if (testResult.status === 'pass') {
         passedTests += 1;
       } else {
         anyFailed = true;
@@ -43,7 +43,7 @@ export const getRunnerSummary = (results: T_RunnerRequestExecutionResult[]): T_R
       }
     }
     for (const assertionResult of assertionResults || []) {
-      if (assertionResult.status === "pass") {
+      if (assertionResult.status === 'pass') {
         passedAssertions += 1;
       } else {
         anyFailed = true;
@@ -51,7 +51,7 @@ export const getRunnerSummary = (results: T_RunnerRequestExecutionResult[]): T_R
       }
     }
     for (const preRequestTestResult of preRequestTestResults || []) {
-      if (preRequestTestResult.status === "pass") {
+      if (preRequestTestResult.status === 'pass') {
         passedPreRequestTests += 1;
       } else {
         anyFailed = true;
@@ -59,7 +59,7 @@ export const getRunnerSummary = (results: T_RunnerRequestExecutionResult[]): T_R
       }
     }
     for (const postResponseTestResult of postResponseTestResults || []) {
-      if (postResponseTestResult.status === "pass") {
+      if (postResponseTestResult.status === 'pass') {
         passedPostResponseTests += 1;
       } else {
         anyFailed = true;
@@ -67,7 +67,7 @@ export const getRunnerSummary = (results: T_RunnerRequestExecutionResult[]): T_R
       }
     }
 
-    if (!anyFailed && status !== "error") {
+    if (!anyFailed && status !== 'error') {
       passedRequests += 1;
     } else if (anyFailed) {
       failedRequests += 1;
@@ -93,6 +93,6 @@ export const getRunnerSummary = (results: T_RunnerRequestExecutionResult[]): T_R
     failedPreRequestTests,
     totalPostResponseTests,
     passedPostResponseTests,
-    failedPostResponseTests,
+    failedPostResponseTests
   };
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-common/src/runner/types/index.ts b/packages/bruno-common/src/runner/types/index.ts
index 3565930f2..1b696ba12 100644
--- a/packages/bruno-common/src/runner/types/index.ts
+++ b/packages/bruno-common/src/runner/types/index.ts
@@ -5,7 +5,7 @@ type T_AssertionPassResult = {
   rhsOperand: string;
   operator: string;
   status: string;
-}
+};
 
 type T_AssertionFailResult = {
   lhsExpr: string;
@@ -14,7 +14,7 @@ type T_AssertionFailResult = {
   operator: string;
   status: string;
   error: string;
-}
+};
 
 type T_AssertionResult = T_AssertionPassResult | T_AssertionFailResult;
 
@@ -40,7 +40,7 @@ type T_EmptyRequest = {
   headers?: null | undefined;
   data?: null | undefined;
   isHtml?: boolean | undefined;
-}
+};
 
 // request types
 type T_Request = {
@@ -58,7 +58,7 @@ type T_EmptyResponse = {
   data?: null | undefined;
   responseTime?: number | undefined;
   isHtml?: boolean | undefined;
-}
+};
 
 type T_SkippedResponse = {
   status?: string | null | undefined;
@@ -67,7 +67,7 @@ type T_SkippedResponse = {
   data?: null | undefined;
   responseTime?: number | undefined;
   isHtml?: boolean | undefined;
-}
+};
 
 // response types
 type T_Response = {
@@ -92,14 +92,14 @@ export type T_RunnerRequestExecutionResult = {
   preRequestTestResults?: T_TestResult[];
   postResponseTestResults?: T_TestResult[];
   runDuration: number;
-}
+};
 
 export type T_RunnerResults = {
   iterationIndex: number;
   iterationData?: any; // todo - csv/json row data
   results: T_RunnerRequestExecutionResult[];
   summary: T_RunSummary;
-}
+};
 
 // run summary type
 export type T_RunSummary = {
@@ -120,4 +120,4 @@ export type T_RunSummary = {
   totalPostResponseTests: number;
   passedPostResponseTests: number;
   failedPostResponseTests: number;
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-common/src/runner/utils/index.ts b/packages/bruno-common/src/runner/utils/index.ts
index 76f1f774c..00fb2cbc5 100644
--- a/packages/bruno-common/src/runner/utils/index.ts
+++ b/packages/bruno-common/src/runner/utils/index.ts
@@ -2,13 +2,13 @@ export const encodeBase64 = (str: string) => {
   const bytes = new TextEncoder().encode(str);
   const binary = bytes.reduce((acc, byte) => acc + String.fromCharCode(byte), '');
   return btoa(binary);
-}
+};
 
 export const decodeBase64 = (base64: string) => {
   const binary = atob(base64);
-  const bytes = Uint8Array.from(binary, c => c.charCodeAt(0));
+  const bytes = Uint8Array.from(binary, (c) => c.charCodeAt(0));
   return new TextDecoder().decode(bytes);
-}
+};
 
 export const getContentType = (headers: Record<string, string | number | undefined>): string => {
   if (!headers || typeof headers !== 'object') {
@@ -20,12 +20,12 @@ export const getContentType = (headers: Record<string, string | number | undefin
 };
 
 export const isHtmlContentType = (contentType: string) => {
-  return contentType?.includes("html");
+  return contentType?.includes('html');
 };
 
 export const redactImageData = (data: string | object | number | boolean, contentType: string) => {
-  if (contentType?.includes("image")) {
-    return "Response content redacted (image data)";
+  if (contentType?.includes('image')) {
+    return 'Response content redacted (image data)';
   }
   return data;
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-common/src/utils/faker-functions.spec.ts b/packages/bruno-common/src/utils/faker-functions.spec.ts
index eb2e70793..18f4f3f27 100644
--- a/packages/bruno-common/src/utils/faker-functions.spec.ts
+++ b/packages/bruno-common/src/utils/faker-functions.spec.ts
@@ -1,6 +1,6 @@
-import { mockDataFunctions } from "./faker-functions";
+import { mockDataFunctions } from './faker-functions';
 
-describe("mockDataFunctions Regex Validation", () => {
+describe('mockDataFunctions Regex Validation', () => {
   beforeAll(() => {
     jest.useFakeTimers();
     jest.setSystemTime(new Date('2024-01-01T00:00:00.000Z'));
@@ -10,15 +10,15 @@ describe("mockDataFunctions Regex Validation", () => {
     jest.useRealTimers();
   });
 
-  test("timestamp and isoTimestamp should return mocked time values", () => {
-    const expectedTimestamp = '1704067200'; 
+  test('timestamp and isoTimestamp should return mocked time values', () => {
+    const expectedTimestamp = '1704067200';
     const expectedIsoTimestamp = '2024-01-01T00:00:00.000Z';
 
     expect(mockDataFunctions.timestamp()).toBe(expectedTimestamp);
     expect(mockDataFunctions.isoTimestamp()).toBe(expectedIsoTimestamp);
   });
 
-  test("all values should match their expected patterns", () => {
+  test('all values should match their expected patterns', () => {
     const patterns: Record<string, RegExp> = {
       guid: /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/,
       randomUUID: /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/,
@@ -137,7 +137,7 @@ describe("mockDataFunctions Regex Validation", () => {
       randomLoremParagraphs: /^[\s\S]+$/,
       randomLoremText: /^[\s\S]+$/,
       randomLoremSlug: /^[\s\S]+$/,
-      randomLoremLines: /^[\s\S]+$/,
+      randomLoremLines: /^[\s\S]+$/
     };
 
     const errors: string[] = [];
@@ -151,7 +151,7 @@ describe("mockDataFunctions Regex Validation", () => {
     });
 
     if (errors.length > 0) {
-      throw new Error(errors.join("\n"));
+      throw new Error(errors.join('\n'));
     }
   });
 });
diff --git a/packages/bruno-common/src/utils/index.ts b/packages/bruno-common/src/utils/index.ts
index 94e8cc2cd..62a418fe0 100644
--- a/packages/bruno-common/src/utils/index.ts
+++ b/packages/bruno-common/src/utils/index.ts
@@ -1,7 +1,7 @@
 export {
   encodeUrl,
   parseQueryParams,
-  buildQueryString,
+  buildQueryString
 } from './url';
 
 export {
@@ -11,3 +11,10 @@ export {
 export {
   patternHasher
 } from './template-hasher';
+
+export {
+  PROMPT_VARIABLE_TEXT_PATTERN,
+  PROMPT_VARIABLE_TEMPLATE_PATTERN,
+  extractPromptVariables,
+  extractPromptVariablesFromString
+} from './prompt-variables';
diff --git a/packages/bruno-common/src/utils/prompt-variables.spec.ts b/packages/bruno-common/src/utils/prompt-variables.spec.ts
new file mode 100644
index 000000000..cb821d4b7
--- /dev/null
+++ b/packages/bruno-common/src/utils/prompt-variables.spec.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it } from '@jest/globals';
+
+import { extractPromptVariables, extractPromptVariablesFromString } from './prompt-variables';
+
+describe('prompt variable utils', () => {
+  describe('extractPromptVariablesFromString', () => {
+    it('should extract prompt variables', () => {
+      expect(extractPromptVariablesFromString('Hello {{?world}}')).toEqual(['world']);
+      expect(extractPromptVariablesFromString('No prompts here')).toEqual([]);
+      expect(extractPromptVariablesFromString('Multiple {{?prompts}} in {{?one}} string')).toEqual(['prompts', 'one']);
+    });
+
+    it('should deduplicate prompt variables', () => {
+      // Strings
+      expect(extractPromptVariables('{{?world}} prompt here Hello {{?world}}')).toEqual(['world']);
+      expect(extractPromptVariables('Multiple {{?prompts}} in {{?one}} string plus another {{?one}}')).toEqual(['prompts', 'one']);
+    });
+  });
+
+  describe('extractPromptVariables', () => {
+    it('should extract prompt variables from strings', () => {
+      expect(extractPromptVariables('Hello {{?world}}')).toEqual(['world']);
+      expect(extractPromptVariables('No prompts here')).toEqual([]);
+      expect(extractPromptVariables('Multiple {{?prompts}} in {{?one}} string')).toEqual(['prompts', 'one']);
+    });
+
+    it('should extract prompt variables from objects', () => {
+      expect(extractPromptVariables({ text: 'Hello {{?world}}' })).toEqual(['world']);
+      expect(extractPromptVariables({ noPrompt: 'No prompt here' })).toEqual([]);
+      expect(extractPromptVariables({ prompt1: 'Hello {{?world}}', prompt2: 'Another {{?test}}' })).toEqual(['world', 'test']);
+    });
+
+    it('should extract prompt variables from arrays', () => {
+      // Strings
+      expect(extractPromptVariables(['No prompts here', 'Hello {{?world}}'])).toEqual(['world']);
+      expect(extractPromptVariables(['Multiple {{?prompts}} in {{?one}} string', 'Another {{?test}} string'])).toEqual(['prompts', 'one', 'test']);
+
+      // Objects
+      expect(extractPromptVariables([{ prompt: 'Hello {{?world}}', noprompt: 'No prompt here' }, { noprompt: '' }])).toEqual(['world']);
+
+      // Nested arrays
+      expect(extractPromptVariables(['Prompt {{?here}}', ['Hello {{?world}}', 'Another {{?test}} string']])).toEqual(['here', 'world', 'test']);
+
+      // Mixed data types
+      expect(extractPromptVariables([{ text: 'Multiple {{?prompts}} in {{?one}} string', noPrompt: 'No prompt here' }, ['Another {{?test}} string', { prompt: '{{?nested}}', no: 'prompt' }]])).toEqual(['prompts', 'one', 'test', 'nested']);
+    });
+
+    it('should not extract prompt variables from invalid template patterns', () => {
+      expect(extractPromptVariables('Prompt with valid {{?inner space}}')).toEqual(['inner space']);
+      expect(extractPromptVariables('Prompt with invalid {{? leading space}}')).toEqual([]);
+      expect(extractPromptVariables('Prompt with invalid {{?trailing space }}')).toEqual([]);
+      expect(extractPromptVariables('Prompt with invalid {{?{curly brace}}')).toEqual([]);
+      expect(extractPromptVariables('Prompt with invalid {{?}curly brace}}')).toEqual([]);
+      expect(extractPromptVariables('Prompt with invalid {{?{curly brace}}}')).toEqual([]);
+    });
+  });
+});
diff --git a/packages/bruno-common/src/utils/prompt-variables.ts b/packages/bruno-common/src/utils/prompt-variables.ts
new file mode 100644
index 000000000..7ef899bf7
--- /dev/null
+++ b/packages/bruno-common/src/utils/prompt-variables.ts
@@ -0,0 +1,78 @@
+/**
+ * Inner regex pattern for prompt variable names (without braces or `?` prefix)
+ *
+ * Pattern: /[^{}\s](?:[^{}]*[^{}\s])?/
+ *
+ * Breakdown:
+ * | Part           | Meaning                                                    |
+ * | -------------- | ---------------------------------------------------------- |
+ * | `[^\s{}]`      | First character: not whitespace, `{`, or `}`               |
+ * | `(?:...)?`     | Optional non-capturing group (allows single-char names)    |
+ * | `[^{}]*`       | Middle characters: any except `{` or `}` (spaces allowed)  |
+ * | `[^\s{}]`      | Last character: not whitespace, `{`, or `}`                |
+ *
+ * This inner pattern is reused in:
+ * - PROMPT_VARIABLE_TEXT_PATTERN: Matches "?Name" format (with anchors)
+ * - PROMPT_VARIABLE_PATTERN: Matches "{{?Name}}" format (in templates)
+ *
+ * Valid examples: "Name", "Prompt Var", "x"
+ * Invalid examples: " Name", "Name ", "{Name}", "Na{me}"
+ */
+const PROMPT_VARIABLE_PATTERN = /[^{}\s](?:[^{}]*[^{}\s])?/;
+
+/**
+ * Valid examples: "?Name", "?Prompt Var", "?x"
+ * Invalid examples: "? Name", "?Name ", "?{{Name}}", "?{Name}"
+ */
+export const PROMPT_VARIABLE_TEXT_PATTERN = new RegExp(`^\\?(${PROMPT_VARIABLE_PATTERN.source})$`);
+
+/**
+ * Valid matches: "{{?Name}}", "{{?Prompt Var}}", "{{?x}}"
+ * Invalid: "{{? Name}}", "{{?Name }}", "{{?{Name}}}"
+ */
+export const PROMPT_VARIABLE_TEMPLATE_PATTERN = new RegExp(`{{\\?(${PROMPT_VARIABLE_PATTERN.source})}}`, 'g');
+
+/**
+ * Extract prompt variables matching {{?<Prompt Text>}} from a string.
+ * @param {string} str - The input string.
+ * @returns {string[]} - An array of extracted prompt variables.
+ */
+export const extractPromptVariablesFromString = (str: string): string[] => {
+  const prompts = new Set<string>();
+  let match;
+  while ((match = PROMPT_VARIABLE_TEMPLATE_PATTERN.exec(str)) !== null) {
+    prompts.add(match[1]);
+  }
+  return Array.from(prompts);
+};
+
+/**
+ * Extract prompt variables from an object.
+ * @param {*} obj - The input object.
+ * @returns {string[]} - An array of extracted prompt variables.
+ */
+export function extractPromptVariables(obj: any): string[] {
+  const prompts = new Set<string>();
+  try {
+    if (typeof obj === 'string') {
+      // Extract prompt variables from strings
+      const extracted = extractPromptVariablesFromString(obj);
+      extracted.forEach((prompt) => prompts.add(prompt));
+    } else if (Array.isArray(obj)) {
+      // Recursively extract from array elements
+      for (const item of obj) {
+        const extracted = extractPromptVariables(item);
+        extracted.forEach((prompt) => prompts.add(prompt));
+      }
+    } else if (typeof obj === 'object' && obj !== null) {
+      // Recursively extract from object properties
+      for (const key in obj) {
+        const extracted = extractPromptVariables(obj[key]);
+        extracted.forEach((prompt) => prompts.add(prompt));
+      }
+    }
+  } catch (error) {
+    console.error('Error extracting prompt variables:', error);
+  }
+  return Array.from(prompts);
+}
diff --git a/packages/bruno-common/src/utils/url/index.spec.ts b/packages/bruno-common/src/utils/url/index.spec.ts
index e9815e306..19f934ab1 100644
--- a/packages/bruno-common/src/utils/url/index.spec.ts
+++ b/packages/bruno-common/src/utils/url/index.spec.ts
@@ -218,4 +218,4 @@ describe('buildQueryString', () => {
     const result = buildQueryString(params, { encode: false });
     expect(result).toBe('filter=status|active&sort=name|asc');
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-common/src/utils/url/index.ts b/packages/bruno-common/src/utils/url/index.ts
index 7b3debebb..18a34de3f 100644
--- a/packages/bruno-common/src/utils/url/index.ts
+++ b/packages/bruno-common/src/utils/url/index.ts
@@ -32,7 +32,7 @@ function parseQueryParams(query: string, { decode = false }: ExtractQueryParamsO
     const [queryString, ...hashParts] = query.split('#');
     const pairs = queryString.split('&');
 
-    const params = pairs.map(pair => {
+    const params = pairs.map((pair) => {
       const [name, ...valueParts] = pair.split('=');
 
       if (!name) {
@@ -83,4 +83,4 @@ export {
   type QueryParam,
   type BuildQueryStringOptions,
   type ExtractQueryParamsOptions
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-converters/babel.config.js b/packages/bruno-converters/babel.config.js
index c74fb53e2..619f8c1b1 100644
--- a/packages/bruno-converters/babel.config.js
+++ b/packages/bruno-converters/babel.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  presets: [['@babel/preset-env', { targets: { node: 'current' } }]],
+  presets: [['@babel/preset-env', { targets: { node: 'current' } }]]
 };
diff --git a/packages/bruno-converters/jest.config.js b/packages/bruno-converters/jest.config.js
index fa59852bc..26db256f0 100644
--- a/packages/bruno-converters/jest.config.js
+++ b/packages/bruno-converters/jest.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   transform: {
-    '^.+\\.js$': 'babel-jest',
+    '^.+\\.js$': 'babel-jest'
   },
   setupFiles: ['<rootDir>/jest.setup.js'],
   transformIgnorePatterns: [
diff --git a/packages/bruno-converters/jest.setup.js b/packages/bruno-converters/jest.setup.js
index a2246e495..f2500acc9 100644
--- a/packages/bruno-converters/jest.setup.js
+++ b/packages/bruno-converters/jest.setup.js
@@ -6,6 +6,6 @@ jest.mock('./src/common', () => {
   return {
     __esModule: true, // Use this property to indicate it's an ES module
     ...originalModule,
-    uuid: jest.fn(() => 'mockeduuidvalue123456'), // Mock uuid to return a fixed value
+    uuid: jest.fn(() => 'mockeduuidvalue123456') // Mock uuid to return a fixed value
   };
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/package.json b/packages/bruno-converters/package.json
index 77f8c45c1..4e780e56e 100644
--- a/packages/bruno-converters/package.json
+++ b/packages/bruno-converters/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@usebruno/schema": "^0.7.0",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "jscodeshift": "^17.3.0",
     "lodash": "^4.17.21",
     "nanoid": "3.3.8",
diff --git a/packages/bruno-converters/src/common/index.js b/packages/bruno-converters/src/common/index.js
index 8672ed548..223e90337 100644
--- a/packages/bruno-converters/src/common/index.js
+++ b/packages/bruno-converters/src/common/index.js
@@ -47,7 +47,7 @@ export const validateSchema = (collection = {}) => {
     collectionSchema.validateSync(collection);
     return collection;
   } catch (err) {
-    console.log("Error validating schema", err);
+    console.log('Error validating schema', err);
     throw new Error('The Collection has an invalid schema');
   }
 };
@@ -95,7 +95,6 @@ export const updateUidsInCollection = (_collection) => {
 export const transformItemsInCollection = (collection) => {
   const transformItems = (items = []) => {
     each(items, (item) => {
-
       if (['http', 'graphql'].includes(item.type)) {
         item.type = `${item.type}-request`;
 
@@ -209,4 +208,4 @@ export const deleteSecretsInEnvs = (envs) => {
       }
     });
   });
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-converters/src/constants/regex.js b/packages/bruno-converters/src/constants/regex.js
index 989dbc1c3..1771f90d3 100644
--- a/packages/bruno-converters/src/constants/regex.js
+++ b/packages/bruno-converters/src/constants/regex.js
@@ -1 +1 @@
-export const invalidVariableCharacterRegex = /[^\w-.]/g;
\ No newline at end of file
+export const invalidVariableCharacterRegex = /[^\w-.]/g;
diff --git a/packages/bruno-converters/src/index.js b/packages/bruno-converters/src/index.js
index 1bcd54cea..ba2215ea5 100644
--- a/packages/bruno-converters/src/index.js
+++ b/packages/bruno-converters/src/index.js
@@ -4,4 +4,4 @@ export { default as brunoToPostman } from './postman/bruno-to-postman.js';
 export { default as openApiToBruno } from './openapi/openapi-to-bruno.js';
 export { default as insomniaToBruno } from './insomnia/insomnia-to-bruno.js';
 export { default as wsdlToBruno } from './wsdl/wsdl-to-bruno.js';
-export { default as postmanTranslation } from './postman/postman-translations.js';
\ No newline at end of file
+export { default as postmanTranslation } from './postman/postman-translations.js';
diff --git a/packages/bruno-converters/src/insomnia/insomnia-to-bruno.js b/packages/bruno-converters/src/insomnia/insomnia-to-bruno.js
index cbf2e2930..5863d8d45 100644
--- a/packages/bruno-converters/src/insomnia/insomnia-to-bruno.js
+++ b/packages/bruno-converters/src/insomnia/insomnia-to-bruno.js
@@ -159,8 +159,8 @@ const transformInsomniaRequestItem = (request, index, allRequests) => {
   }
 
   const settings = {
-    encodeUrl: request.settings?.encodeUrl !== false && request.settingEncodeUrl !== false, // handles v4 and v5 import
-  }
+    encodeUrl: request.settings?.encodeUrl !== false && request.settingEncodeUrl !== false // handles v4 and v5 import
+  };
 
   brunoRequestItem.settings = settings;
 
@@ -259,13 +259,13 @@ const parseInsomniaCollection = (data) => {
 
     brunoCollection.name = insomniaCollection.name;
 
-    const requestsAndFolders =
-    insomniaResources.filter((resource) => resource._type === 'request' || resource._type === 'request_group') ||
-    [];
+    const requestsAndFolders
+      = insomniaResources.filter((resource) => resource._type === 'request' || resource._type === 'request_group')
+        || [];
 
     function createFolderStructure(resources, parentId = null) {
-      const requestGroups =
-        resources.filter((resource) => resource._type === 'request_group' && resource.parentId === parentId) || [];
+      const requestGroups
+        = resources.filter((resource) => resource._type === 'request_group' && resource.parentId === parentId) || [];
       const requests = resources.filter((resource) => resource._type === 'request' && resource.parentId === parentId);
 
       const folders = requestGroups.map((folder, index, allFolder) => {
@@ -274,12 +274,12 @@ const parseInsomniaCollection = (data) => {
           (resource) => resource._type === 'request' && resource.parentId === folder._id
         );
 
-    return {
+        return {
           uid: uuid(),
           name,
           type: 'folder',
           items: createFolderStructure(resources, folder._id).concat(
-            requests.filter(r => r.parentId === folder._id).map(transformInsomniaRequestItem)
+            requests.filter((r) => r.parentId === folder._id).map(transformInsomniaRequestItem)
           )
         };
       });
@@ -300,7 +300,7 @@ const parseInsomniaCollection = (data) => {
 
 export const insomniaToBruno = (insomniaCollection) => {
   try {
-    if(typeof insomniaCollection !== 'object') {
+    if (typeof insomniaCollection !== 'object') {
       insomniaCollection = jsyaml.load(insomniaCollection);
     }
     let collection;
@@ -309,7 +309,7 @@ export const insomniaToBruno = (insomniaCollection) => {
     } else {
       collection = parseInsomniaCollection(insomniaCollection);
     }
-    
+
     const transformedCollection = transformItemsInCollection(collection);
     const hydratedCollection = hydrateSeqInCollection(transformedCollection);
     const validatedCollection = validateSchema(hydratedCollection);
diff --git a/packages/bruno-converters/src/openapi/openapi-to-bruno.js b/packages/bruno-converters/src/openapi/openapi-to-bruno.js
index e1a36cbe1..68f05759d 100644
--- a/packages/bruno-converters/src/openapi/openapi-to-bruno.js
+++ b/packages/bruno-converters/src/openapi/openapi-to-bruno.js
@@ -3,6 +3,21 @@ import get from 'lodash/get';
 import jsyaml from 'js-yaml';
 import { validateSchema, transformItemsInCollection, hydrateSeqInCollection, uuid } from '../common';
 
+// Content type patterns for matching MIME type variants
+// These patterns handle structured types with many variants (e.g., application/ld+json, application/vnd.api+json)
+// MIME types can contain: letters, numbers, hyphens, dots, and plus signs
+const CONTENT_TYPE_PATTERNS = {
+  // Matches: application/json, application/ld+json, application/vnd.api+json, text/json, etc.
+  // Pattern: type/([base]+)?suffix where suffix is json
+  JSON: /^[\w\-.+]+\/([\w\-.+]+\+)?json$/,
+  // Matches: application/xml, text/xml, application/atom+xml, application/rss+xml, application/xhtml+xml, etc.
+  // Pattern: type/([base]+)?suffix where suffix is xml
+  XML: /^[\w\-.+]+\/([\w\-.+]+\+)?xml$/,
+  // Matches: text/html
+  // Pattern: type/([base]+)?suffix where suffix is html
+  HTML: /^[\w\-.+]+\/([\w\-.+]+\+)?html$/
+};
+
 const ensureUrl = (url) => {
   // removing multiple slashes after the protocol if it exists, or after the beginning of the string otherwise
   return url.replace(/([^:])\/{2,}/g, '$1/');
@@ -77,14 +92,28 @@ const getStatusText = (statusCode) => {
   return statusTexts[statusCode] || 'Unknown';
 };
 
+/**
+ * Determines the body type based on content-type from OpenAPI spec
+ * Uses pattern matching to handle various MIME type variants (e.g., application/ld+json, application/vnd.api+json)
+ * @param {string} contentType - The content-type from OpenAPI spec (object key, e.g., "application/json")
+ * @returns {string} - The body type (json, xml, html, text)
+ */
 const getBodyTypeFromContentType = (contentType) => {
-  if (contentType?.includes('application/json')) {
+  if (!contentType || typeof contentType !== 'string') {
+    return 'text';
+  }
+
+  // Normalize: lowercase (object keys may vary in case, but shouldn't have parameters or whitespace)
+  const normalizedContentType = contentType.toLowerCase();
+
+  if (CONTENT_TYPE_PATTERNS.JSON.test(normalizedContentType)) {
     return 'json';
-  } else if (contentType?.includes('application/xml') || contentType?.includes('text/xml')) {
+  } else if (CONTENT_TYPE_PATTERNS.XML.test(normalizedContentType)) {
     return 'xml';
-  } else if (contentType?.includes('text/html')) {
+  } else if (CONTENT_TYPE_PATTERNS.HTML.test(normalizedContentType)) {
     return 'html';
   }
+
   return 'text';
 };
 
@@ -118,6 +147,135 @@ const buildEmptyJsonBody = (bodySchema, visited = new Map()) => {
   return _jsonBody;
 };
 
+/**
+ * Extracts or generates an example value from an OpenAPI schema
+ * Handles objects, arrays, primitives, and explicit examples
+ * @param {Object} schema - The OpenAPI schema object
+ * @returns {*} - The example value (object, array, or primitive)
+ */
+const getExampleFromSchema = (schema) => {
+  // Check for explicit example first
+  if (schema.example !== undefined) {
+    return schema.example;
+  }
+
+  // Handle different schema types
+  if (schema.type === 'object' || (schema.properties && !schema.type)) {
+    // Handle object type or schema with properties (even if type is not explicitly set)
+    return buildEmptyJsonBody(schema);
+  } else if (schema.type === 'array') {
+    if (schema.items) {
+      // If items are objects (either by type or by having properties), create array with one example object
+      if (schema.items.type === 'object' || schema.items.properties) {
+        return [buildEmptyJsonBody(schema.items)];
+      }
+      // For primitive array items, return array with default value
+      if (schema.items.type === 'integer' || schema.items.type === 'number') {
+        return [0];
+      } else if (schema.items.type === 'boolean') {
+        return [false];
+      } else if (schema.items.type === 'string') {
+        return [''];
+      }
+    }
+    return [];
+  } else {
+    // For primitive types, use default values
+    if (schema.type === 'integer' || schema.type === 'number') {
+      return 0;
+    } else if (schema.type === 'boolean') {
+      return false;
+    }
+    return '';
+  }
+};
+
+/**
+ * Populates request body in Bruno example from a value
+ * Uses pattern matching to handle various MIME type variants
+ * @param {Object} params - Parameters object
+ * @param {Object} params.body - The Bruno request body object to populate
+ * @param {*} params.requestBodyValue - The request body value to set
+ * @param {string} params.contentType - Content type (e.g., 'application/json', 'application/ld+json')
+ */
+const populateRequestBody = ({ body, requestBodyValue, contentType }) => {
+  if (!requestBodyValue || !contentType || typeof contentType !== 'string') return;
+
+  // Normalize: lowercase (content types from OpenAPI spec object keys may vary in case)
+  const normalizedContentType = contentType.toLowerCase();
+
+  if (CONTENT_TYPE_PATTERNS.JSON.test(normalizedContentType)) {
+    body.mode = 'json';
+    body.json = typeof requestBodyValue === 'object' ? JSON.stringify(requestBodyValue, null, 2) : requestBodyValue;
+  } else if (normalizedContentType === 'application/x-www-form-urlencoded') {
+    body.mode = 'formUrlEncoded';
+    // Handle form data if needed
+  } else if (normalizedContentType === 'multipart/form-data') {
+    body.mode = 'multipartForm';
+    // Handle multipart form data if needed
+  } else if (normalizedContentType === 'text/plain') {
+    body.mode = 'text';
+    body.text = typeof requestBodyValue === 'object' ? JSON.stringify(requestBodyValue) : String(requestBodyValue);
+  } else if (CONTENT_TYPE_PATTERNS.XML.test(normalizedContentType)) {
+    body.mode = 'xml';
+    body.xml = typeof requestBodyValue === 'object' ? JSON.stringify(requestBodyValue) : String(requestBodyValue);
+  }
+};
+
+/**
+ * Creates a Bruno example from OpenAPI example data
+ * @param {Object} params - Parameters object
+ * @param {Object} params.brunoRequestItem - The base Bruno request item
+ * @param {*} params.exampleValue - The example value (object, array, or primitive)
+ * @param {string} params.exampleName - Name of the example
+ * @param {string} params.exampleDescription - Description of the example
+ * @param {string|number} params.statusCode - HTTP status code (for response examples)
+ * @param {string} params.contentType - Content type (e.g., 'application/json')
+ * @param {*} [params.requestBodyValue] - Optional request body value to populate in the example
+ * @param {string} [params.requestBodyContentType] - Optional request body content type
+ * @returns {Object} Bruno example object
+ */
+const createBrunoExample = ({ brunoRequestItem, exampleValue, exampleName, exampleDescription, statusCode, contentType, requestBodyValue = null, requestBodyContentType = null }) => {
+  const brunoExample = {
+    uid: uuid(),
+    itemUid: brunoRequestItem.uid,
+    name: exampleName,
+    description: exampleDescription,
+    type: 'http-request',
+    request: {
+      url: brunoRequestItem.request.url,
+      method: brunoRequestItem.request.method,
+      headers: [...brunoRequestItem.request.headers],
+      params: [...brunoRequestItem.request.params],
+      body: { ...brunoRequestItem.request.body }
+    },
+    response: {
+      status: String(statusCode),
+      statusText: getStatusText(statusCode),
+      headers: contentType ? [
+        {
+          uid: uuid(),
+          name: 'Content-Type',
+          value: contentType,
+          description: '',
+          enabled: true
+        }
+      ] : [],
+      body: {
+        type: getBodyTypeFromContentType(contentType),
+        content: typeof exampleValue === 'object' ? JSON.stringify(exampleValue, null, 2) : exampleValue
+      }
+    }
+  };
+
+  // Populate request body if provided
+  if (requestBodyValue !== null) {
+    populateRequestBody({ body: brunoExample.request.body, requestBodyValue, contentType: requestBodyContentType });
+  }
+
+  return brunoExample;
+};
+
 const transformOpenapiRequestItem = (request, usedNames = new Set()) => {
   let _operationObject = request.operationObject;
 
@@ -325,7 +483,11 @@ const transformOpenapiRequestItem = (request, usedNames = new Set()) => {
     let mimeType = Object.keys(content)[0];
     let body = content[mimeType] || {};
     let bodySchema = body.schema;
-    if (mimeType === 'application/json') {
+
+    // Normalize: lowercase (object keys may vary in case)
+    const normalizedMimeType = typeof mimeType === 'string' ? mimeType.toLowerCase() : '';
+
+    if (CONTENT_TYPE_PATTERNS.JSON.test(normalizedMimeType)) {
       brunoRequestItem.request.body.mode = 'json';
       if (bodySchema && bodySchema.type === 'object') {
         let _jsonBody = buildEmptyJsonBody(bodySchema);
@@ -334,7 +496,7 @@ const transformOpenapiRequestItem = (request, usedNames = new Set()) => {
       if (bodySchema && bodySchema.type === 'array') {
         brunoRequestItem.request.body.json = JSON.stringify([buildEmptyJsonBody(bodySchema.items)], null, 2);
       }
-    } else if (mimeType === 'application/x-www-form-urlencoded') {
+    } else if (normalizedMimeType === 'application/x-www-form-urlencoded') {
       brunoRequestItem.request.body.mode = 'formUrlEncoded';
       if (bodySchema && bodySchema.type === 'object') {
         each(bodySchema.properties || {}, (prop, name) => {
@@ -347,7 +509,7 @@ const transformOpenapiRequestItem = (request, usedNames = new Set()) => {
           });
         });
       }
-    } else if (mimeType === 'multipart/form-data') {
+    } else if (normalizedMimeType === 'multipart/form-data') {
       brunoRequestItem.request.body.mode = 'multipartForm';
       if (bodySchema && bodySchema.type === 'object') {
         each(bodySchema.properties || {}, (prop, name) => {
@@ -361,10 +523,10 @@ const transformOpenapiRequestItem = (request, usedNames = new Set()) => {
           });
         });
       }
-    } else if (mimeType === 'text/plain') {
+    } else if (normalizedMimeType === 'text/plain') {
       brunoRequestItem.request.body.mode = 'text';
       brunoRequestItem.request.body.text = '';
-    } else if (mimeType === 'text/xml') {
+    } else if (CONTENT_TYPE_PATTERNS.XML.test(normalizedMimeType)) {
       brunoRequestItem.request.body.mode = 'xml';
       brunoRequestItem.request.body.xml = '';
     }
@@ -391,56 +553,182 @@ const transformOpenapiRequestItem = (request, usedNames = new Set()) => {
   }
 
   // Handle OpenAPI examples from responses and request body
-  if (_operationObject.responses || _operationObject.requestBody) {
+  if (_operationObject.responses) {
     const examples = [];
 
+    // Extract request body examples if they exist
+    // Unified structure: all request body data is stored as examples with contentType
+    const requestBodyExamples = [];
+
+    /**
+     * Helper function to create examples with appropriate request body handling
+     * @param {Object} params - Parameters object
+     * @param {*} params.responseExampleValue - The response example value
+     * @param {string} params.exampleName - Name of the example
+     * @param {string} params.exampleDescription - Description of the example
+     * @param {string|number} params.statusCode - HTTP status code
+     * @param {string} params.responseContentType - Response content type
+     * @param {string} [params.responseExampleKey] - Optional response example key for matching
+     */
+    const createExamplesWithRequestBody = ({ responseExampleValue, exampleName, exampleDescription, statusCode, responseContentType, responseExampleKey = null }) => {
+      const requestBodyExamplesWithKeys = requestBodyExamples.filter((rb) => rb.key !== null);
+      const requestBodyExamplesWithoutKeys = requestBodyExamples.filter((rb) => rb.key === null);
+
+      // Check if there's a matching request body example by key
+      const matchingRequestBodyExample = responseExampleKey
+        ? requestBodyExamplesWithKeys.find((rb) => rb.key === responseExampleKey)
+        : null;
+
+      if (matchingRequestBodyExample) {
+        // Use the matching request body example
+        examples.push(createBrunoExample({
+          brunoRequestItem,
+          exampleValue: responseExampleValue,
+          exampleName,
+          exampleDescription,
+          statusCode,
+          contentType: responseContentType,
+          requestBodyValue: matchingRequestBodyExample.value,
+          requestBodyContentType: matchingRequestBodyExample.contentType
+        }));
+      } else if (requestBodyExamplesWithKeys.length > 0) {
+        // No match found, create all combinations with request body examples that have keys
+        requestBodyExamplesWithKeys.forEach((rbExample) => {
+          const combinedExampleName = `${exampleName} (${rbExample.summary || rbExample.key})`;
+          const combinedExampleDescription = exampleDescription || rbExample.description || '';
+          examples.push(createBrunoExample({
+            brunoRequestItem,
+            exampleValue: responseExampleValue,
+            exampleName: combinedExampleName,
+            exampleDescription: combinedExampleDescription,
+            statusCode,
+            contentType: responseContentType,
+            requestBodyValue: rbExample.value,
+            requestBodyContentType: rbExample.contentType
+          }));
+        });
+      } else if (requestBodyExamplesWithoutKeys.length > 0) {
+        // Single example or schema - use the first one for all response examples
+        const rbExample = requestBodyExamplesWithoutKeys[0];
+        examples.push(createBrunoExample({
+          brunoRequestItem,
+          exampleValue: responseExampleValue,
+          exampleName,
+          exampleDescription,
+          statusCode,
+          contentType: responseContentType,
+          requestBodyValue: rbExample.value,
+          requestBodyContentType: rbExample.contentType
+        }));
+      } else {
+        // No request body, create example without request body
+        examples.push(createBrunoExample({
+          brunoRequestItem,
+          exampleValue: responseExampleValue,
+          exampleName,
+          exampleDescription,
+          statusCode,
+          contentType: responseContentType
+        }));
+      }
+    };
+
+    if (_operationObject.requestBody && _operationObject.requestBody.content) {
+      Object.entries(_operationObject.requestBody.content).forEach(([contentType, content]) => {
+        if (content.examples) {
+          // Multiple request body examples
+          Object.entries(content.examples).forEach(([exampleKey, example]) => {
+            requestBodyExamples.push({
+              key: exampleKey,
+              value: example.value !== undefined ? example.value : example,
+              summary: example.summary,
+              description: example.description,
+              contentType: contentType
+            });
+          });
+        } else if (content.example !== undefined) {
+          // Single request body example - convert to unified structure
+          requestBodyExamples.push({
+            key: null, // No key for single example
+            value: content.example,
+            summary: null,
+            description: null,
+            contentType: contentType
+          });
+        } else if (content.schema) {
+          // Schema-based request body - convert to unified structure
+          requestBodyExamples.push({
+            key: null, // No key for schema
+            value: getExampleFromSchema(content.schema),
+            summary: null,
+            description: null,
+            contentType: contentType,
+            isSchema: true
+          });
+        }
+      });
+    }
+
     // Handle response examples
     if (_operationObject.responses) {
       Object.entries(_operationObject.responses).forEach(([statusCode, response]) => {
         if (response.content) {
           Object.entries(response.content).forEach(([contentType, content]) => {
+            // Handle examples (plural) - multiple named examples
             if (content.examples) {
               Object.entries(content.examples).forEach(([exampleKey, example]) => {
                 const exampleName = example.summary || exampleKey || `${statusCode} Response`;
                 const exampleDescription = example.description || '';
+                const exampleValue = example.value !== undefined ? example.value : example;
 
-                // Create Bruno example
-                const brunoExample = {
-                  uid: uuid(),
-                  itemUid: brunoRequestItem.uid,
-                  name: exampleName,
-                  description: exampleDescription,
-                  type: 'http-request',
-                  request: {
-                    url: brunoRequestItem.request.url,
-                    method: brunoRequestItem.request.method,
-                    headers: [...brunoRequestItem.request.headers],
-                    params: [...brunoRequestItem.request.params],
-                    body: { ...brunoRequestItem.request.body }
-                  },
-                  response: {
-                    status: String(statusCode),
-                    statusText: getStatusText(statusCode),
-                    headers: [
-                      {
-                        uid: uuid(),
-                        name: 'Content-Type',
-                        value: contentType,
-                        description: '',
-                        enabled: true
-                      }
-                    ],
-                    body: {
-                      type: getBodyTypeFromContentType(contentType),
-                      content: typeof example.value === 'object' ? JSON.stringify(example.value, null, 2) : example.value
-                    }
-                  }
-                };
+                createExamplesWithRequestBody({
+                  responseExampleValue: exampleValue,
+                  exampleName,
+                  exampleDescription,
+                  statusCode,
+                  responseContentType: contentType,
+                  responseExampleKey: exampleKey
+                });
+              });
+            } else if (content.example !== undefined) {
+              // Handle example (singular) at content level
+              const exampleName = `${statusCode} Response`;
+              const exampleDescription = response.description || '';
 
-                examples.push(brunoExample);
+              createExamplesWithRequestBody({
+                responseExampleValue: content.example,
+                exampleName,
+                exampleDescription,
+                statusCode,
+                responseContentType: contentType
+              });
+            } else if (content.schema) {
+              // Handle schema - extract or generate example from schema
+              const exampleValue = getExampleFromSchema(content.schema);
+              const exampleName = `${statusCode} Response`;
+              const exampleDescription = response.description || '';
+
+              createExamplesWithRequestBody({
+                responseExampleValue: exampleValue,
+                exampleName,
+                exampleDescription,
+                statusCode,
+                responseContentType: contentType
               });
             }
           });
+        } else {
+          // Handle responses without content (e.g., 204 No Content)
+          const exampleName = `${statusCode} Response`;
+          const exampleDescription = response.description || '';
+
+          createExamplesWithRequestBody({
+            responseExampleValue: '',
+            exampleName,
+            exampleDescription,
+            statusCode,
+            responseContentType: null
+          });
         }
       });
     }
@@ -464,7 +752,7 @@ const resolveRefs = (spec, components = spec?.components, cache = new Map()) =>
   }
 
   if (Array.isArray(spec)) {
-    return spec.map(item => resolveRefs(item, components, cache));
+    return spec.map((item) => resolveRefs(item, components, cache));
   }
 
   if ('$ref' in spec) {
@@ -678,71 +966,71 @@ export const parseOpenApiCollection = (data, options = {}) => {
     items: [],
     environments: []
   };
-    try {
-      const collectionData = resolveRefs(data);
-      if (!collectionData) {
-        throw new Error('Invalid OpenAPI collection. Failed to resolve refs.');
-        return;
-      }
+  try {
+    const collectionData = resolveRefs(data);
+    if (!collectionData) {
+      throw new Error('Invalid OpenAPI collection. Failed to resolve refs.');
+      return;
+    }
 
-      // Currently parsing of openapi spec is "do your best", that is
-      // allows "invalid" openapi spec
+    // Currently parsing of openapi spec is "do your best", that is
+    // allows "invalid" openapi spec
 
-      // Assumes v3 if not defined. v2 is not supported yet
-      if (collectionData.openapi && !collectionData.openapi.startsWith('3')) {
-        throw new Error('Only OpenAPI v3 is supported currently.');
-        return;
-      }
+    // Assumes v3 if not defined. v2 is not supported yet
+    if (collectionData.openapi && !collectionData.openapi.startsWith('3')) {
+      throw new Error('Only OpenAPI v3 is supported currently.');
+      return;
+    }
 
-      brunoCollection.name = collectionData.info?.title?.trim() || 'Untitled Collection';
+    brunoCollection.name = collectionData.info?.title?.trim() || 'Untitled Collection';
 
-      let servers = collectionData.servers || [];
+    let servers = collectionData.servers || [];
 
-      // Create environments based on the servers
-      servers.forEach((server, index) => {
-        let baseUrl = getDefaultUrl(server);
-        let environmentName = server.description ? server.description : `Environment ${index + 1}`;
+    // Create environments based on the servers
+    servers.forEach((server, index) => {
+      let baseUrl = getDefaultUrl(server);
+      let environmentName = server.description ? server.description : `Environment ${index + 1}`;
 
-        brunoCollection.environments.push({
-          uid: uuid(),
-          name: environmentName,
-          variables: [
-            {
-              uid: uuid(),
-              name: 'baseUrl',
-              value: baseUrl,
-              type: 'text',
-              enabled: true,
-              secret: false
-            },
-          ]
-        });
+      brunoCollection.environments.push({
+        uid: uuid(),
+        name: environmentName,
+        variables: [
+          {
+            uid: uuid(),
+            name: 'baseUrl',
+            value: baseUrl,
+            type: 'text',
+            enabled: true,
+            secret: false
+          }
+        ]
       });
+    });
 
-      let securityConfig = getSecurity(collectionData);
+    let securityConfig = getSecurity(collectionData);
 
-      let allRequests = Object.entries(collectionData.paths)
-        .map(([path, methods]) => {
-          return Object.entries(methods)
-            .filter(([method, op]) => {
-              return ['get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'].includes(
-                method.toLowerCase()
-              );
-            })
-            .map(([method, operationObject]) => {
-              return {
-                method: method,
-                path: path.replace(/{([^}]+)}/g, ':$1'), // Replace placeholders enclosed in curly braces with colons
+    let allRequests = Object.entries(collectionData.paths)
+      .map(([path, methods]) => {
+        return Object.entries(methods)
+          .filter(([method, op]) => {
+            return ['get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'].includes(
+              method.toLowerCase()
+            );
+          })
+          .map(([method, operationObject]) => {
+            return {
+              method: method,
+              path: path.replace(/{([^}]+)}/g, ':$1'), // Replace placeholders enclosed in curly braces with colons
               originalPath: path, // Keep original path for grouping
-                operationObject: operationObject,
-                global: {
+              operationObject: operationObject,
+              global: {
                 server: '{{baseUrl}}',
-                  security: securityConfig
-                }
-              };
-            });
-        })
-        .reduce((acc, val) => acc.concat(val), []); // flatten
+                security: securityConfig
+              }
+            };
+          });
+      })
+      .reduce((acc, val) => acc.concat(val), []); // flatten
 
     // Support both tag-based and path-based grouping
     const groupingType = options.groupBy || 'tags';
@@ -781,114 +1069,114 @@ export const parseOpenApiCollection = (data, options = {}) => {
       brunoCollection.items = brunoCollectionItems;
     }
 
-      // Determine collection-level authentication based on global security requirements
-      const buildCollectionAuth = (scheme) => {
-        const authTemplate = {
-          mode: 'none',
-          basic: null,
-          bearer: null,
-          digest: null,
-          apikey: null,
-          oauth2: null,
-        };
+    // Determine collection-level authentication based on global security requirements
+    const buildCollectionAuth = (scheme) => {
+      const authTemplate = {
+        mode: 'none',
+        basic: null,
+        bearer: null,
+        digest: null,
+        apikey: null,
+        oauth2: null
+      };
 
-        if (!scheme) return authTemplate;
+      if (!scheme) return authTemplate;
 
-        if (scheme.type === 'http' && scheme.scheme === 'basic') {
-          return {
-            ...authTemplate,
-            mode: 'basic',
-            basic: {
-              username: '{{username}}',
-              password: '{{password}}'
-            }
-          };
-        } else if (scheme.type === 'http' && scheme.scheme === 'bearer') {
-          return {
-            ...authTemplate,
-            mode: 'bearer',
-            bearer: {
-              token: '{{token}}'
-            }
-          };
-        } else if (scheme.type === 'http' && scheme.scheme === 'digest') {
-          return {
-            ...authTemplate,
-            mode: 'digest',
-            digest: {
-              username: '{{username}}',
-              password: '{{password}}'
-            }
-          };
-        } else if (scheme.type === 'apiKey') {
-          return {
-            ...authTemplate,
-            mode: 'apikey',
-            apikey: {
-              key: scheme.name,
-              value: '{{apiKey}}',
-              placement: scheme.in === 'query' ? 'queryparams' : 'header'
-            }
-          };
-        } else if (scheme.type === 'oauth2') {
-          let flows = scheme.flows || {};
-          let grantType = 'client_credentials';
-          if (flows.authorizationCode) {
-            grantType = 'authorization_code';
-          } else if (flows.implicit) {
-            grantType = 'implicit';
-          } else if (flows.password) {
-            grantType = 'password';
+      if (scheme.type === 'http' && scheme.scheme === 'basic') {
+        return {
+          ...authTemplate,
+          mode: 'basic',
+          basic: {
+            username: '{{username}}',
+            password: '{{password}}'
           }
-          const flowConfig = grantType === 'authorization_code' ? flows.authorizationCode || {} : grantType === 'implicit' ? flows.implicit || {} : grantType === 'password' ? flows.password || {} : flows.clientCredentials || {};
-
-          return {
-            ...authTemplate,
-            mode: 'oauth2',
-            oauth2: {
-              grantType,
-              authorizationUrl: flowConfig.authorizationUrl || '{{oauth_authorize_url}}',
-              accessTokenUrl: flowConfig.tokenUrl || '{{oauth_token_url}}',
-              refreshTokenUrl: flowConfig.refreshUrl || '{{oauth_refresh_url}}',
-              callbackUrl: '{{oauth_callback_url}}',
-              clientId: '{{oauth_client_id}}',
-              clientSecret: '{{oauth_client_secret}}',
-              scope: Array.isArray(flowConfig.scopes) ? flowConfig.scopes.join(' ') : Object.keys(flowConfig.scopes || {}).join(' '),
-              state: '{{oauth_state}}',
-              credentialsPlacement: 'header',
-              tokenPlacement: 'header',
-              tokenHeaderPrefix: 'Bearer',
-              autoFetchToken: false,
-              autoRefreshToken: true
-            }
-          };
+        };
+      } else if (scheme.type === 'http' && scheme.scheme === 'bearer') {
+        return {
+          ...authTemplate,
+          mode: 'bearer',
+          bearer: {
+            token: '{{token}}'
+          }
+        };
+      } else if (scheme.type === 'http' && scheme.scheme === 'digest') {
+        return {
+          ...authTemplate,
+          mode: 'digest',
+          digest: {
+            username: '{{username}}',
+            password: '{{password}}'
+          }
+        };
+      } else if (scheme.type === 'apiKey') {
+        return {
+          ...authTemplate,
+          mode: 'apikey',
+          apikey: {
+            key: scheme.name,
+            value: '{{apiKey}}',
+            placement: scheme.in === 'query' ? 'queryparams' : 'header'
+          }
+        };
+      } else if (scheme.type === 'oauth2') {
+        let flows = scheme.flows || {};
+        let grantType = 'client_credentials';
+        if (flows.authorizationCode) {
+          grantType = 'authorization_code';
+        } else if (flows.implicit) {
+          grantType = 'implicit';
+        } else if (flows.password) {
+          grantType = 'password';
         }
-        return authTemplate;
-      };
+        const flowConfig = grantType === 'authorization_code' ? flows.authorizationCode || {} : grantType === 'implicit' ? flows.implicit || {} : grantType === 'password' ? flows.password || {} : flows.clientCredentials || {};
 
-      let collectionAuth = buildCollectionAuth(securityConfig.supported[0]);
-
-      brunoCollection.root = {
-        request: {
-          auth: collectionAuth,
-        },
-        meta: {
-          name: brunoCollection.name
-        }
-      };
-
-      return brunoCollection;
-    } catch (err) {
-      if (!(err instanceof Error)) {
-        throw new Error('Unknown error');
+        return {
+          ...authTemplate,
+          mode: 'oauth2',
+          oauth2: {
+            grantType,
+            authorizationUrl: flowConfig.authorizationUrl || '{{oauth_authorize_url}}',
+            accessTokenUrl: flowConfig.tokenUrl || '{{oauth_token_url}}',
+            refreshTokenUrl: flowConfig.refreshUrl || '{{oauth_refresh_url}}',
+            callbackUrl: '{{oauth_callback_url}}',
+            clientId: '{{oauth_client_id}}',
+            clientSecret: '{{oauth_client_secret}}',
+            scope: Array.isArray(flowConfig.scopes) ? flowConfig.scopes.join(' ') : Object.keys(flowConfig.scopes || {}).join(' '),
+            state: '{{oauth_state}}',
+            credentialsPlacement: 'header',
+            tokenPlacement: 'header',
+            tokenHeaderPrefix: 'Bearer',
+            autoFetchToken: false,
+            autoRefreshToken: true
+          }
+        };
       }
-      throw err;
+      return authTemplate;
+    };
+
+    let collectionAuth = buildCollectionAuth(securityConfig.supported[0]);
+
+    brunoCollection.root = {
+      request: {
+        auth: collectionAuth
+      },
+      meta: {
+        name: brunoCollection.name
+      }
+    };
+
+    return brunoCollection;
+  } catch (err) {
+    if (!(err instanceof Error)) {
+      throw new Error('Unknown error');
     }
+    throw err;
+  }
 };
 
 export const openApiToBruno = (openApiSpecification, options = {}) => {
   try {
-    if(typeof openApiSpecification !== 'object') {
+    if (typeof openApiSpecification !== 'object') {
       openApiSpecification = jsyaml.load(openApiSpecification);
     }
 
@@ -896,7 +1184,7 @@ export const openApiToBruno = (openApiSpecification, options = {}) => {
     const transformedCollection = transformItemsInCollection(collection);
     const hydratedCollection = hydrateSeqInCollection(transformedCollection);
     const validatedCollection = validateSchema(hydratedCollection);
-    return validatedCollection
+    return validatedCollection;
   } catch (err) {
     console.error('Error converting OpenAPI to Bruno:', err);
     if (!(err instanceof Error)) {
diff --git a/packages/bruno-converters/src/postman/bruno-to-postman.js b/packages/bruno-converters/src/postman/bruno-to-postman.js
index f9bd0f5c6..8b81ca271 100644
--- a/packages/bruno-converters/src/postman/bruno-to-postman.js
+++ b/packages/bruno-converters/src/postman/bruno-to-postman.js
@@ -1,5 +1,5 @@
 import map from 'lodash/map';
-import { deleteSecretsInEnvs, deleteUidsInEnvs, deleteUidsInItems } from '../common';
+import { deleteSecretsInEnvs, deleteUidsInEnvs, deleteUidsInItems, isItemARequest } from '../common';
 
 /**
  * Transforms a given URL string into an object representing the protocol, host, path, query, and variables.
@@ -10,8 +10,8 @@ import { deleteSecretsInEnvs, deleteUidsInEnvs, deleteUidsInItems } from '../com
  */
 export const transformUrl = (url, params) => {
   if (typeof url !== 'string' || !url.trim()) {
-    url = "";
-    console.error("Invalid URL input:", url);
+    url = '';
+    console.error('Invalid URL input:', url);
   }
 
   const urlRegexPatterns = {
@@ -118,7 +118,7 @@ export const brunoToPostman = (collection) => {
 
   const generateCollectionVars = (collection) => {
     const pattern = /{{[^{}]+}}/g;
-    let listOfVars = [];
+    let collectionVars = [];
 
     const findOccurrences = (obj, results) => {
       if (typeof obj === 'object') {
@@ -131,20 +131,41 @@ export const brunoToPostman = (collection) => {
         }
       } else if (typeof obj === 'string') {
         obj.replace(pattern, (match) => {
-          results.push(match.replace(/{{|}}/g, ''));
+          const varKey = match.replace(/{{|}}/g, '');
+          results.push({
+            key: varKey,
+            value: '',
+            type: 'default'
+          });
         });
       }
     };
 
-    findOccurrences(collection, listOfVars);
+    findOccurrences(collection, collectionVars);
 
-    const finalArrayOfVars = [...new Set(listOfVars)];
-
-    return finalArrayOfVars.map((variable) => ({
-      key: variable,
-      value: '',
+    // Add request and response vars
+    let reqVars = (collection.root?.request?.vars?.req || []).map((v) => ({
+      key: v.name,
+      value: v.value,
       type: 'default'
     }));
+
+    let resVars = (collection.root?.request?.vars?.res || []).map((v) => ({
+      key: v.name,
+      value: v.value,
+      type: 'default'
+    }));
+
+    // Merge and deduplicate final result
+    const allVars = [...reqVars, ...resVars, ...collectionVars];
+    const finalVarsMap = new Map();
+    allVars.forEach((v) => {
+      if (!finalVarsMap.has(v.key)) {
+        finalVarsMap.set(v.key, v);
+      }
+    });
+
+    return Array.from(finalVarsMap.values());
   };
   const generateEventSection = (item) => {
     const eventArray = [];
@@ -178,15 +199,18 @@ export const brunoToPostman = (collection) => {
         exec.push(...testsBlock.split('\n'));
       }
 
-      eventArray.push({
-        listen: 'test',
-        script: {
-          type: 'text/javascript',
-          packages: {},
-          requests: {},
-          exec: exec
-        }
-      });
+      // Only push the event if exec has content
+      if (exec.length > 0) {
+        eventArray.push({
+          listen: 'test',
+          script: {
+            type: 'text/javascript',
+            packages: {},
+            requests: {},
+            exec: exec
+          }
+        });
+      }
     }
     return eventArray;
   };
@@ -464,7 +488,7 @@ export const brunoToPostman = (collection) => {
           item: generateItemSection(item.items),
           ...(folderEvents.length ? { event: folderEvents } : {})
         };
-      } else {
+      } else if (isItemARequest(item)) {
         const requestEvents = generateEventSection(item.request);
         const postmanItem = {
           name: item.name || 'Untitled Request',
@@ -479,7 +503,8 @@ export const brunoToPostman = (collection) => {
 
         return postmanItem;
       }
-    });
+      return null;
+    }).filter(Boolean);
   };
   const collectionToExport = {};
   collectionToExport.info = generateInfoSection();
diff --git a/packages/bruno-converters/src/postman/postman-env-to-bruno-env.js b/packages/bruno-converters/src/postman/postman-env-to-bruno-env.js
index 1b0a4bf36..a57108349 100644
--- a/packages/bruno-converters/src/postman/postman-env-to-bruno-env.js
+++ b/packages/bruno-converters/src/postman/postman-env-to-bruno-env.js
@@ -1,5 +1,5 @@
 import each from 'lodash/each';
-import { invalidVariableCharacterRegex } from '../constants';  
+import { invalidVariableCharacterRegex } from '../constants';
 import { uuid } from '../common';
 
 const isSecret = (type) => {
@@ -9,7 +9,7 @@ const isSecret = (type) => {
 const importPostmanEnvironmentVariables = (brunoEnvironment, values = []) => {
   brunoEnvironment.variables = brunoEnvironment.variables || [];
 
-  each(values.filter(i => !(i.key == null && i.value == null)), (i) => {
+  each(values.filter((i) => !(i.key == null && i.value == null)), (i) => {
     const brunoEnvironmentVariable = {
       uid: uuid(),
       name: (i.key ?? '').replace(invalidVariableCharacterRegex, '_'),
diff --git a/packages/bruno-converters/src/postman/postman-to-bruno.js b/packages/bruno-converters/src/postman/postman-to-bruno.js
index 1a6bc18db..b3d6238c6 100644
--- a/packages/bruno-converters/src/postman/postman-to-bruno.js
+++ b/packages/bruno-converters/src/postman/postman-to-bruno.js
@@ -86,8 +86,8 @@ const constructUrlFromParts = (url) => {
   const hostStr = Array.isArray(host) ? host.filter(Boolean).join('.') : host || '';
   const pathStr = Array.isArray(path) ? path.filter(Boolean).join('/') : path || '';
   const portStr = port ? `:${port}` : '';
-  const queryStr =
-    query && Array.isArray(query) && query.length > 0
+  const queryStr
+    = query && Array.isArray(query) && query.length > 0
       ? `?${query
         .filter((q) => q && q.key)
         .map((q) => `${q.key}=${q.value || ''}`)
@@ -131,7 +131,7 @@ const importScriptsFromEvents = (events, requestObject) => {
         }
 
         if (event.script.exec && event.script.exec.length > 0) {
-          requestObject.script.req = postmanTranslation(event.script.exec)
+          requestObject.script.req = postmanTranslation(event.script.exec);
         } else {
           requestObject.script.req = '';
           console.warn('Unexpected event.script.exec type', typeof event.script.exec);
@@ -144,7 +144,7 @@ const importScriptsFromEvents = (events, requestObject) => {
         }
 
         if (event.script.exec && event.script.exec.length > 0) {
-          requestObject.script.res = postmanTranslation(event.script.exec)
+          requestObject.script.res = postmanTranslation(event.script.exec);
         } else {
           requestObject.script.res = '';
           console.warn('Unexpected event.script.exec type', typeof event.script.exec);
@@ -155,7 +155,7 @@ const importScriptsFromEvents = (events, requestObject) => {
 };
 
 const importCollectionLevelVariables = (variables, requestObject) => {
-  const vars = variables.filter(v => !(v.key == null && v.value == null)).map((v) => ({
+  const vars = variables.filter((v) => !(v.key == null && v.value == null)).map((v) => ({
     uid: uuid(),
     name: (v.key ?? '').replace(invalidVariableCharacterRegex, '_'),
     value: v.value ?? '',
@@ -216,7 +216,7 @@ export const processAuth = (auth, requestObject, isCollection = false) => {
       requestObject.auth.apikey = {
         key: authValues.key || '',
         value: authValues.value?.toString() || '', // Convert the value to a string as Postman's schema does not rigidly define the type of it,
-        placement: 'header' //By default we are placing the apikey values in headers!
+        placement: 'header' // By default we are placing the apikey values in headers!
       };
       break;
     case AUTH_TYPES.DIGEST:
@@ -266,14 +266,14 @@ export const processAuth = (auth, requestObject, isCollection = false) => {
             ...baseOAuth2Config,
             authorizationUrl: findValueUsingKey('authUrl'),
             callbackUrl: findValueUsingKey('redirect_uri'),
-            pkce: true, // Explicitly set pkce to true for this grant type
+            pkce: true // Explicitly set pkce to true for this grant type
           };
           break;
         case 'password_credentials':
           requestObject.auth.oauth2 = {
             ...baseOAuth2Config,
             username: findValueUsingKey('username'),
-            password: findValueUsingKey('password'),
+            password: findValueUsingKey('password')
           };
           break;
         case 'client_credentials':
@@ -358,9 +358,8 @@ const importPostmanV2CollectionItem = (brunoParent, item, { useWorkers = false }
       }
 
       folderMap[folderName] = brunoFolderItem;
-
     } else if (i.request) {
-      const method =  i?.request?.method?.toUpperCase();
+      const method = i?.request?.method?.toUpperCase();
       if (!method || typeof method !== 'string' || !method.trim()) {
         console.warn('Missing or invalid request.method', method);
         return;
@@ -410,7 +409,7 @@ const importPostmanV2CollectionItem = (brunoParent, item, { useWorkers = false }
 
       const settings = {
         encodeUrl: i.protocolProfileBehavior?.disableUrlEncoding !== true
-      }
+      };
 
       // Handle followRedirects setting
       if (i.protocolProfileBehavior?.followRedirects !== undefined) {
@@ -439,7 +438,7 @@ const importPostmanV2CollectionItem = (brunoParent, item, { useWorkers = false }
                 brunoRequestItem.request.script = {};
               }
               if (event.script.exec && event.script.exec.length > 0) {
-                brunoRequestItem.request.script.req = postmanTranslation(event.script.exec)
+                brunoRequestItem.request.script.req = postmanTranslation(event.script.exec);
               } else {
                 brunoRequestItem.request.script.req = '';
                 console.warn('Unexpected event.script.exec type', typeof event.script.exec);
@@ -450,13 +449,12 @@ const importPostmanV2CollectionItem = (brunoParent, item, { useWorkers = false }
                 brunoRequestItem.request.script = {};
               }
               if (event.script.exec && event.script.exec.length > 0) {
-                brunoRequestItem.request.script.res = postmanTranslation(event.script.exec)
+                brunoRequestItem.request.script.res = postmanTranslation(event.script.exec);
               } else {
                 brunoRequestItem.request.script.res = '';
                 console.warn('Unexpected event.script.exec type', typeof event.script.exec);
               }
             }
-
           });
         }
       }
@@ -734,7 +732,6 @@ const importPostmanV2CollectionItem = (brunoParent, item, { useWorkers = false }
   });
 };
 
-
 const searchLanguageByHeader = (headers) => {
   let contentType;
   each(headers, (header) => {
@@ -751,6 +748,11 @@ const searchLanguageByHeader = (headers) => {
 };
 
 const getBodyTypeFromContentTypeHeader = (headers) => {
+  // Check if headers is null, undefined, or not an array
+  if (!headers || !Array.isArray(headers)) {
+    return 'text';
+  }
+
   const contentTypeHeader = headers.find((header) => header.key.toLowerCase() === 'content-type');
   if (contentTypeHeader) {
     const contentType = contentTypeHeader.value?.toLowerCase();
@@ -819,7 +821,7 @@ const importPostmanV2Collection = async (collection, { useWorkers = false }) =>
 
       // Apply translated scripts to all items in the collection
       const applyScriptsToItems = (items) => {
-        items.forEach(item => {
+        items.forEach((item) => {
           if (item.type === 'folder') {
             // Apply scripts to the folder
             if (translatedScripts.has(item.uid)) {
@@ -861,7 +863,6 @@ const importPostmanV2Collection = async (collection, { useWorkers = false }) =>
       };
 
       applyScriptsToItems(brunoCollection.items);
-
     } catch (error) {
       console.error('Error in script translation worker:', error);
     } finally {
@@ -872,7 +873,6 @@ const importPostmanV2Collection = async (collection, { useWorkers = false }) =>
   return brunoCollection;
 };
 
-
 const parsePostmanCollection = async (collection, { useWorkers = false }) => {
   try {
     let schema = get(collection, 'info.schema');
@@ -901,7 +901,6 @@ const parsePostmanCollection = async (collection, { useWorkers = false }) => {
 
 const postmanToBruno = async (postmanCollection, { useWorkers = false } = {}) => {
   try {
-
     const parsedPostmanCollection = await parsePostmanCollection(postmanCollection, { useWorkers });
     const transformedCollection = transformItemsInCollection(parsedPostmanCollection);
     const hydratedCollection = hydrateSeqInCollection(transformedCollection);
@@ -913,4 +912,4 @@ const postmanToBruno = async (postmanCollection, { useWorkers = false } = {}) =>
   }
 };
 
-export default postmanToBruno;
\ No newline at end of file
+export default postmanToBruno;
diff --git a/packages/bruno-converters/src/postman/postman-translations.js b/packages/bruno-converters/src/postman/postman-translations.js
index 43c034db9..1c58b433b 100644
--- a/packages/bruno-converters/src/postman/postman-translations.js
+++ b/packages/bruno-converters/src/postman/postman-translations.js
@@ -34,12 +34,24 @@ const replacements = {
   'pm\\.environment\\.name': 'bru.getEnvName()',
   'pm\\.response\\.status': 'res.statusText',
   'pm\\.response\\.headers': 'res.getHeaders()',
-  "tests\\['([^']+)'\\]\\s*=\\s*([^;]+);": 'test("$1", function() { expect(Boolean($2)).to.be.true; });',
+  'tests\\[\'([^\']+)\'\\]\\s*=\\s*([^;]+);': 'test("$1", function() { expect(Boolean($2)).to.be.true; });',
+
+  // Supported Postman request translations:
+  // - pm.request.url / request.url     -> req.getUrl()
+  // - pm.request.method / request.method -> req.getMethod()
+  // - pm.request.headers / request.headers -> req.getHeaders()
+  // - pm.request.body / request.body   -> req.getBody()
+  // - pm.info.requestName / request.name -> req.getName()
   'pm\\.request\\.url': 'req.getUrl()',
   'pm\\.request\\.method': 'req.getMethod()',
   'pm\\.request\\.headers': 'req.getHeaders()',
   'pm\\.request\\.body': 'req.getBody()',
   'pm\\.info\\.requestName': 'req.getName()',
+  'request\\.url': 'req.getUrl()',
+  'request\\.method': 'req.getMethod()',
+  'request\\.headers': 'req.getHeaders()',
+  'request\\.body': 'req.getBody()',
+  'request\\.name': 'req.getName()',
   // deprecated translations
   'postman\\.setEnvironmentVariable\\(': 'bru.setEnvVar(',
   'postman\\.getEnvironmentVariable\\(': 'bru.getEnvVar(',
@@ -54,7 +66,7 @@ const replacements = {
   'pm\\.cookies\\.jar\\(\\)\\.set\\(': 'bru.cookies.jar().setCookie(',
   'pm\\.cookies\\.jar\\(\\)\\.unset\\(': 'bru.cookies.jar().deleteCookie(',
   'pm\\.cookies\\.jar\\(\\)\\.clear\\(': 'bru.cookies.jar().deleteCookies(',
-  'pm\\.cookies\\.jar\\(\\)\\.getAll\\(': 'bru.cookies.jar().getCookies(',
+  'pm\\.cookies\\.jar\\(\\)\\.getAll\\(': 'bru.cookies.jar().getCookies('
 };
 
 const extendedReplacements = Object.keys(replacements).reduce((acc, key) => {
@@ -73,15 +85,13 @@ const processRegexReplacement = (code) => {
   for (const { regex, replacement } of compiledReplacements) {
     if (regex.test(code)) {
       code = code.replace(regex, replacement);
-
     }
   }
   if ((code.includes('pm.') || code.includes('postman.'))) {
     code = code.replace(/^(.*(pm\.|postman\.).*)$/gm, '// $1');
   }
   return code;
-}
-
+};
 
 const postmanTranslation = (script, options = {}) => {
   let modifiedScript = Array.isArray(script) ? script.join('\n') : script;
@@ -104,4 +114,4 @@ const postmanTranslation = (script, options = {}) => {
   }
 };
 
-export default postmanTranslation;
\ No newline at end of file
+export default postmanTranslation;
diff --git a/packages/bruno-converters/src/utils/jscode-shift-translator.js b/packages/bruno-converters/src/utils/jscode-shift-translator.js
index 14450e054..67e92900c 100644
--- a/packages/bruno-converters/src/utils/jscode-shift-translator.js
+++ b/packages/bruno-converters/src/utils/jscode-shift-translator.js
@@ -4,7 +4,7 @@ const cloneDeep = require('lodash/cloneDeep');
 
 /**
  * Efficiently builds a string representation of a member expression without using toSource()
- * 
+ *
  * @param {Object} node - The member expression node from the AST
  * @return {string} - String representation of the member expression (e.g., "pm.environment.get")
  */
@@ -13,16 +13,16 @@ function getMemberExpressionString(node) {
   if (node.type === 'Identifier') {
     return node.name;
   }
-  
+
   if (node.type === 'CallExpression') {
     const calleeStr = getMemberExpressionString(node.callee);
     return `${calleeStr}()`;
   }
-  
+
   // Handle member expressions
   if (node.type === 'MemberExpression') {
     const objectStr = getMemberExpressionString(node.object);
-    
+
     // For computed properties like obj[prop], we need special handling
     if (node.computed) {
       // For literals like obj["prop"], we can include them in the string
@@ -32,13 +32,13 @@ function getMemberExpressionString(node) {
       // For other computed properties, we can't reliably represent them as a simple string
       return `${objectStr}.[computed]`;
     }
-    
+
     // For regular property access like obj.prop
     if (node.property.type === 'Identifier') {
       return `${objectStr}.${node.property.name}`;
     }
   }
-  
+
   return '[unsupported]';
 }
 
@@ -47,13 +47,13 @@ const simpleTranslations = {
   // Global Variables
   'pm.globals.get': 'bru.getGlobalEnvVar',
   'pm.globals.set': 'bru.setGlobalEnvVar',
-  
+
   // Environment variables
   'pm.environment.get': 'bru.getEnvVar',
   'pm.environment.set': 'bru.setEnvVar',
   'pm.environment.name': 'bru.getEnvName()',
   'pm.environment.unset': 'bru.deleteEnvVar',
-  
+
   // Variables
   'pm.variables.get': 'bru.getVar',
   'pm.variables.set': 'bru.setVar',
@@ -64,10 +64,10 @@ const simpleTranslations = {
   'pm.collectionVariables.set': 'bru.setVar',
   'pm.collectionVariables.has': 'bru.hasVar',
   'pm.collectionVariables.unset': 'bru.deleteVar',
-  
+
   // Request flow control
   'pm.setNextRequest': 'bru.setNextRequest',
-  
+
   // Testing
   'pm.test': 'test',
   'pm.expect': 'expect',
@@ -76,12 +76,19 @@ const simpleTranslations = {
   // Info
   'pm.info.requestName': 'req.getName()',
 
-  // Request properties
+  // Request properties (pm.request.*)
   'pm.request.url': 'req.getUrl()',
   'pm.request.method': 'req.getMethod()',
   'pm.request.headers': 'req.getHeaders()',
   'pm.request.body': 'req.getBody()',
- 
+
+  // Legacy/global request object (request.*)
+  'request.url': 'req.getUrl()',
+  'request.method': 'req.getMethod()',
+  'request.headers': 'req.getHeaders()',
+  'request.body': 'req.getBody()',
+  'request.name': 'req.getName()',
+
   // Response properties
   'pm.response.json': 'res.getBody',
   'pm.response.code': 'res.getStatus()',
@@ -95,20 +102,20 @@ const simpleTranslations = {
   'pm.response.size().header': 'res.getSize().header',
   'pm.response.size().total': 'res.getSize().total',
   'pm.cookies.jar': 'bru.cookies.jar',
-  
+
   'pm.cookies.jar().get': 'bru.cookies.jar().getCookie',
-  'pm.cookies.jar().getAll': 'bru.cookies.jar().getCookies', 
+  'pm.cookies.jar().getAll': 'bru.cookies.jar().getCookies',
   'pm.cookies.jar().set': 'bru.cookies.jar().setCookie',
   'pm.cookies.jar().unset': 'bru.cookies.jar().deleteCookie',
-  'pm.cookies.jar().clear': 'bru.cookies.jar().deleteCookies', 
-  
+  'pm.cookies.jar().clear': 'bru.cookies.jar().deleteCookies',
+
   // Execution control
   'pm.execution.skipRequest': 'bru.runner.skipRequest',
-  
+
   // Legacy Postman API (deprecated) (we can use pm instead of postman, as we are converting all postman references to pm in the code as the part of pre-processing)
   'pm.setEnvironmentVariable': 'bru.setEnvVar',
   'pm.getEnvironmentVariable': 'bru.getEnvVar',
-  'pm.clearEnvironmentVariable': 'bru.deleteEnvVar',
+  'pm.clearEnvironmentVariable': 'bru.deleteEnvVar'
 };
 
 /* Complex transformations that need custom handling
@@ -124,15 +131,15 @@ const complexTransformations = [
     pattern: 'pm.sendRequest',
     transform: sendRequestTransformer
   },
-  
+
   // pm.environment.has requires special handling
- {
+  {
     pattern: 'pm.environment.has',
     transform: (path, j) => {
       const callExpr = path.parent.value;
-      
+
       const args = callExpr.arguments;
-      
+
       // Create: bru.getEnvVar(arg) !== undefined && bru.getEnvVar(arg) !== null
       return j.logicalExpression(
         '&&',
@@ -167,9 +174,9 @@ const complexTransformations = [
     pattern: 'pm.response.to.have.status',
     transform: (path, j) => {
       const callExpr = path.parent.value;
-      
+
       const args = callExpr.arguments;
-      
+
       // Create: expect(res.getStatus()).to.equal(arg)
       return j.callExpression(
         j.memberExpression(
@@ -194,9 +201,8 @@ const complexTransformations = [
     pattern: 'pm.response.to.have.header',
     transform: (path, j) => {
       const callExpr = path.parent.value;
-  
+
       const args = callExpr.arguments;
-      
 
       if (args.length > 0) {
         // Apply toLowerCase() to the first argument
@@ -225,15 +231,14 @@ const complexTransformations = [
         ),
         args
       );
-          
     }
   },
- // handle pm.response.to.have.body to expect(res.getBody()).to.equal(arg)
+  // handle pm.response.to.have.body to expect(res.getBody()).to.equal(arg)
   {
     pattern: 'pm.response.to.have.body',
     transform: (path, j) => {
       const callExpr = path.parent.value;
-      
+
       const args = callExpr.arguments;
 
       return j.callExpression(
@@ -243,7 +248,6 @@ const complexTransformations = [
         ),
         args
       );
-      
     }
   },
 
@@ -252,9 +256,9 @@ const complexTransformations = [
     pattern: 'pm.execution.setNextRequest',
     transform: (path, j) => {
       const callExpr = path.parent.value;
-      
+
       const args = callExpr.arguments;
-      
+
       // If argument is null or 'null', transform to bru.runner.stopExecution()
       if (
         args[0].type === 'Literal' && (args[0].value === null || args[0].value === 'null')
@@ -264,23 +268,23 @@ const complexTransformations = [
           []
         );
       }
-      
+
       // Otherwise, keep as bru.runner.setNextRequest with the same argument
       return j.callExpression(
         j.identifier('bru.runner.setNextRequest'),
         args
       );
     }
-  }, 
+  }
 ];
 
 // Create a map for complex transformations to enable O(1) lookups
 const complexTransformationsMap = {};
-complexTransformations.forEach(transform => {
+complexTransformations.forEach((transform) => {
   complexTransformationsMap[transform.pattern] = transform;
 });
 
-const varInitsToReplace = new Set(['pm', 'postman', 'pm.request','pm.response', 'pm.test', 'pm.expect', 'pm.environment', 'pm.variables', 'pm.collectionVariables', 'pm.execution', 'pm.globals']);
+const varInitsToReplace = new Set(['pm', 'postman', 'pm.request', 'pm.response', 'pm.test', 'pm.expect', 'pm.environment', 'pm.variables', 'pm.collectionVariables', 'pm.execution', 'pm.globals']);
 
 /**
  * Process all transformations (both simple and complex) in the AST in a single pass
@@ -288,12 +292,12 @@ const varInitsToReplace = new Set(['pm', 'postman', 'pm.request','pm.response',
  * @param {Set} transformedNodes - Set of already transformed nodes
  */
 function processTransformations(ast, transformedNodes) {
-  ast.find(j.MemberExpression).forEach(path => {
+  ast.find(j.MemberExpression).forEach((path) => {
     if (transformedNodes.has(path.node)) return;
-    
+
     // Get string representation using our utility function
     const memberExprStr = getMemberExpressionString(path.value);
-    
+
     // First check for simple transformations (O(1))
     if (simpleTranslations.hasOwnProperty(memberExprStr)) {
       const replacement = simpleTranslations[memberExprStr];
@@ -301,15 +305,15 @@ function processTransformations(ast, transformedNodes) {
       transformedNodes.add(path.node);
       return; // Skip complex transformation check if simple transformation applied
     }
-    
+
     // Then check for complex transformations (O(1))
-    if (complexTransformationsMap.hasOwnProperty(memberExprStr) && 
-        path.parent.value.type === 'CallExpression') {
+    if (complexTransformationsMap.hasOwnProperty(memberExprStr)
+      && path.parent.value.type === 'CallExpression') {
       const transform = complexTransformationsMap[memberExprStr];
       const replacement = transform.transform(path, j);
       if (Array.isArray(replacement)) {
         replacement.forEach((nodePath, index) => {
-          if(index === 0) {
+          if (index === 0) {
             j(path.parent).replaceWith(nodePath);
           } else {
             j(path.parent.parent).insertAfter(nodePath);
@@ -335,9 +339,9 @@ function translateCode(code) {
   // Replace 'postman' with 'pm' using regex before creating the AST
   // This is more efficient than an AST traversal
   code = code.replace(/\bpostman\b/g, 'pm');
-  
+
   const ast = j(code);
-  
+
   // Keep track of transformed nodes to avoid double-processing
   const transformedNodes = new Set();
 
@@ -349,13 +353,13 @@ function translateCode(code) {
 
   // Process all transformations in a single pass
   processTransformations(ast, transformedNodes);
-  
+
   // Handle legacy Postman global APIs
   handleLegacyGlobalAPIs(ast, transformedNodes, code);
-  
+
   // Handle special Postman syntax patterns
   handleTestsBracketNotation(ast);
-  
+
   return ast.toSource();
 }
 
@@ -368,23 +372,22 @@ function preprocessAliases(ast) {
   const symbolTable = new Map();
   const MAX_ITERATIONS = 5;
   let iterations = 0;
-  
+
   // Keep preprocessing until no more changes can be made
   let changesMade;
   do {
     changesMade = false;
-    
+
     // First pass: Identify all variables
     findVariableDefinitions(ast, symbolTable);
-    
+
     // Second pass: Replace all variable references with their resolved values
     changesMade = resolveVariableReferences(ast, symbolTable) || false;
-    
+
     // Third pass: Clean up variable declarations that are no longer needed
     changesMade = removeResolvedDeclarations(ast, symbolTable) || false;
 
     iterations++;
-    
   } while (changesMade && iterations < MAX_ITERATIONS);
 }
 
@@ -395,23 +398,22 @@ function preprocessAliases(ast) {
  */
 function findVariableDefinitions(ast, symbolTable) {
   // Use a single traversal to handle both direct assignments and object destructuring
-  ast.find(j.VariableDeclarator).forEach(path => {
+  ast.find(j.VariableDeclarator).forEach((path) => {
     // Only process nodes that have an initializer
     if (!path.value.init) return;
 
     // Handle direct assignments: const response = pm.response
     if (path.value.id.type === 'Identifier') {
       const varName = path.value.id.name;
-      
+
       // If it's a direct identifier, just map it
       if (path.value.init.type === 'Identifier') {
-        symbolTable.set(varName, { 
+        symbolTable.set(varName, {
           type: 'identifier',
           value: path.value.init.name
         });
-      }
-      // If it's a member expression, store both parts
-      else if (path.value.init.type === 'MemberExpression') {
+      } else if (path.value.init.type === 'MemberExpression') {
+        // If it's a member expression, store both parts
         const sourceCode = getMemberExpressionString(path.value.init);
         symbolTable.set(varName, {
           type: 'memberExpression',
@@ -419,12 +421,11 @@ function findVariableDefinitions(ast, symbolTable) {
           node: path.value.init
         });
       }
-    }
-    // Handle object destructuring: const { response } = pm
-    else if (path.value.id.type === 'ObjectPattern' && path.value.init.type === 'Identifier') {
+    } else if (path.value.id.type === 'ObjectPattern' && path.value.init.type === 'Identifier') {
+      // Handle object destructuring: const { response } = pm
       const source = path.value.init.name;
-      
-      path.value.id.properties.forEach(prop => {
+
+      path.value.id.properties.forEach((prop) => {
         if (prop.key.name && prop.value.type === 'Identifier') {
           const destVarName = prop.value.name;
           symbolTable.set(destVarName, {
@@ -449,28 +450,28 @@ function findVariableDefinitions(ast, symbolTable) {
  */
 function resolveVariableReferences(ast, symbolTable) {
   let changesMade = false;
-  
+
   /**
    * Example of what this function does:
-   * 
+   *
    * Input Postman code:
    *   const response = pm.response;
    *   const jsonData = response.json();  // response is a reference to pm.response
-   * 
+   *
    * After resolution:
    *   const response = pm.response;
    *   const jsonData = pm.response.json();  // response reference is replaced with pm.response
-   * 
+   *
    * Then in the next preprocessing phase, unnecessary variables like 'response' will be removed.
    */
-  
+
   // Replace all identifier references with their resolved values
-  ast.find(j.Identifier).forEach(path => {
+  ast.find(j.Identifier).forEach((path) => {
     const varName = path.value.name;
-    
+
     /**
      * Skip specific types of identifiers that shouldn't be replaced:
-     * 
+     *
      * Case 1: Variable definitions (left side of declarations)
      * -----------------------------------------------------
      * In code like:
@@ -478,7 +479,7 @@ function resolveVariableReferences(ast, symbolTable) {
      *           ^
      * We shouldn't replace 'response' on the left side with pm.response,
      * which would result in: const pm.response = pm.response; (invalid syntax)
-     * 
+     *
      * Case 2: Property names in member expressions
      * -----------------------------------------------------
      * In code like:
@@ -486,11 +487,11 @@ function resolveVariableReferences(ast, symbolTable) {
      *                       ^
      * We shouldn't replace the 'status' property name with anything,
      * only the 'response' object reference should be replaced.
-     * 
+     *
      * We only want to replace identifiers that are being used as references,
      * not the ones being defined or used as property names.
      */
-    
+
     // Skip if this is a variable definition or property name
     if (path.parent.value.type === 'VariableDeclarator' && path.parent.value.id === path.value) {
       return;
@@ -498,12 +499,12 @@ function resolveVariableReferences(ast, symbolTable) {
     if (path.parent.value.type === 'MemberExpression' && path.parent.value.property === path.value && !path.parent.value.computed) {
       return;
     }
-    
+
     // Only replace if this is a known variable
     if (!symbolTable.has(varName)) return;
 
     const symbolInfo = symbolTable.get(varName);
-    if(!varInitsToReplace.has(symbolInfo.value)) {
+    if (!varInitsToReplace.has(symbolInfo.value)) {
       return;
     }
     const newNode = cloneDeep(symbolInfo.node);
@@ -513,10 +514,9 @@ function resolveVariableReferences(ast, symbolTable) {
       value: symbolInfo.value,
       node: newNode
     });
-    changesMade = true; 
-    
+    changesMade = true;
   });
-  
+
   return changesMade;
 }
 
@@ -526,54 +526,54 @@ function resolveVariableReferences(ast, symbolTable) {
  * @param {Map} symbolTable - Map of variable references
  * @returns {boolean} Whether any changes were made
  */
-function removeResolvedDeclarations(ast, symbolTable) {  
+function removeResolvedDeclarations(ast, symbolTable) {
   let changesMade = false;
-  
+
   /**
    * Example of what this function does:
-   * 
+   *
    * Original Postman code:
    *   const response = pm.response;
    *   const jsonData = response.json();
    *   console.log(jsonData.name);
-   * 
+   *
    * After variable resolution:
    *   const response = pm.response;        // This declaration is now redundant
    *   const jsonData = pm.response.json(); // This value has been resolved
    *   console.log(jsonData.name);          // This still references jsonData
-   * 
+   *
    * Final code after this cleanup step:
    *   const jsonData = pm.response.json(); // response variable declaration is removed
    *   console.log(jsonData.name);          // jsonData is kept since it's still referenced
-   * 
+   *
    * We only remove declarations that:
    * 1. Have been fully resolved (references to pm.* objects)
    * 2. No longer provide any value (since all references were replaced with resolved values)
    */
-  
+
   // Use a single traversal to handle both regular variable declarations and destructuring
-  ast.find(j.VariableDeclarator).forEach(path => {
+  ast.find(j.VariableDeclarator).forEach((path) => {
     // Case 1: Handle regular variable declarations
     if (path.value.id.type === 'Identifier') {
       const varName = path.value.id.name;
       const replacement = symbolTable.get(varName);
-      if(!replacement || !varInitsToReplace.has(replacement.value)) return;
-     
+      if (!replacement || !varInitsToReplace.has(replacement.value)) return;
+
       /**
        * This code differentiates between two types of variable declarations:
-       * 
+       *
        * Example 1: Single variable declaration
        * -----------------------------------
        * Input:   const response = pm.response;
        * Action:  The entire statement can be removed
        * Output:  [statement removed]
-       * 
+       *
        * Example 2: Multiple variables in one declaration
        * -----------------------------------
        * Input:   const response = pm.response, unrelated = 5;
        * Action:  Only remove the 'response' declarator, keep the others
        * Output:  const unrelated = 5;
-       * 
+       *
        * We need this distinction to ensure we don't accidentally remove
        * unrelated variables that happen to be declared in the same statement.
        */
@@ -584,47 +584,45 @@ function removeResolvedDeclarations(ast, symbolTable) {
         // Otherwise just remove this declarator
         j(path).remove();
       }
-      
+
       changesMade = true;
-    }
-    // Case 2: Handle destructuring of pm
-    else if (path.value.id.type === 'ObjectPattern' && 
-             path.value.init && 
-             path.value.init.type === 'Identifier' && 
-             path.value.init.name === 'pm') {
-      
+    } else if (path.value.id.type === 'ObjectPattern'
+      // Case 2: Handle destructuring of pm
+      && path.value.init
+      && path.value.init.type === 'Identifier'
+      && path.value.init.name === 'pm') {
       /**
        * Example of destructuring removal:
-       * 
+       *
        * Original Postman code:
        *   const { response, environment } = pm;
        *   console.log(response.json().name);
        *   console.log(environment.get("variable"));
-       * 
+       *
        * After variable resolution steps:
        *   const { response, environment } = pm;  // This destructuring is now redundant
        *   console.log(pm.response.json().name); // 'response' references already replaced with pm.response
        *   console.log(pm.environment.get("variable")); // 'environment' references replaced
-       * 
+       *
        * Final code after this cleanup step:
        *   console.log(pm.response.json().name); // Destructuring declaration is completely removed
        *   console.log(pm.environment.get("variable"));
-       * 
+       *
        * This step specifically targets the Postman pattern of destructuring the pm object,
        * which is common in Postman scripts but needs to be removed in the Bruno conversion.
        */
-      
+
       const declarationPath = j(path).closest(j.VariableDeclaration);
       if (declarationPath.get().value.declarations.length === 1) {
         declarationPath.remove();
       } else {
         j(path).remove();
       }
-      
+
       changesMade = true;
     }
   });
-  
+
   return changesMade;
 }
 
@@ -635,25 +633,25 @@ function removeResolvedDeclarations(ast, symbolTable) {
 function processCookieJarVariables(ast) {
   // Map of Postman cookie jar method names to Bruno equivalents
   const cookieMethodMapping = {
-    'get': 'getCookie',
-    'getAll': 'getCookies',
-    'set': 'setCookie',
-    'unset': 'deleteCookie',
-    'clear': 'deleteCookies'
+    get: 'getCookie',
+    getAll: 'getCookies',
+    set: 'setCookie',
+    unset: 'deleteCookie',
+    clear: 'deleteCookies'
   };
 
   // Track variables that are assigned to cookie jar instances
   const cookieJarVariables = new Set();
 
   // First pass: Find all variables assigned to cookie jar instances
-  ast.find(j.VariableDeclarator).forEach(path => {
+  ast.find(j.VariableDeclarator).forEach((path) => {
     if (path.value.init && path.value.init.type === 'CallExpression') {
       const initCall = path.value.init;
-      
+
       // Check if this is a cookie jar assignment
       if (initCall.callee.type === 'MemberExpression') {
         const calleeStr = getMemberExpressionString(initCall.callee);
-        
+
         if (calleeStr === 'pm.cookies.jar' || calleeStr === 'bru.cookies.jar') {
           if (path.value.id.type === 'Identifier') {
             cookieJarVariables.add(path.value.id.name);
@@ -664,14 +662,13 @@ function processCookieJarVariables(ast) {
   });
 
   // Second pass: Rename method calls on cookie jar variables
-  ast.find(j.CallExpression).forEach(path => {
-    if (path.value.callee.type === 'MemberExpression' && 
-        path.value.callee.object.type === 'Identifier' &&
-        path.value.callee.property.type === 'Identifier') {
-      
+  ast.find(j.CallExpression).forEach((path) => {
+    if (path.value.callee.type === 'MemberExpression'
+      && path.value.callee.object.type === 'Identifier'
+      && path.value.callee.property.type === 'Identifier') {
       const varName = path.value.callee.object.name;
       const methodName = path.value.callee.property.name;
-      
+
       // If this is a method call on a cookie jar variable
       if (cookieJarVariables.has(varName) && cookieMethodMapping[methodName]) {
         const newMethodName = cookieMethodMapping[methodName];
@@ -697,23 +694,22 @@ function handleTestsBracketNotation(ast) {
         property: {} // Accept any property type
       }
     }
-  }).forEach(path => {
+  }).forEach((path) => {
     // Get the assignment expression
     const assignment = path.value.expression;
     const left = assignment.left;
-    
+
     // Verify it's a valid tests[] expression
-    if (left.object.type === 'Identifier' && 
-        left.object.name === 'tests' && 
-        left.computed === true) {
-      
+    if (left.object.type === 'Identifier'
+      && left.object.name === 'tests'
+      && left.computed === true) {
       const property = left.property;
       const rightSide = assignment.right;
-      
+
       // Handle string literals
       if (property.type === 'Literal' && typeof property.value === 'string') {
         const testName = property.value;
-        
+
         // Replace with test() function call
         j(path).replaceWith(
           j.expressionStatement(
@@ -745,15 +741,14 @@ function handleTestsBracketNotation(ast) {
             )
           )
         );
-      }
-      // Handle template literals
-      else if (property.type === 'TemplateLiteral') {
+      } else if (property.type === 'TemplateLiteral') {
+        // Handle template literals
         // Create a template literal with the same quasi and expressions
         const templateLiteral = j.templateLiteral(
           property.quasis,
           property.expressions
         );
-        
+
         // Replace with test() function call using template literal
         j(path).replaceWith(
           j.expressionStatement(
@@ -794,7 +789,7 @@ function handleTestsBracketNotation(ast) {
  * Handle legacy Postman global API transformations
  * This function processes legacy Postman globals like responseBody, responseHeaders, responseTime
  * while preserving user-defined variables with the same names
- * 
+ *
  * @param {Object} ast - jscodeshift AST
  * @param {Set} transformedNodes - Set of already transformed nodes
  * @param {string} code - The original Postman script code
@@ -809,9 +804,9 @@ function handleLegacyGlobalAPIs(ast, transformedNodes, code) {
 
   // Check for variable declarations with legacy global names - track which ones have conflicts
   const conflictingNames = new Set();
-  
+
   // Check variable declarations
-  ast.find(j.VariableDeclarator).forEach(path => {
+  ast.find(j.VariableDeclarator).forEach((path) => {
     if (path.value.id.type === 'Identifier') {
       const varName = path.value.id.name;
       if (legacyGlobalRegex.test(varName)) {
@@ -823,13 +818,13 @@ function handleLegacyGlobalAPIs(ast, transformedNodes, code) {
   // Handle JSON.parse(responseBody) → res.getBody()
   // Only transform if responseBody doesn't have a user variable conflict
   if (!conflictingNames.has('responseBody')) {
-    ast.find(j.CallExpression).forEach(path => {
+    ast.find(j.CallExpression).forEach((path) => {
       if (transformedNodes.has(path.node)) return;
-      
+
       const callExpr = path.value;
       if (callExpr.callee.type === 'MemberExpression' && callExpr.callee.object.name === 'JSON' && callExpr.callee.property.name === 'parse') {
         const args = callExpr.arguments;
-        
+
         // Check if the argument is 'responseBody'
         if (args.length > 0 && args[0].type === 'Identifier' && args[0].name === 'responseBody') {
           // Replace JSON.parse(responseBody) with res.getBody()
@@ -852,33 +847,33 @@ function handleLegacyGlobalAPIs(ast, transformedNodes, code) {
     if (conflictingNames.has(name)) {
       return;
     }
-    
-    ast.find(j.Identifier, { name }).forEach(path => {
+
+    ast.find(j.Identifier, { name }).forEach((path) => {
       if (transformedNodes.has(path.node)) return;
-      
+
       // Only transform identifiers that are being used as values, not as variable names
       const parent = path.parent.value;
-      
+
       // Skip if this is part of a variable declaration (const responseBody = ...)
       if (parent.type === 'VariableDeclarator' && parent.id === path.node) {
         return; // Keep unchanged
       }
-      
+
       // Skip if this is part of an assignment (responseBody = ...)
       if (parent.type === 'AssignmentExpression' && parent.left === path.node) {
         return; // Keep unchanged
       }
-      
+
       // Skip if this is part of a function parameter
       if (parent.type === 'FunctionDeclaration' || parent.type === 'FunctionExpression') {
         return; // Keep unchanged
       }
-      
+
       // Skip if this is part of an object property
       if (parent.type === 'Property' && (parent.key === path.node || parent.value === path.node)) {
         return; // Keep unchanged
       }
-      
+
       // Transform all other references (including function call arguments)
       // This will transform console.log(responseBody) → console.log(res.getBody())
       j(path).replaceWith(j.identifier(replacement));
@@ -888,4 +883,4 @@ function handleLegacyGlobalAPIs(ast, transformedNodes, code) {
 }
 
 export { getMemberExpressionString };
-export default translateCode; 
\ No newline at end of file
+export default translateCode;
diff --git a/packages/bruno-converters/src/utils/send-request-transformer.js b/packages/bruno-converters/src/utils/send-request-transformer.js
index 4f16c4311..1e22b4694 100644
--- a/packages/bruno-converters/src/utils/send-request-transformer.js
+++ b/packages/bruno-converters/src/utils/send-request-transformer.js
@@ -6,12 +6,12 @@
  */
 const convertArrayToObject = (j, arrayValue) => {
   const obj = j.objectExpression([]);
-  
+
   if (arrayValue.type === 'ArrayExpression') {
-    arrayValue.elements.forEach(elem => {
+    arrayValue.elements.forEach((elem) => {
       if (elem.type === 'ObjectExpression') {
-        const keyProp = elem.properties.find(p => (p.key.name === 'key' || p.key.value === 'key'));
-        const valueProp = elem.properties.find(p => (p.key.name === 'value' || p.key.value === 'value'));
+        const keyProp = elem.properties.find((p) => (p.key.name === 'key' || p.key.value === 'key'));
+        const valueProp = elem.properties.find((p) => (p.key.name === 'value' || p.key.value === 'value'));
 
         if (keyProp && valueProp) {
           obj.properties.push(
@@ -25,7 +25,7 @@ const convertArrayToObject = (j, arrayValue) => {
       }
     });
   }
-  
+
   return obj;
 };
 
@@ -37,7 +37,7 @@ const convertArrayToObject = (j, arrayValue) => {
  * @param {string} headerValue - Header value
  */
 const addOrUpdateHeader = (j, requestOptions, headerName, headerValue) => {
-  let headersProp = requestOptions.properties.find(p => (p.key.name === 'headers' || p.key.value === 'headers'));
+  let headersProp = requestOptions.properties.find((p) => (p.key.name === 'headers' || p.key.value === 'headers'));
 
   if (!headersProp) {
     headersProp = j.property('init', j.identifier('headers'), j.objectExpression([]));
@@ -47,9 +47,9 @@ const addOrUpdateHeader = (j, requestOptions, headerName, headerValue) => {
   }
 
   // filter out existing header with same name (case-insensitive)
-  headersProp.value.properties = headersProp.value.properties.filter(p =>
-    p.key.type !== 'Literal' ||
-    p.key.value.toLowerCase() !== headerName.toLowerCase()
+  headersProp.value.properties = headersProp.value.properties.filter((p) =>
+    p.key.type !== 'Literal'
+    || p.key.value.toLowerCase() !== headerName.toLowerCase()
   );
 
   headersProp.value.properties.push(
@@ -69,7 +69,7 @@ const addOrUpdateHeader = (j, requestOptions, headerName, headerValue) => {
 const transformHeaders = (j, requestOptions) => {
   if (requestOptions.type !== 'ObjectExpression') return;
 
-  requestOptions.properties.forEach(prop => {
+  requestOptions.properties.forEach((prop) => {
     // find and rename 'header' property to 'headers'
     if (prop.key.name === 'header' || prop.key.value === 'header') {
       prop.key.name = 'headers';
@@ -91,19 +91,19 @@ const transformHeaders = (j, requestOptions) => {
  */
 const transformBody = (j, requestOptions) => {
   if (requestOptions.type !== 'ObjectExpression') return null;
-  
-  requestOptions.properties.forEach(prop => {
+
+  requestOptions.properties.forEach((prop) => {
     if (prop.key.name === 'body' || prop.key.value === 'body') {
       if (prop.value.type === 'ObjectExpression') {
         const bodyProps = prop.value.properties;
-        const modeProp = bodyProps.find(p => (p.key.name === 'mode' || p.key.value === 'mode'));
+        const modeProp = bodyProps.find((p) => (p.key.name === 'mode' || p.key.value === 'mode'));
 
         if (modeProp && modeProp.value.type === 'Literal') {
           const bodyMode = modeProp.value.value;
 
           // Handle raw mode (text, json, xml, etc.)
           if (bodyMode === 'raw') {
-            const rawProp = bodyProps.find(p => (p.key.name === 'raw' || p.key.value === 'raw'));
+            const rawProp = bodyProps.find((p) => (p.key.name === 'raw' || p.key.value === 'raw'));
 
             if (rawProp) {
               // Replace body with data
@@ -111,37 +111,35 @@ const transformBody = (j, requestOptions) => {
               prop.key.value = 'data';
               prop.value = rawProp.value;
             }
-          }
-          // Handle urlencoded mode
-          else if (bodyMode === 'urlencoded') {
-            const urlencodedProp = bodyProps.find(p => (p.key.name === 'urlencoded' || p.key.value === 'urlencoded') && p.value.type === 'ArrayExpression');
+          } else if (bodyMode === 'urlencoded') {
+            // Handle urlencoded mode
+            const urlencodedProp = bodyProps.find((p) => (p.key.name === 'urlencoded' || p.key.value === 'urlencoded') && p.value.type === 'ArrayExpression');
 
             if (urlencodedProp) {
               // Replace the body property with a 'data' property
               prop.key.name = 'data';
               prop.key.value = 'data';
-              
+
               // Transform the urlencoded array to an object
               prop.value = convertArrayToObject(j, urlencodedProp.value);
 
               // Add Content-Type header for urlencoded
               addOrUpdateHeader(j, requestOptions, 'Content-Type', 'application/x-www-form-urlencoded');
             }
-          }
-          // Handle formdata mode
-          else if (bodyMode === 'formdata') {
-            const formdataProp = bodyProps.find(p => (p.key.name === 'formdata' || p.key.value === 'formdata') && p.value.type === 'ArrayExpression');
+          } else if (bodyMode === 'formdata') {
+            // Handle formdata mode
+            const formdataProp = bodyProps.find((p) => (p.key.name === 'formdata' || p.key.value === 'formdata') && p.value.type === 'ArrayExpression');
 
             if (formdataProp) {
-                // Replace the body property with a 'data' property
-                prop.key.name = 'data';
-                prop.key.value = 'data';
-                
-                // Transform the urlencoded array to an object
-                prop.value = convertArrayToObject(j, formdataProp.value);
-  
-                // Add Content-Type header for urlencoded
-                addOrUpdateHeader(j, requestOptions, 'Content-Type', 'multipart/form-data');
+              // Replace the body property with a 'data' property
+              prop.key.name = 'data';
+              prop.key.value = 'data';
+
+              // Transform the urlencoded array to an object
+              prop.value = convertArrayToObject(j, formdataProp.value);
+
+              // Add Content-Type header for urlencoded
+              addOrUpdateHeader(j, requestOptions, 'Content-Type', 'multipart/form-data');
             }
           }
         }
@@ -158,7 +156,7 @@ const transformBody = (j, requestOptions) => {
  */
 const transformCallback = (j, callback) => {
   if (!callback || (callback.type !== 'FunctionExpression' && callback.type !== 'ArrowFunctionExpression')) return null;
-  
+
   const params = callback.params;
   const callbackBody = callback.body;
 
@@ -175,10 +173,10 @@ const transformCallback = (j, callback) => {
 
   // Define translations for callback response properties
   const responsePropertyMap = {
-    'json': 'data',
-    'text': 'data', 
-    'code': 'status',
-    'status': 'statusText',
+    json: 'data',
+    text: 'data',
+    code: 'status',
+    status: 'statusText'
   };
 
   // Process the callback body to transform response property references
@@ -187,7 +185,7 @@ const transformCallback = (j, callback) => {
       type: 'Identifier',
       name: responseVarName
     }
-  }).forEach(memberPath => {
+  }).forEach((memberPath) => {
     const property = memberPath.node.property;
 
     // Handle property access
@@ -239,26 +237,25 @@ const findAndTransformVariableDeclaration = (j, root, variableName, visited = ne
     return null;
   }
   visited.add(variableName);
-  
+
   let transformedConfig = null;
-  
+
   // Find the variable declaration
   root.find(j.VariableDeclarator, {
     id: { name: variableName }
-  }).forEach(declaratorPath => {
+  }).forEach((declaratorPath) => {
     const init = declaratorPath.value.init;
-    
+
     if (init && init.type === 'ObjectExpression') {
       // Found the actual object expression - clone and transform it
       const configClone = j(init).at(0).get().value;
-      
+
       // Transform headers and body
       transformHeaders(j, configClone);
       transformBody(j, configClone);
-      
+
       transformedConfig = configClone;
-    } 
-    else if (init && init.type === 'Identifier') {
+    } else if (init && init.type === 'Identifier') {
       // This variable references another variable - follow the chain
       const referencedVariableName = init.name;
       transformedConfig = findAndTransformVariableDeclaration(j, root, referencedVariableName, visited);
@@ -288,14 +285,13 @@ const sendRequestTransformer = (path, j) => {
     transformHeaders(j, requestOptions);
     // Transform body
     transformBody(j, requestOptions);
-  }
-  // Handle case where requestOptions is a variable reference
-  else if (requestOptions.type === 'Identifier') {
+  } else if (requestOptions.type === 'Identifier') {
+    // Handle case where requestOptions is a variable reference
     const variableName = requestOptions.name;
-    
+
     // Find the root of the current file/program
     const root = j(path).closest(j.Program);
-    
+
     // Find and transform the variable declaration
     findAndTransformVariableDeclaration(j, root, variableName);
   }
@@ -303,12 +299,12 @@ const sendRequestTransformer = (path, j) => {
   // Create the callback block and promise chain if there's a callback
   if (callback) {
     const transformedCallback = transformCallback(j, callback);
-    
+
     // Add async keyword to the callback function
     if (transformedCallback && (transformedCallback.type === 'FunctionExpression' || transformedCallback.type === 'ArrowFunctionExpression')) {
       transformedCallback.async = true;
     }
-    
+
     // Create expression: await bru.sendRequest(requestConfig, callback);
     const sendRequestCall = j.callExpression(
       j.identifier('bru.sendRequest'),
@@ -323,8 +319,8 @@ const sendRequestTransformer = (path, j) => {
     j.identifier('bru.sendRequest'),
     [requestOptions]
   );
-  
+
   return wasAwaited ? sendRequestCall : j.awaitExpression(sendRequestCall);
 };
 
-export default sendRequestTransformer;
\ No newline at end of file
+export default sendRequestTransformer;
diff --git a/packages/bruno-converters/src/workers/postman-translator-worker.js b/packages/bruno-converters/src/workers/postman-translator-worker.js
index 1c9ebea79..c4e0b31b5 100644
--- a/packages/bruno-converters/src/workers/postman-translator-worker.js
+++ b/packages/bruno-converters/src/workers/postman-translator-worker.js
@@ -3,7 +3,7 @@ const path = require('node:path');
 const os = require('node:os');
 
 function getMaxWorkers() {
-  return Math.max(os.availableParallelism(), 1)
+  return Math.max(os.availableParallelism(), 1);
 }
 
 class WorkerPool {
@@ -28,7 +28,7 @@ class WorkerPool {
   runTask(data) {
     return new Promise((resolve, reject) => {
       const task = { data, resolve, reject };
-      
+
       if (this.idle.length > 0) {
         this._runTaskOnWorker(this.idle.shift(), task);
       } else {
@@ -40,42 +40,42 @@ class WorkerPool {
   // Run a task on a specific worker
   _runTaskOnWorker(workerId, task) {
     const worker = this.workers[workerId];
-    
+
     const messageHandler = (result) => {
       // Cleanup listeners
       worker.removeListener('message', messageHandler);
       worker.removeListener('error', errorHandler);
-      
+
       // Mark worker as idle
       this.idle.push(workerId);
-      
+
       // Process queue if tasks are waiting
       if (this.queue.length > 0) {
         this._runTaskOnWorker(workerId, this.queue.shift());
       }
-      
+
       // Resolve the task
       task.resolve(result);
     };
-    
+
     const errorHandler = (err) => {
       worker.removeListener('message', messageHandler);
       worker.removeListener('error', errorHandler);
-      
+
       this.idle.push(workerId);
-      
+
       if (this.queue.length > 0) {
         this._runTaskOnWorker(workerId, this.queue.shift());
       }
-      
+
       task.reject(err);
     };
-    
+
     worker.on('message', messageHandler);
     worker.on('error', errorHandler);
     worker.postMessage(task.data);
   }
-  
+
   // Terminate all workers
   terminate() {
     for (const worker of this.workers) {
@@ -95,8 +95,8 @@ function countScriptLines(script) {
 // Calculate complexity of a script entry
 function calculateScriptComplexity([uid, entry]) {
   let totalLines = 0;
-  const { events }  = entry
-  
+  const { events } = entry;
+
   if (events && Array.isArray(events)) {
     events.forEach(({ script }) => {
       if (script && script.exec) {
@@ -104,7 +104,7 @@ function calculateScriptComplexity([uid, entry]) {
       }
     });
   }
-  
+
   return { uid, entry, complexity: totalLines || 1 }; // Minimum complexity of 1
 }
 
@@ -112,86 +112,84 @@ function calculateScriptComplexity([uid, entry]) {
 function createBalancedBatches(scriptEntries, workerCount) {
   // Calculate complexity for each script
   const scriptsWithComplexity = scriptEntries.map(calculateScriptComplexity);
-  
+
   // Sort scripts by complexity (descending)
   scriptsWithComplexity.sort((a, b) => b.complexity - a.complexity);
-  
+
   // Initialize batches
-  const batches = Array.from({ length: workerCount }, () => ({ 
-    entries: [], 
-    totalComplexity: 0 
+  const batches = Array.from({ length: workerCount }, () => ({
+    entries: [],
+    totalComplexity: 0
   }));
-  
+
   // Algorithm: Greedy load balancing
   // 1. Process scripts in descending order of complexity
   // 2. Always assign each script to the batch with lowest current load
   // 3. This minimizes the maximum workload across all workers
   for (const { uid, entry, complexity } of scriptsWithComplexity) {
-
     const batchWithLowestComplexity = batches.reduce(
       (target, current) => current.totalComplexity < target.totalComplexity ? current : target
     );
-    
+
     // Add the script to this batch
-    batchWithLowestComplexity.entries.push({uid, entry});
+    batchWithLowestComplexity.entries.push({ uid, entry });
     batchWithLowestComplexity.totalComplexity += complexity;
   }
-  
-  return batches.map(batch => 
+
+  return batches.map((batch) =>
     batch.entries.map(({ uid, entry }) => [uid, entry])
-  ).filter(batch => batch.length > 0);
+  ).filter((batch) => batch.length > 0);
 }
 
 const scriptTranslationWorker = async (scriptMap) => {
   // Convert the Map to an array of entries
   const scriptEntries = Array.from(scriptMap.entries());
   const maxWorkers = getMaxWorkers();
-  
+
   // For very small collections, don't parallelize
   if (scriptEntries.length <= 50) {
-    const workerPool = new WorkerPool(path.join(__dirname,'./src/workers/scripts/translate-postman-scripts.js'), 1);
+    const workerPool = new WorkerPool(path.join(__dirname, './src/workers/scripts/translate-postman-scripts.js'), 1);
     workerPool.initialize();
-    
+
     try {
       const translatedScripts = new Map();
       const result = await workerPool.runTask({ scripts: scriptEntries });
-      
+
       if (result.error) {
         console.error('Error in script translation worker:', result.error);
         throw new Error(result.error);
       }
-      
+
       result.forEach(([uid, { request }]) => {
         translatedScripts.set(uid, { request });
       });
-      
+
       return translatedScripts;
     } finally {
       workerPool.terminate();
     }
   }
-  
 
   const workerCount = Math.min(maxWorkers, 4);
-  
+
   // Create balanced batches based on script complexity
   const batches = createBalancedBatches(scriptEntries, workerCount);
-  
-  const translatedScripts = new Map();  
+
+  const translatedScripts = new Map();
 
   // Create worker pool with optimal size
-  const workerPool = new WorkerPool(path.join(__dirname,'./src/workers/scripts/translate-postman-scripts.js'), workerCount);
+  const workerPool = new WorkerPool(path.join(__dirname, './src/workers/scripts/translate-postman-scripts.js'), workerCount);
   workerPool.initialize();
 
   // Process all batches in parallel using worker pool
-  const batchPromises = batches.map(batch => {
+  const batchPromises = batches.map((batch) => {
     return workerPool.runTask({ scripts: batch })
-      .then(modScripts => {
+      .then((modScripts) => {
         modScripts.forEach(([name, { request }]) => {
           translatedScripts.set(name, { request });
         });
       })
-      .catch(err => {
+      .catch((err) => {
         console.error('Error in script translation worker:', err);
         throw new Error(err);
       });
@@ -208,4 +206,4 @@ const scriptTranslationWorker = async (scriptMap) => {
   return translatedScripts;
 };
 
-export default scriptTranslationWorker
\ No newline at end of file
+export default scriptTranslationWorker;
diff --git a/packages/bruno-converters/src/workers/scripts/translate-postman-scripts.js b/packages/bruno-converters/src/workers/scripts/translate-postman-scripts.js
index 816a08f03..9d532b832 100644
--- a/packages/bruno-converters/src/workers/scripts/translate-postman-scripts.js
+++ b/packages/bruno-converters/src/workers/scripts/translate-postman-scripts.js
@@ -7,21 +7,21 @@ parentPort.on('message', (workerData) => {
     const modScripts = scripts.map(([uid, { events }]) => {
       const requestObject = {
         script: {}
-      }
-      
+      };
+
       if (events && Array.isArray(events)) {
         events.forEach((event) => {
-          if(event?.script && event.script.exec) {
-            if(event.listen === 'prerequest') {
-              if(event.script.exec && event.script.exec.length > 0) {
+          if (event?.script && event.script.exec) {
+            if (event.listen === 'prerequest') {
+              if (event.script.exec && event.script.exec.length > 0) {
                 requestObject.script.req = postmanTranslation(event.script.exec);
               } else {
                 requestObject.script.req = '';
               }
             }
 
-            if(event.listen === 'test') {
-              if(event.script.exec && event.script.exec.length > 0) {
+            if (event.listen === 'test') {
+              if (event.script.exec && event.script.exec.length > 0) {
                 requestObject.script.res = postmanTranslation(event.script.exec);
               } else {
                 requestObject.script.res = '';
@@ -33,11 +33,10 @@ parentPort.on('message', (workerData) => {
 
       return [uid, { request: requestObject }];
     });
-    
+
     parentPort.postMessage(modScripts);
-  }
-  catch(error) {
+  } catch (error) {
     console.error(error);
     parentPort.postMessage({ error: error?.message });
   }
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/bruno/bruno-to-postman-with-tests.spec.js b/packages/bruno-converters/tests/bruno/bruno-to-postman-with-tests.spec.js
index 30bf33466..e8d91e053 100644
--- a/packages/bruno-converters/tests/bruno/bruno-to-postman-with-tests.spec.js
+++ b/packages/bruno-converters/tests/bruno/bruno-to-postman-with-tests.spec.js
@@ -7,7 +7,7 @@ describe('Bruno to Postman Converter with Tests and Scripts', () => {
     items: [
       {
         name: 'Request With Scripts and Tests',
-        type: 'http',
+        type: 'http-request',
         filename: 'request-with-scripts.bru',
         seq: 1,
         settings: {
diff --git a/packages/bruno-converters/tests/insomnia/insomnia-collection-v5.spec.js b/packages/bruno-converters/tests/insomnia/insomnia-collection-v5.spec.js
index e7be6dea8..3d73e8398 100644
--- a/packages/bruno-converters/tests/insomnia/insomnia-collection-v5.spec.js
+++ b/packages/bruno-converters/tests/insomnia/insomnia-collection-v5.spec.js
@@ -5,7 +5,7 @@ describe('insomnia-collection', () => {
   it('should correctly import a valid Insomnia v5 collection file', async () => {
     const brunoCollection = insomniaToBruno(insomniaCollection);
 
-    expect(brunoCollection).toMatchObject(expectedOutput)
+    expect(brunoCollection).toMatchObject(expectedOutput);
   });
 });
 
@@ -81,7 +81,7 @@ environments:
   data:
     var1: value1
     var2: value2
-`
+`;
 
 const expectedOutput = {
   environments: [
@@ -105,81 +105,81 @@ const expectedOutput = {
       ]
     }
   ],
-  "items": [
+  items: [
     {
-      "items": [
+      items: [
         {
-          "name": "Request1",
-          "request": {
-            "auth": {
-              "basic": null,
-              "bearer": null,
-              "digest": null,
-              "mode": "none",
+          name: 'Request1',
+          request: {
+            auth: {
+              basic: null,
+              bearer: null,
+              digest: null,
+              mode: 'none'
             },
-            "body": {
-              "formUrlEncoded": [],
-              "json": null,
-              "mode": "none",
-              "multipartForm": [],
-              "text": null,
-              "xml": null,
+            body: {
+              formUrlEncoded: [],
+              json: null,
+              mode: 'none',
+              multipartForm: [],
+              text: null,
+              xml: null
             },
-            "headers": [],
-            "method": "GET",
-            "params": [],
-            "url": "https://testbench-sanity.usebruno.com/ping"
+            headers: [],
+            method: 'GET',
+            params: [],
+            url: 'https://testbench-sanity.usebruno.com/ping'
           },
-          "seq": 1,
-          "type": "http-request",
-          "uid": "mockeduuidvalue123456",
-          "settings": {
-            "encodeUrl": true,
-          },
-        },
+          seq: 1,
+          type: 'http-request',
+          uid: 'mockeduuidvalue123456',
+          settings: {
+            encodeUrl: true
+          }
+        }
       ],
-      "name": "Folder1",
-      "type": "folder",
-      "uid": "mockeduuidvalue123456",
+      name: 'Folder1',
+      type: 'folder',
+      uid: 'mockeduuidvalue123456'
     },
     {
-      "items": [
+      items: [
         {
-          "name": "Request2",
-          "request": {
-            "auth": {
-              "basic": null,
-              "bearer": null,
-              "digest": null,
-              "mode": "none",
+          name: 'Request2',
+          request: {
+            auth: {
+              basic: null,
+              bearer: null,
+              digest: null,
+              mode: 'none'
             },
-            "body": {
-              "formUrlEncoded": [],
-              "json": null,
-              "mode": "none",
-              "multipartForm": [],
-              "text": null,
-              "xml": null,
+            body: {
+              formUrlEncoded: [],
+              json: null,
+              mode: 'none',
+              multipartForm: [],
+              text: null,
+              xml: null
             },
-            "headers": [],
-            "method": "GET",
-            "params": [],
-            "url": "https://testbench-sanity.usebruno.com/ping"
+            headers: [],
+            method: 'GET',
+            params: [],
+            url: 'https://testbench-sanity.usebruno.com/ping'
           },
-          "seq": 1,
-          "type": "http-request",
-          "uid": "mockeduuidvalue123456",
-          "settings": {
-            "encodeUrl": false,
-          },
-        },
+          seq: 1,
+          type: 'http-request',
+          uid: 'mockeduuidvalue123456',
+          settings: {
+            encodeUrl: false
+          }
+        }
       ],
-      "name": "Folder2",
-      "type": "folder",
-      "uid": "mockeduuidvalue123456",
-    },
+      name: 'Folder2',
+      type: 'folder',
+      uid: 'mockeduuidvalue123456'
+    }
   ],
-  "name": "Hello World Workspace Insomnia",
-  "uid": "mockeduuidvalue123456",
-  "version": "1",
-};
\ No newline at end of file
+  name: 'Hello World Workspace Insomnia',
+  uid: 'mockeduuidvalue123456',
+  version: '1'
+};
diff --git a/packages/bruno-converters/tests/insomnia/insomnia-collection.spec.js b/packages/bruno-converters/tests/insomnia/insomnia-collection.spec.js
index 15553aa2e..588083bc8 100644
--- a/packages/bruno-converters/tests/insomnia/insomnia-collection.spec.js
+++ b/packages/bruno-converters/tests/insomnia/insomnia-collection.spec.js
@@ -4,61 +4,61 @@ import insomniaToBruno from '../../src/insomnia/insomnia-to-bruno';
 describe('insomnia-collection', () => {
   it('should correctly import a valid Insomnia collection file', async () => {
     const brunoCollection = insomniaToBruno(insomniaCollection);
-    
-    expect(brunoCollection).toMatchObject(expectedOutput)
+
+    expect(brunoCollection).toMatchObject(expectedOutput);
   });
 });
 
 const insomniaCollection = {
-  "_type": "export",
-  "__export_format": 4,
-  "__export_date": "2024-05-20T10:02:44.123Z",
-  "__export_source": "insomnia.desktop.app:v2021.5.2",
-  "resources": [
+  _type: 'export',
+  __export_format: 4,
+  __export_date: '2024-05-20T10:02:44.123Z',
+  __export_source: 'insomnia.desktop.app:v2021.5.2',
+  resources: [
     {
-      "_id": "req_1",
-      "_type": "request",
-      "parentId": "fld_1",
-      "name": "Request1",
-      "method": "GET",
-      "url": "https://testbench-sanity.usebruno.com/ping",
-      "settingEncodeUrl": false,
-      "parameters": []
+      _id: 'req_1',
+      _type: 'request',
+      parentId: 'fld_1',
+      name: 'Request1',
+      method: 'GET',
+      url: 'https://testbench-sanity.usebruno.com/ping',
+      settingEncodeUrl: false,
+      parameters: []
     },
     {
-      "_id": "req_2",
-      "_type": "request",
-      "parentId": "fld_2",
-      "name": "Request2",
-      "method": "GET",
-      "url": "https://testbench-sanity.usebruno.com/ping",
-      "settingEncodeUrl": true,
-      "parameters": []
+      _id: 'req_2',
+      _type: 'request',
+      parentId: 'fld_2',
+      name: 'Request2',
+      method: 'GET',
+      url: 'https://testbench-sanity.usebruno.com/ping',
+      settingEncodeUrl: true,
+      parameters: []
     },
     {
-      "_id": "fld_1",
-      "_type": "request_group",
-      "parentId": "wrk_1",
-      "name": "Folder1"
+      _id: 'fld_1',
+      _type: 'request_group',
+      parentId: 'wrk_1',
+      name: 'Folder1'
     },
     {
-      "_id": "fld_2",
-      "_type": "request_group",
-      "parentId": "wrk_1",
-      "name": "Folder2"
+      _id: 'fld_2',
+      _type: 'request_group',
+      parentId: 'wrk_1',
+      name: 'Folder2'
     },
     {
-      "_id": "wrk_1",
-      "_type": "workspace",
-      "name": "Hello World Workspace Insomnia"
+      _id: 'wrk_1',
+      _type: 'workspace',
+      name: 'Hello World Workspace Insomnia'
     },
     {
-      "_id": "env_1",
-      "_type": "environment",
-      "parentId": "wrk_1",
-      "data": {
-        "var1": "value1",
-        "var2": "value2"
+      _id: 'env_1',
+      _type: 'environment',
+      parentId: 'wrk_1',
+      data: {
+        var1: 'value1',
+        var2: 'value2'
       }
     }
   ]
@@ -86,139 +86,139 @@ const expectedOutput = {
       ]
     }
   ],
-  "items": [
+  items: [
     {
-      "items": [
+      items: [
         {
-          "name": "Request1",
-          "request": {
-            "auth": {
-              "basic": null,
-              "bearer": null,
-              "digest": null,
-              "mode": "none",
+          name: 'Request1',
+          request: {
+            auth: {
+              basic: null,
+              bearer: null,
+              digest: null,
+              mode: 'none'
             },
-            "body": {
-              "formUrlEncoded": [],
-              "json": null,
-              "mode": "none",
-              "multipartForm": [],
-              "text": null,
-              "xml": null,
+            body: {
+              formUrlEncoded: [],
+              json: null,
+              mode: 'none',
+              multipartForm: [],
+              text: null,
+              xml: null
             },
-            "headers": [],
-            "method": "GET",
-            "params": [],
-            "url": "https://testbench-sanity.usebruno.com/ping"
-          },
-          "seq": 1,
-          "type": "http-request",
-          "uid": "mockeduuidvalue123456",
-          "settings": {
-            "encodeUrl": false,
+            headers: [],
+            method: 'GET',
+            params: [],
+            url: 'https://testbench-sanity.usebruno.com/ping'
           },
+          seq: 1,
+          type: 'http-request',
+          uid: 'mockeduuidvalue123456',
+          settings: {
+            encodeUrl: false
+          }
         },
         {
-          "name": "Request1",
-          "request": {
-            "auth": {
-              "basic": null,
-              "bearer": null,
-              "digest": null,
-              "mode": "none",
+          name: 'Request1',
+          request: {
+            auth: {
+              basic: null,
+              bearer: null,
+              digest: null,
+              mode: 'none'
             },
-            "body": {
-              "formUrlEncoded": [],
-              "json": null,
-              "mode": "none",
-              "multipartForm": [],
-              "text": null,
-              "xml": null,
+            body: {
+              formUrlEncoded: [],
+              json: null,
+              mode: 'none',
+              multipartForm: [],
+              text: null,
+              xml: null
             },
-            "headers": [],
-            "method": "GET",
-            "params": [],
-            "url": "https://testbench-sanity.usebruno.com/ping"
+            headers: [],
+            method: 'GET',
+            params: [],
+            url: 'https://testbench-sanity.usebruno.com/ping'
           },
-          "seq": 2,
-          "type": "http-request",
-          "uid": "mockeduuidvalue123456",
-          "settings": {
-            "encodeUrl": false,
-          },
-        },
+          seq: 2,
+          type: 'http-request',
+          uid: 'mockeduuidvalue123456',
+          settings: {
+            encodeUrl: false
+          }
+        }
       ],
-      "name": "Folder1",
-      "type": "folder",
-      "uid": "mockeduuidvalue123456",
+      name: 'Folder1',
+      type: 'folder',
+      uid: 'mockeduuidvalue123456'
     },
     {
-      "items": [
+      items: [
         {
-          "name": "Request2",
-          "request": {
-            "auth": {
-              "basic": null,
-              "bearer": null,
-              "digest": null,
-              "mode": "none",
+          name: 'Request2',
+          request: {
+            auth: {
+              basic: null,
+              bearer: null,
+              digest: null,
+              mode: 'none'
             },
-            "body": {
-              "formUrlEncoded": [],
-              "json": null,
-              "mode": "none",
-              "multipartForm": [],
-              "text": null,
-              "xml": null,
+            body: {
+              formUrlEncoded: [],
+              json: null,
+              mode: 'none',
+              multipartForm: [],
+              text: null,
+              xml: null
             },
-            "headers": [],
-            "method": "GET",
-            "params": [],
-            "url": "https://testbench-sanity.usebruno.com/ping"
-          },
-          "seq": 1,
-          "type": "http-request",
-          "uid": "mockeduuidvalue123456",
-          "settings": {
-            "encodeUrl": true,
+            headers: [],
+            method: 'GET',
+            params: [],
+            url: 'https://testbench-sanity.usebruno.com/ping'
           },
+          seq: 1,
+          type: 'http-request',
+          uid: 'mockeduuidvalue123456',
+          settings: {
+            encodeUrl: true
+          }
         },
         {
-          "name": "Request2",
-          "request": {
-            "auth": {
-              "basic": null,
-              "bearer": null,
-              "digest": null,
-              "mode": "none",
+          name: 'Request2',
+          request: {
+            auth: {
+              basic: null,
+              bearer: null,
+              digest: null,
+              mode: 'none'
             },
-            "body": {
-              "formUrlEncoded": [],
-              "json": null,
-              "mode": "none",
-              "multipartForm": [],
-              "text": null,
-              "xml": null,
+            body: {
+              formUrlEncoded: [],
+              json: null,
+              mode: 'none',
+              multipartForm: [],
+              text: null,
+              xml: null
             },
-            "headers": [],
-            "method": "GET",
-            "params": [],
-            "url": "https://testbench-sanity.usebruno.com/ping"
+            headers: [],
+            method: 'GET',
+            params: [],
+            url: 'https://testbench-sanity.usebruno.com/ping'
           },
-          "seq": 2,
-          "type": "http-request",
-          "uid": "mockeduuidvalue123456",
-          "settings": {
-            "encodeUrl": true,
-          },
-        },
+          seq: 2,
+          type: 'http-request',
+          uid: 'mockeduuidvalue123456',
+          settings: {
+            encodeUrl: true
+          }
+        }
       ],
-      "name": "Folder2",
-      "type": "folder",
-      "uid": "mockeduuidvalue123456",
-    },
+      name: 'Folder2',
+      type: 'folder',
+      uid: 'mockeduuidvalue123456'
+    }
   ],
-  "name": "Hello World Workspace Insomnia",
-  "uid": "mockeduuidvalue123456",
-  "version": "1",
-};
\ No newline at end of file
+  name: 'Hello World Workspace Insomnia',
+  uid: 'mockeduuidvalue123456',
+  version: '1'
+};
diff --git a/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-auth.spec.js b/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-auth.spec.js
index f999cdfae..1ca62b70a 100644
--- a/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-auth.spec.js
+++ b/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-auth.spec.js
@@ -59,7 +59,7 @@ servers:
     const req = collection.items[0];
     expect(req.request.auth.mode).toBe('apikey');
     expect(req.request.auth.apikey.placement).toBe('queryparams');
-    const hasQueryParam = req.request.params.some(p => p.name === 'api_key' && p.type === 'query');
+    const hasQueryParam = req.request.params.some((p) => p.name === 'api_key' && p.type === 'query');
     expect(hasQueryParam).toBe(true);
   });
 
@@ -88,7 +88,7 @@ servers:
     const { items: [req] } = openApiToBruno(spec);
     expect(req.request.auth.mode).toBe('apikey');
     expect(req.request.auth.apikey.placement).toBe('header');
-    const apiKeyHeader = req.request.headers.find(h => h.name === 'DEMO_API_KEY');
+    const apiKeyHeader = req.request.headers.find((h) => h.name === 'DEMO_API_KEY');
     expect(apiKeyHeader).toBeDefined();
     expect(apiKeyHeader.value).toBe('{{apiKey}}');
   });
diff --git a/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-circular-references.spec.js b/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-circular-references.spec.js
index debaedc72..feee497b4 100644
--- a/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-circular-references.spec.js
+++ b/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-circular-references.spec.js
@@ -16,233 +16,233 @@ describe('openapi-circular-references', () => {
 });
 
 const circularRefsData = {
-  "components": {
-    "schemas": {
-      "schema_1": {
-        "additionalProperties": false,
-        "description": "schema_1",
-        "properties": {
-          "conditions": {
-            "$ref": "#/components/schemas/schema_1"
+  components: {
+    schemas: {
+      schema_1: {
+        additionalProperties: false,
+        description: 'schema_1',
+        properties: {
+          conditions: {
+            $ref: '#/components/schemas/schema_1'
           }
         },
-        "type": "object"
+        type: 'object'
       },
-      "schema_2": {
-        "additionalProperties": false,
-        "description": "schema_2",
-        "properties": {
-          "conditionGroup": {
-            "description": "nested schema_1",
-            "items": { "$ref": "#/components/schemas/schema_1" },
-            "type": "array"
+      schema_2: {
+        additionalProperties: false,
+        description: 'schema_2',
+        properties: {
+          conditionGroup: {
+            description: 'nested schema_1',
+            items: { $ref: '#/components/schemas/schema_1' },
+            type: 'array'
           },
-          "operation": {
-            "description": "operation",
-            "enum": ["ANY", "ALL"],
-            "type": "string"
+          operation: {
+            description: 'operation',
+            enum: ['ANY', 'ALL'],
+            type: 'string'
           }
         },
-        "type": "object"
+        type: 'object'
       }
     }
   },
-  "info": {
-    "description": "circular reference openapi sample json spec",
-    "title": "circular reference openapi sample json spec",
-    "version": "0.1"
+  info: {
+    description: 'circular reference openapi sample json spec',
+    title: 'circular reference openapi sample json spec',
+    version: '0.1'
   },
-  "openapi": "3.0.1",
-  "paths": {
-    "/": {
-      "post": {
-        "deprecated": false,
-        "description": "echo ping api",
-        "operationId": "echo ping",
-        "parameters": [],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/schema_1"
+  openapi: '3.0.1',
+  paths: {
+    '/': {
+      post: {
+        deprecated: false,
+        description: 'echo ping api',
+        operationId: 'echo ping',
+        parameters: [],
+        requestBody: {
+          content: {
+            'application/json': {
+              schema: {
+                $ref: '#/components/schemas/schema_1'
               }
             }
           },
-          "description": "echo ping api",
-          "required": true
+          description: 'echo ping api',
+          required: true
         },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "example": "ping"
+        responses: {
+          200: {
+            content: {
+              'application/json': {
+                example: 'ping'
               }
             },
-            "description": "Returned if the request is successful."
+            description: 'Returned if the request is successful.'
           }
         }
       }
     }
   },
-  "servers": [{ "url": "https://echo.usebruno.com" }]
+  servers: [{ url: 'https://echo.usebruno.com' }]
 };
 
 // More complex circular reference test with a longer chain
 const complexCircularRefsData = {
-  "components": {
-    "schemas": {
-      "schema_1": {
-        "additionalProperties": false,
-        "description": "schema_1",
-        "properties": {
-          "conditionGroup": {
-            "description": "nested schema_1",
-            "items": { "$ref": "#/components/schemas/schema_2" },
-            "type": "array"
+  components: {
+    schemas: {
+      schema_1: {
+        additionalProperties: false,
+        description: 'schema_1',
+        properties: {
+          conditionGroup: {
+            description: 'nested schema_1',
+            items: { $ref: '#/components/schemas/schema_2' },
+            type: 'array'
           }
         },
-        "type": "object"
+        type: 'object'
       },
-      "schema_2": {
-        "additionalProperties": false,
-        "description": "schema_2",
-        "properties": {
-          "conditionGroup": {
-            "description": "nested schema_2",
-            "items": { "$ref": "#/components/schemas/schema_3" },
-            "type": "array"
+      schema_2: {
+        additionalProperties: false,
+        description: 'schema_2',
+        properties: {
+          conditionGroup: {
+            description: 'nested schema_2',
+            items: { $ref: '#/components/schemas/schema_3' },
+            type: 'array'
           }
         },
-        "type": "object"
+        type: 'object'
       },
-      "schema_3": {
-        "additionalProperties": false,
-        "description": "schema_3",
-        "properties": {
-          "conditionGroup": {
-            "description": "nested schema_3",
-            "items": { "$ref": "#/components/schemas/schema_4" },
-            "type": "array"
+      schema_3: {
+        additionalProperties: false,
+        description: 'schema_3',
+        properties: {
+          conditionGroup: {
+            description: 'nested schema_3',
+            items: { $ref: '#/components/schemas/schema_4' },
+            type: 'array'
           }
         },
-        "type": "object"
+        type: 'object'
       },
-      "schema_4": {
-        "additionalProperties": false,
-        "description": "schema_4",
-        "properties": {
-          "conditionGroup": {
-            "description": "nested schema_4",
-            "items": { "$ref": "#/components/schemas/schema_5" },
-            "type": "array"
+      schema_4: {
+        additionalProperties: false,
+        description: 'schema_4',
+        properties: {
+          conditionGroup: {
+            description: 'nested schema_4',
+            items: { $ref: '#/components/schemas/schema_5' },
+            type: 'array'
           }
         },
-        "type": "object"
+        type: 'object'
       },
-      "schema_5": {
-        "additionalProperties": false,
-        "description": "schema_4",
-        "properties": {
-          "conditionGroup": {
-            "description": "nested schema_5",
-            "items": { "$ref": "#/components/schemas/schema_1" },
-            "type": "array"
+      schema_5: {
+        additionalProperties: false,
+        description: 'schema_4',
+        properties: {
+          conditionGroup: {
+            description: 'nested schema_5',
+            items: { $ref: '#/components/schemas/schema_1' },
+            type: 'array'
           }
         },
-        "type": "object"
+        type: 'object'
       },
-      "schema_6": {
-        "additionalProperties": false,
-        "description": "schema_3",
-        "properties": {
-          "conditionGroup": {
-            "description": "nested schema_3",
-            "items": { "$ref": "#/components/schemas/schema_1" },
-            "type": "array"
+      schema_6: {
+        additionalProperties: false,
+        description: 'schema_3',
+        properties: {
+          conditionGroup: {
+            description: 'nested schema_3',
+            items: { $ref: '#/components/schemas/schema_1' },
+            type: 'array'
           },
-          "operation": {
-            "description": "operation",
-            "enum": ["ANY", "ALL"],
-            "type": "string"
+          operation: {
+            description: 'operation',
+            enum: ['ANY', 'ALL'],
+            type: 'string'
           }
         },
-        "type": "object"
+        type: 'object'
       }
     }
   },
-  "info": {
-    "description": "circular reference openapi sample json spec",
-    "title": "circular reference openapi sample json spec",
-    "version": "0.1"
+  info: {
+    description: 'circular reference openapi sample json spec',
+    title: 'circular reference openapi sample json spec',
+    version: '0.1'
   },
-  "openapi": "3.0.1",
-  "paths": {
-    "/": {
-      "post": {
-        "deprecated": false,
-        "description": "echo ping api",
-        "operationId": "echo ping",
-        "parameters": [],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/schema_1"
+  openapi: '3.0.1',
+  paths: {
+    '/': {
+      post: {
+        deprecated: false,
+        description: 'echo ping api',
+        operationId: 'echo ping',
+        parameters: [],
+        requestBody: {
+          content: {
+            'application/json': {
+              schema: {
+                $ref: '#/components/schemas/schema_1'
               }
             }
           },
-          "description": "echo ping api",
-          "required": true
+          description: 'echo ping api',
+          required: true
         },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "example": "ping"
+        responses: {
+          200: {
+            content: {
+              'application/json': {
+                example: 'ping'
               }
             },
-            "description": "Returned if the request is successful."
+            description: 'Returned if the request is successful.'
           }
         }
       }
     }
   },
-  "servers": [{ "url": "https://echo.usebruno.com" }]
+  servers: [{ url: 'https://echo.usebruno.com' }]
 };
 
 const circularRefsOutput = {
-  "environments": [
+  environments: [
     {
-      "name": "Environment 1",
-      "variables": [
+      name: 'Environment 1',
+      variables: [
         {
-          "enabled": true,
-          "name": "baseUrl",
-          "secret": false,
-          "type": "text",
-          "value": "https://echo.usebruno.com",
-        },
-      ],
-    },
-  ],
-  "items": [
-    {
-      "name": "echo ping",
-      "type": "http-request",
-      "request": {
-        "url": "{{baseUrl}}/",
-        "method": "POST",
-        "auth": {
-          "mode": "inherit",
-        },
-        "headers": [],
-        "params": [],
-        "body": {
-          "mode": "json",
+          enabled: true,
+          name: 'baseUrl',
+          secret: false,
+          type: 'text',
+          value: 'https://echo.usebruno.com'
         }
-      },
-    },
+      ]
+    }
   ],
-  "name": "circular reference openapi sample json spec",
-  "version": "1",
-};
\ No newline at end of file
+  items: [
+    {
+      name: 'echo ping',
+      type: 'http-request',
+      request: {
+        url: '{{baseUrl}}/',
+        method: 'POST',
+        auth: {
+          mode: 'inherit'
+        },
+        headers: [],
+        params: [],
+        body: {
+          mode: 'json'
+        }
+      }
+    }
+  ],
+  name: 'circular reference openapi sample json spec',
+  version: '1'
+};
diff --git a/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-to-bruno.spec.js b/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-to-bruno.spec.js
index 717e9cace..d2e087961 100644
--- a/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-to-bruno.spec.js
+++ b/packages/bruno-converters/tests/openapi/openapi-to-bruno/openapi-to-bruno.spec.js
@@ -10,7 +10,7 @@ describe('openapi-collection', () => {
 
   it('should set auth mode to inherit when no security is defined in the collection', () => {
     const brunoCollection = openApiToBruno(openApiCollectionString);
-    
+
     // The openApiCollectionString has no security defined, so auth mode should be 'inherit'
     expect(brunoCollection.items[0].items[0].request.auth.mode).toBe('inherit');
   });
@@ -234,6 +234,32 @@ servers:
       expect(result.items[0].root.request.auth.mode).toBe('inherit');
     });
   });
+
+  it('should handle requestBody with empty content object (undefined mimeType)', () => {
+    const openApiWithEmptyContent = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API with empty requestBody content'
+paths:
+  /test:
+    post:
+      summary: 'Test endpoint with empty content'
+      operationId: 'testEndpoint'
+      requestBody:
+        content: {}
+      responses:
+        '200':
+          description: 'OK'
+servers:
+  - url: 'https://example.com'
+`;
+    const result = openApiToBruno(openApiWithEmptyContent);
+    expect(result.items[0].request.body.mode).toBe('none');
+    expect(result.items[0].request.body.json).toBe(null);
+    expect(result.items[0].request.body.text).toBe(null);
+    expect(result.items[0].request.body.xml).toBe(null);
+  });
 });
 
 const openApiCollectionString = `
@@ -273,61 +299,61 @@ servers:
 `;
 
 const expectedOutput = {
-  "environments": [
+  environments: [
     {
-      "name": "Environment 1",
-      "uid": "mockeduuidvalue123456",
-      "variables": [
+      name: 'Environment 1',
+      uid: 'mockeduuidvalue123456',
+      variables: [
         {
-          "enabled": true,
-          "name": "baseUrl",
-          "secret": false,
-          "type": "text",
-          "uid": "mockeduuidvalue123456",
+          enabled: true,
+          name: 'baseUrl',
+          secret: false,
+          type: 'text',
+          uid: 'mockeduuidvalue123456',
           value: 'https://echo.usebruno.com'
-        },
-      ],
-    },
+        }
+      ]
+    }
   ],
-  "items": [
+  items: [
     {
-      "items": [
+      items: [
         {
-          "name": "Request1 and Request2",
-          "request": {
-            "auth": {
-              "basic": null,
-              "bearer": null,
-              "digest": null,
-              "mode": "inherit",
+          name: 'Request1 and Request2',
+          request: {
+            auth: {
+              basic: null,
+              bearer: null,
+              digest: null,
+              mode: 'inherit'
             },
-            "body": {
-              "formUrlEncoded": [],
-              "json": null,
-              "mode": "none",
-              "multipartForm": [],
-              "text": null,
-              "xml": null,
+            body: {
+              formUrlEncoded: [],
+              json: null,
+              mode: 'none',
+              multipartForm: [],
+              text: null,
+              xml: null
             },
-            "headers": [],
-            "method": "GET",
-            "params": [],
-            "script": {
-              "res": null,
+            headers: [],
+            method: 'GET',
+            params: [],
+            script: {
+              res: null
             },
-            "url": "{{baseUrl}}/get",
+            url: '{{baseUrl}}/get'
           },
-          "seq": 1,
-          "type": "http-request",
-          "uid": "mockeduuidvalue123456",
-        },
+          seq: 1,
+          type: 'http-request',
+          uid: 'mockeduuidvalue123456'
+        }
       ],
-      "name": "Folder1",
-      "type": "folder",
-      "uid": "mockeduuidvalue123456",
-    },
+      name: 'Folder1',
+      type: 'folder',
+      uid: 'mockeduuidvalue123456'
+    }
   ],
-  "name": "Hello World OpenAPI",
-  "uid": "mockeduuidvalue123456",
-  "version": "1",
-};
\ No newline at end of file
+  name: 'Hello World OpenAPI',
+  uid: 'mockeduuidvalue123456',
+  version: '1'
+};
diff --git a/packages/bruno-converters/tests/openapi/openapi-with-examples.spec.js b/packages/bruno-converters/tests/openapi/openapi-with-examples.spec.js
index 2948bbca6..be0ca476e 100644
--- a/packages/bruno-converters/tests/openapi/openapi-with-examples.spec.js
+++ b/packages/bruno-converters/tests/openapi/openapi-with-examples.spec.js
@@ -53,10 +53,10 @@ describe('OpenAPI with Examples', () => {
     const createUserRequest = brunoCollection.items.find((item) => item.name === 'Create a new user');
     expect(createUserRequest).toBeDefined();
     expect(createUserRequest.examples).toBeDefined();
-    expect(createUserRequest.examples).toHaveLength(2);
+    expect(createUserRequest.examples).toHaveLength(4);
 
     // Check response examples
-    const createdExample = createUserRequest.examples.find((ex) => ex.name === 'User Created');
+    const createdExample = createUserRequest.examples.find((ex) => ex.name === 'User Created (Valid User)');
     expect(createdExample).toBeDefined();
     expect(createdExample.response.status).toBe('201');
     expect(createdExample.response.statusText).toBe('Created');
@@ -149,7 +149,7 @@ servers:
     expect(JSON.parse(example.response.body.content)).toEqual({ message: 'test' });
   });
 
-  it('should not create examples array if no examples are present', () => {
+  it('should create examples without specified request body, when response is present', () => {
     const openApiWithoutExamples = `
 openapi: '3.0.0'
 info:
@@ -174,7 +174,11 @@ servers:
     const brunoCollection = openApiToBruno(openApiWithoutExamples);
     const request = brunoCollection.items[0];
 
-    expect(request.examples).toBeUndefined();
+    expect(request.examples).toHaveLength(1);
+    const example = request.examples[0];
+    expect(example.name).toBe('200 Response');
+    expect(example.description).toBe('OK');
+    expect(example.response.body.type).toBe('json');
   });
 
   it('should support path-based grouping when specified', () => {
@@ -301,4 +305,507 @@ servers:
     expect(productsFolder.type).toBe('folder');
     expect(productsFolder.items).toHaveLength(1); // GET /products
   });
+
+  describe('Request Body Examples', () => {
+    it('should match request body examples by key when response example key matches', () => {
+      const openApiWithMatchingKeys = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API with Matching Keys'
+paths:
+  /users:
+    post:
+      summary: 'Create user'
+      operationId: 'createUser'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            examples:
+              valid_user:
+                summary: 'Valid User'
+                value:
+                  name: 'John Doe'
+                  email: 'john@example.com'
+              invalid_user:
+                summary: 'Invalid User'
+                value:
+                  name: ''
+                  email: 'invalid'
+      responses:
+        '201':
+          description: 'Created'
+          content:
+            application/json:
+              examples:
+                valid_user:
+                  summary: 'User Created'
+                  value:
+                    id: 123
+                    name: 'John Doe'
+                invalid_user:
+                  summary: 'Validation Error'
+                  value:
+                    error: 'Invalid input'
+servers:
+  - url: 'https://api.example.com'
+`;
+
+      const brunoCollection = openApiToBruno(openApiWithMatchingKeys);
+      const request = brunoCollection.items[0];
+
+      expect(request.examples).toBeDefined();
+      expect(request.examples).toHaveLength(2);
+
+      // Check that matching keys are used
+      const validUserExample = request.examples.find((ex) => ex.name === 'User Created');
+      expect(validUserExample).toBeDefined();
+      expect(validUserExample.request.body.mode).toBe('json');
+      expect(JSON.parse(validUserExample.request.body.json)).toEqual({
+        name: 'John Doe',
+        email: 'john@example.com'
+      });
+      expect(JSON.parse(validUserExample.response.body.content)).toEqual({
+        id: 123,
+        name: 'John Doe'
+      });
+
+      const invalidUserExample = request.examples.find((ex) => ex.name === 'Validation Error');
+      expect(invalidUserExample).toBeDefined();
+      expect(JSON.parse(invalidUserExample.request.body.json)).toEqual({
+        name: '',
+        email: 'invalid'
+      });
+      expect(JSON.parse(invalidUserExample.response.body.content)).toEqual({
+        error: 'Invalid input'
+      });
+    });
+
+    it('should create all combinations when response example keys do not match request body examples', () => {
+      const openApiWithNonMatchingKeys = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API with Non-Matching Keys'
+paths:
+  /users:
+    post:
+      summary: 'Create user'
+      operationId: 'createUser'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            examples:
+              valid_user:
+                summary: 'Valid User'
+                value:
+                  name: 'John Doe'
+                  email: 'john@example.com'
+              invalid_user:
+                summary: 'Invalid User'
+                value:
+                  name: ''
+                  email: 'invalid'
+      responses:
+        '201':
+          description: 'Created'
+          content:
+            application/json:
+              examples:
+                created:
+                  summary: 'User Created'
+                  value:
+                    id: 123
+        '400':
+          description: 'Bad Request'
+          content:
+            application/json:
+              examples:
+                error:
+                  summary: 'Validation Error'
+                  value:
+                    error: 'Invalid input'
+servers:
+  - url: 'https://api.example.com'
+`;
+
+      const brunoCollection = openApiToBruno(openApiWithNonMatchingKeys);
+      const request = brunoCollection.items[0];
+
+      expect(request.examples).toBeDefined();
+      // Should have 4 examples: 2 response examples × 2 request body examples
+      expect(request.examples).toHaveLength(4);
+
+      // Check combinations for 201 response
+      const createdWithValid = request.examples.find((ex) => ex.name === 'User Created (Valid User)');
+      expect(createdWithValid).toBeDefined();
+      expect(createdWithValid.response.status).toBe('201');
+      expect(JSON.parse(createdWithValid.request.body.json)).toEqual({
+        name: 'John Doe',
+        email: 'john@example.com'
+      });
+
+      const createdWithInvalid = request.examples.find((ex) => ex.name === 'User Created (Invalid User)');
+      expect(createdWithInvalid).toBeDefined();
+      expect(createdWithInvalid.response.status).toBe('201');
+      expect(JSON.parse(createdWithInvalid.request.body.json)).toEqual({
+        name: '',
+        email: 'invalid'
+      });
+
+      // Check combinations for 400 response
+      const errorWithValid = request.examples.find((ex) => ex.name === 'Validation Error (Valid User)');
+      expect(errorWithValid).toBeDefined();
+      expect(errorWithValid.response.status).toBe('400');
+
+      const errorWithInvalid = request.examples.find((ex) => ex.name === 'Validation Error (Invalid User)');
+      expect(errorWithInvalid).toBeDefined();
+      expect(errorWithInvalid.response.status).toBe('400');
+    });
+
+    it('should use single request body example for all response examples', () => {
+      const openApiWithSingleRequestBody = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API with Single Request Body'
+paths:
+  /users:
+    post:
+      summary: 'Create user'
+      operationId: 'createUser'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            example:
+              name: 'John Doe'
+              email: 'john@example.com'
+      responses:
+        '201':
+          description: 'Created'
+          content:
+            application/json:
+              examples:
+                created:
+                  summary: 'User Created'
+                  value:
+                    id: 123
+                duplicate:
+                  summary: 'Duplicate User'
+                  value:
+                    error: 'User already exists'
+servers:
+  - url: 'https://api.example.com'
+`;
+
+      const brunoCollection = openApiToBruno(openApiWithSingleRequestBody);
+      const request = brunoCollection.items[0];
+
+      expect(request.examples).toBeDefined();
+      expect(request.examples).toHaveLength(2);
+
+      // Both examples should have the same request body
+      const createdExample = request.examples.find((ex) => ex.name === 'User Created');
+      expect(createdExample).toBeDefined();
+      expect(createdExample.request.body.mode).toBe('json');
+      expect(JSON.parse(createdExample.request.body.json)).toEqual({
+        name: 'John Doe',
+        email: 'john@example.com'
+      });
+
+      const duplicateExample = request.examples.find((ex) => ex.name === 'Duplicate User');
+      expect(duplicateExample).toBeDefined();
+      expect(JSON.parse(duplicateExample.request.body.json)).toEqual({
+        name: 'John Doe',
+        email: 'john@example.com'
+      });
+    });
+
+    it('should use schema-based request body for all response examples', () => {
+      const openApiWithSchemaRequestBody = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API with Schema Request Body'
+paths:
+  /users:
+    post:
+      summary: 'Create user'
+      operationId: 'createUser'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - name
+                - email
+              properties:
+                name:
+                  type: string
+                  example: 'John Doe'
+                email:
+                  type: string
+                  format: email
+                  example: 'john@example.com'
+      responses:
+        '201':
+          description: 'Created'
+          content:
+            application/json:
+              examples:
+                created:
+                  summary: 'User Created'
+                  value:
+                    id: 123
+                error:
+                  summary: 'Error Response'
+                  value:
+                    error: 'Something went wrong'
+servers:
+  - url: 'https://api.example.com'
+`;
+
+      const brunoCollection = openApiToBruno(openApiWithSchemaRequestBody);
+      const request = brunoCollection.items[0];
+
+      expect(request.examples).toBeDefined();
+      expect(request.examples).toHaveLength(2);
+
+      // Both examples should have request body generated from schema
+      const createdExample = request.examples.find((ex) => ex.name === 'User Created');
+      expect(createdExample).toBeDefined();
+      expect(createdExample.request.body.mode).toBe('json');
+      const requestBody = JSON.parse(createdExample.request.body.json);
+      expect(requestBody).toHaveProperty('name');
+      expect(requestBody).toHaveProperty('email');
+
+      const errorExample = request.examples.find((ex) => ex.name === 'Error Response');
+      expect(errorExample).toBeDefined();
+      expect(JSON.parse(errorExample.request.body.json)).toEqual(requestBody);
+    });
+
+    it('should handle request body examples with different content types', () => {
+      const openApiWithDifferentRequestBodyTypes = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API with Different Request Body Types'
+paths:
+  /data:
+    post:
+      summary: 'Post data'
+      operationId: 'postData'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            examples:
+              json_data:
+                summary: 'JSON Data'
+                value:
+                  message: 'Hello'
+          text/plain:
+            examples:
+              text_data:
+                summary: 'Text Data'
+                value: 'Hello World'
+      responses:
+        '200':
+          description: 'OK'
+          content:
+            application/json:
+              examples:
+                success:
+                  summary: 'Success'
+                  value:
+                    status: 'ok'
+servers:
+  - url: 'https://api.example.com'
+`;
+
+      const brunoCollection = openApiToBruno(openApiWithDifferentRequestBodyTypes);
+      const request = brunoCollection.items[0];
+
+      expect(request.examples).toBeDefined();
+      // Should create combinations: 1 response × 2 request body examples = 2 examples
+      expect(request.examples).toHaveLength(2);
+
+      const jsonExample = request.examples.find((ex) => ex.name === 'Success (JSON Data)');
+      expect(jsonExample).toBeDefined();
+      expect(jsonExample.request.body.mode).toBe('json');
+      expect(JSON.parse(jsonExample.request.body.json)).toEqual({ message: 'Hello' });
+
+      const textExample = request.examples.find((ex) => ex.name === 'Success (Text Data)');
+      expect(textExample).toBeDefined();
+      expect(textExample.request.body.mode).toBe('text');
+      expect(textExample.request.body.text).toBe('Hello World');
+    });
+
+    it('should handle mixed matching and non-matching request body examples', () => {
+      const openApiWithMixedMatching = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API with Mixed Matching'
+paths:
+  /users:
+    post:
+      summary: 'Create user'
+      operationId: 'createUser'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            examples:
+              valid_user:
+                summary: 'Valid User'
+                value:
+                  name: 'John Doe'
+                  email: 'john@example.com'
+              invalid_user:
+                summary: 'Invalid User'
+                value:
+                  name: ''
+                  email: 'invalid'
+      responses:
+        '201':
+          description: 'Created'
+          content:
+            application/json:
+              examples:
+                valid_user:
+                  summary: 'User Created'
+                  value:
+                    id: 123
+                unmatched:
+                  summary: 'Unmatched Response'
+                  value:
+                    id: 456
+servers:
+  - url: 'https://api.example.com'
+`;
+
+      const brunoCollection = openApiToBruno(openApiWithMixedMatching);
+      const request = brunoCollection.items[0];
+
+      expect(request.examples).toBeDefined();
+      // Should have: 1 matched (valid_user) + 2 combinations for unmatched (unmatched × 2 request body examples) = 3
+      expect(request.examples).toHaveLength(3);
+
+      // Matched example
+      const matchedExample = request.examples.find((ex) => ex.name === 'User Created');
+      expect(matchedExample).toBeDefined();
+      expect(JSON.parse(matchedExample.request.body.json)).toEqual({
+        name: 'John Doe',
+        email: 'john@example.com'
+      });
+
+      // Unmatched combinations
+      const unmatchedWithValid = request.examples.find((ex) => ex.name === 'Unmatched Response (Valid User)');
+      expect(unmatchedWithValid).toBeDefined();
+
+      const unmatchedWithInvalid = request.examples.find((ex) => ex.name === 'Unmatched Response (Invalid User)');
+      expect(unmatchedWithInvalid).toBeDefined();
+    });
+
+    it('should not create request body when no request body is defined', () => {
+      const openApiWithoutRequestBody = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API without Request Body'
+paths:
+  /users:
+    get:
+      summary: 'Get users'
+      operationId: 'getUsers'
+      responses:
+        '200':
+          description: 'OK'
+          content:
+            application/json:
+              examples:
+                success:
+                  summary: 'Success'
+                  value:
+                    users: []
+servers:
+  - url: 'https://api.example.com'
+`;
+
+      const brunoCollection = openApiToBruno(openApiWithoutRequestBody);
+      const request = brunoCollection.items[0];
+
+      expect(request.examples).toBeDefined();
+      expect(request.examples).toHaveLength(1);
+
+      const example = request.examples[0];
+      expect(example.request.body.mode).toBe('none');
+      expect(example.request.body.json).toBeNull();
+    });
+
+    it('should handle request body with singular example and multiple response examples', () => {
+      const openApiWithSingularExample = `
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: 'API with Singular Example'
+paths:
+  /users:
+    post:
+      summary: 'Create user'
+      operationId: 'createUser'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            example:
+              name: 'Jane Doe'
+              email: 'jane@example.com'
+      responses:
+        '201':
+          description: 'Created'
+          content:
+            application/json:
+              examples:
+                created:
+                  summary: 'User Created'
+                  value:
+                    id: 1
+                duplicate:
+                  summary: 'Duplicate'
+                  value:
+                    id: 2
+        '400':
+          description: 'Bad Request'
+          content:
+            application/json:
+              examples:
+                error:
+                  summary: 'Error'
+                  value:
+                    error: 'Bad request'
+servers:
+  - url: 'https://api.example.com'
+`;
+
+      const brunoCollection = openApiToBruno(openApiWithSingularExample);
+      const request = brunoCollection.items[0];
+
+      expect(request.examples).toBeDefined();
+      expect(request.examples).toHaveLength(3);
+
+      // All examples should have the same request body
+      const requestBodyValue = { name: 'Jane Doe', email: 'jane@example.com' };
+      request.examples.forEach((example) => {
+        expect(example.request.body.mode).toBe('json');
+        expect(JSON.parse(example.request.body.json)).toEqual(requestBodyValue);
+      });
+    });
+  });
 });
diff --git a/packages/bruno-converters/tests/postman/bruno-to-postman.spec.js b/packages/bruno-converters/tests/postman/bruno-to-postman.spec.js
index 417c527b2..3997e37fb 100644
--- a/packages/bruno-converters/tests/postman/bruno-to-postman.spec.js
+++ b/packages/bruno-converters/tests/postman/bruno-to-postman.spec.js
@@ -1,10 +1,10 @@
-import { sanitizeUrl, transformUrl, brunoToPostman } from "../../src/postman/bruno-to-postman";
+import { sanitizeUrl, transformUrl, brunoToPostman } from '../../src/postman/bruno-to-postman';
 
 describe('transformUrl', () => {
   it('should handle basic URL with path variables', () => {
     const url = 'https://example.com/{{username}}/api/resource/:id';
     const params = [
-      { name: 'id', value: '123', type: 'path' },
+      { name: 'id', value: '123', type: 'path' }
     ];
 
     const result = transformUrl(url, params);
@@ -16,7 +16,7 @@ describe('transformUrl', () => {
       path: ['{{username}}', 'api', 'resource', ':id'],
       query: [],
       variable: [
-        { key: 'id', value: '123' },
+        { key: 'id', value: '123' }
       ]
     });
   });
diff --git a/packages/bruno-converters/tests/postman/postman-env-to-bruno-env.spec.js b/packages/bruno-converters/tests/postman/postman-env-to-bruno-env.spec.js
index d1831b480..91421e478 100644
--- a/packages/bruno-converters/tests/postman/postman-env-to-bruno-env.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-env-to-bruno-env.spec.js
@@ -4,20 +4,20 @@ import postmanToBrunoEnvironment from '../../src/postman/postman-env-to-bruno-en
 describe('postmanToBrunoEnvironment Function', () => {
   it('should correctly import a valid Postman environment file', async () => {
     const postmanEnvironment = {
-      "id": "some-id",
-      "name": "My Environment",
-      "values": [
+      id: 'some-id',
+      name: 'My Environment',
+      values: [
         {
-          "key": "var1",
-          "value": "value1",
-          "enabled": true,
-          "type": "text"
+          key: 'var1',
+          value: 'value1',
+          enabled: true,
+          type: 'text'
         },
         {
-          "key": "var2",
-          "value": "value2",
-          "enabled": false,
-          "type": "secret"
+          key: 'var2',
+          value: 'value2',
+          enabled: false,
+          type: 'secret'
         }
       ]
     };
@@ -33,7 +33,7 @@ describe('postmanToBrunoEnvironment Function', () => {
           enabled: true,
           secret: false,
           type: 'text',
-          uid: "mockeduuidvalue123456",
+          uid: 'mockeduuidvalue123456'
         },
         {
           name: 'var2',
@@ -41,9 +41,9 @@ describe('postmanToBrunoEnvironment Function', () => {
           enabled: false,
           secret: true,
           type: 'text',
-          uid: "mockeduuidvalue123456",
-        },
-      ],
+          uid: 'mockeduuidvalue123456'
+        }
+      ]
     };
 
     expect(brunoEnvironment).toEqual(expectedEnvironment);
@@ -51,28 +51,28 @@ describe('postmanToBrunoEnvironment Function', () => {
 
   it('should handle falsy values in environment variables', async () => {
     const postmanEnvironment = {
-      "id": "some-id",
-      "name": "My Environment",
-      "values": [
+      id: 'some-id',
+      name: 'My Environment',
+      values: [
         {
-          "enabled": true,
-          "type": "text"
+          enabled: true,
+          type: 'text'
         },
         {
-          "value": "",
-          "enabled": true,
-          "type": "text"
+          value: '',
+          enabled: true,
+          type: 'text'
         },
         {
-          "key": "",
-          "enabled": true,
-          "type": "text"
+          key: '',
+          enabled: true,
+          type: 'text'
         },
         {
-          "key": "",
-          "value": "",
-          "enabled": true,
-          "type": "text"
+          key: '',
+          value: '',
+          enabled: true,
+          type: 'text'
         }
       ]
     };
@@ -88,7 +88,7 @@ describe('postmanToBrunoEnvironment Function', () => {
           enabled: true,
           secret: false,
           type: 'text',
-          uid: "mockeduuidvalue123456",
+          uid: 'mockeduuidvalue123456'
         },
         {
           name: '',
@@ -96,7 +96,7 @@ describe('postmanToBrunoEnvironment Function', () => {
           enabled: true,
           secret: false,
           type: 'text',
-          uid: "mockeduuidvalue123456",
+          uid: 'mockeduuidvalue123456'
         },
         {
           name: '',
@@ -104,9 +104,9 @@ describe('postmanToBrunoEnvironment Function', () => {
           enabled: true,
           secret: false,
           type: 'text',
-          uid: "mockeduuidvalue123456"
+          uid: 'mockeduuidvalue123456'
         }
-      ],
+      ]
     };
 
     expect(brunoEnvironment).toEqual(expectedEnvironment);
@@ -114,17 +114,17 @@ describe('postmanToBrunoEnvironment Function', () => {
 
   it.skip('should throw Error when JSON parsing fails', async () => {
     const invalidBrunoEnvironment = {
-      "id": "some-id",
-      "name": "My Environment",
-      "values": [
+      id: 'some-id',
+      name: 'My Environment',
+      values: [
         {
-          "key": "var1",
-          "value": "value1",
-          "enabled": true,
-          "type": "text"
+          key: 'var1',
+          value: 'value1',
+          enabled: true,
+          type: 'text'
         }
       ]
-    }
+    };
 
     await expect(postmanToBrunoEnvironment(invalidBrunoEnvironment)).rejects.toThrow(Error);
     await expect(postmanToBrunoEnvironment(invalidBrunoEnvironment)).rejects.toThrow(
@@ -132,19 +132,19 @@ describe('postmanToBrunoEnvironment Function', () => {
     );
   });
 
-  it("should handle empty variables", async () => {
+  it('should handle empty variables', async () => {
     const collectionWithEmptyVars = {
-      "name": "My Environment",
-      "values": []
+      name: 'My Environment',
+      values: []
     };
 
     const brunoCollection = await postmanToBrunoEnvironment(collectionWithEmptyVars);
     expect(brunoCollection.variables).toEqual([]);
   });
 
-  it("should handle undefined variables", async () => {
+  it('should handle undefined variables', async () => {
     const collectionWithUndefinedVars = {
-      "name": "My Environment",
+      name: 'My Environment'
     };
 
     const brunoCollection = await postmanToBrunoEnvironment(collectionWithUndefinedVars);
diff --git a/packages/bruno-converters/tests/postman/postman-to-bruno/postman-to-bruno.spec.js b/packages/bruno-converters/tests/postman/postman-to-bruno/postman-to-bruno.spec.js
index 926ac706f..180174868 100644
--- a/packages/bruno-converters/tests/postman/postman-to-bruno/postman-to-bruno.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-to-bruno/postman-to-bruno.spec.js
@@ -29,49 +29,49 @@ describe('postman-collection', () => {
 
   it('should handle falsy values in collection variables', async () => {
     const collectionWithFalsyVars = {
-      "info": {
-        "_postman_id": "7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9",
-        "name": "collection with falsy vars",
-        "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+      info: {
+        _postman_id: '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
+        name: 'collection with falsy vars',
+        schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
       },
-      "variable": [
+      variable: [
         {
-          "type": "string"
+          type: 'string'
         },
         {
-          "key": "",
-          "type": "string"
+          key: '',
+          type: 'string'
         },
         {
-          "value": "",
-          "type": "string"
+          value: '',
+          type: 'string'
         },
         {
-          "key": "",
-          "value": "",
-          "type": "string"
+          key: '',
+          value: '',
+          type: 'string'
         }
       ],
-      "item": []
+      item: []
     };
 
     const brunoCollection = await postmanToBruno(collectionWithFalsyVars);
-    
+
     expect(brunoCollection.root.request.vars.req).toEqual([
       {
-        uid: "mockeduuidvalue123456",
+        uid: 'mockeduuidvalue123456',
         name: '',
         value: '',
         enabled: true
       },
       {
-        uid: "mockeduuidvalue123456",
+        uid: 'mockeduuidvalue123456',
         name: '',
         value: '',
         enabled: true
       },
       {
-        uid: "mockeduuidvalue123456",
+        uid: 'mockeduuidvalue123456',
         name: '',
         value: '',
         enabled: true
@@ -79,15 +79,15 @@ describe('postman-collection', () => {
     ]);
   });
 
-  it("should handle empty variables", async () => {
+  it('should handle empty variables', async () => {
     const collectionWithEmptyVars = {
-      "info": {
-        "_postman_id": "7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9",
-        "name": "collection with falsy vars",
-        "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+      info: {
+        _postman_id: '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
+        name: 'collection with falsy vars',
+        schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
       },
-      "variable": [],
-      "item": []
+      variable: [],
+      item: []
     };
 
     const brunoCollection = await postmanToBruno(collectionWithEmptyVars);
@@ -178,28 +178,28 @@ describe('postman-collection', () => {
 
   it('should handle collection with auth object having undefined type', async () => {
     const collectionWithUndefinedAuthType = {
-      'info': {
-        '_postman_id': '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
-        'name': 'collection with undefined auth type',
-        'schema': 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
+      info: {
+        _postman_id: '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
+        name: 'collection with undefined auth type',
+        schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
       },
-      'auth': {
-        'basic': [
+      auth: {
+        basic: [
           { key: 'username', value: 'testuser', type: 'string' },
           { key: 'password', value: 'testpass', type: 'string' }
         ]
       },
-      'item': [
+      item: [
         {
-          'name': 'request',
-          'request': {
-            'method': 'GET',
-            'header': [],
-            'url': {
-              'raw': 'https://api.example.com/test',
-              'protocol': 'https',
-              'host': ['api', 'example', 'com'],
-              'path': ['test']
+          name: 'request',
+          request: {
+            method: 'GET',
+            header: [],
+            url: {
+              raw: 'https://api.example.com/test',
+              protocol: 'https',
+              host: ['api', 'example', 'com'],
+              path: ['test']
             }
           }
         }
@@ -207,7 +207,7 @@ describe('postman-collection', () => {
     };
 
     const brunoCollection = await postmanToBruno(collectionWithUndefinedAuthType);
-    
+
     // Collection level auth should default to 'none'
     expect(brunoCollection.root.request.auth).toEqual({
       mode: 'none',
@@ -233,28 +233,28 @@ describe('postman-collection', () => {
 
   it('should handle collection with auth object having null type', async () => {
     const collectionWithNullAuthType = {
-      'info': {
-        '_postman_id': '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
-        'name': 'collection with null auth type',
-        'schema': 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
+      info: {
+        _postman_id: '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
+        name: 'collection with null auth type',
+        schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
       },
-      'auth': {
-        'type': null,
-        'bearer': {
-          'token': 'test-token'
+      auth: {
+        type: null,
+        bearer: {
+          token: 'test-token'
         }
       },
-      'item': [
+      item: [
         {
-          'name': 'request',
-          'request': {
-            'method': 'GET',
-            'header': [],
-            'url': {
-              'raw': 'https://api.example.com/test',
-              'protocol': 'https',
-              'host': ['api', 'example', 'com'],
-              'path': ['test']
+          name: 'request',
+          request: {
+            method: 'GET',
+            header: [],
+            url: {
+              raw: 'https://api.example.com/test',
+              protocol: 'https',
+              host: ['api', 'example', 'com'],
+              path: ['test']
             }
           }
         }
@@ -262,7 +262,7 @@ describe('postman-collection', () => {
     };
 
     const brunoCollection = await postmanToBruno(collectionWithNullAuthType);
-    
+
     // Collection level auth should default to 'none'
     expect(brunoCollection.root.request.auth).toEqual({
       mode: 'none',
@@ -277,29 +277,29 @@ describe('postman-collection', () => {
 
   it('should handle collection with auth object having unexpected type value', async () => {
     const collectionWithUnexpectedAuthType = {
-      'info': {
-        '_postman_id': '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
-        'name': 'collection with unexpected auth type',
-        'schema': 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
+      info: {
+        _postman_id: '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
+        name: 'collection with unexpected auth type',
+        schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
       },
-      'auth': {
-        'type': 'unexpected_auth_type',
-        'basic': [
+      auth: {
+        type: 'unexpected_auth_type',
+        basic: [
           { key: 'username', value: 'testuser', type: 'string' },
           { key: 'password', value: 'testpass', type: 'string' }
         ]
       },
-      'item': [
+      item: [
         {
-          'name': 'request',
-          'request': {
-            'method': 'GET',
-            'header': [],
-            'url': {
-              'raw': 'https://api.example.com/test',
-              'protocol': 'https',
-              'host': ['api', 'example', 'com'],
-              'path': ['test']
+          name: 'request',
+          request: {
+            method: 'GET',
+            header: [],
+            url: {
+              raw: 'https://api.example.com/test',
+              protocol: 'https',
+              host: ['api', 'example', 'com'],
+              path: ['test']
             }
           }
         }
@@ -307,7 +307,7 @@ describe('postman-collection', () => {
     };
 
     const brunoCollection = await postmanToBruno(collectionWithUnexpectedAuthType);
-    
+
     // Collection level auth should default to 'none'
     expect(brunoCollection.root.request.auth).toEqual({
       mode: 'none',
@@ -333,25 +333,25 @@ describe('postman-collection', () => {
 
   it('should handle request with auth object having undefined type', async () => {
     const collectionWithRequestUndefinedAuthType = {
-      'info': {
-        '_postman_id': '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
-        'name': 'collection with request undefined auth type',
-        'schema': 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
+      info: {
+        _postman_id: '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
+        name: 'collection with request undefined auth type',
+        schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
       },
-      'item': [
+      item: [
         {
-          'name': 'request',
-          'request': {
-            'method': 'GET',
-            'header': [],
-            'url': {
-              'raw': 'https://api.example.com/test',
-              'protocol': 'https',
-              'host': ['api', 'example', 'com'],
-              'path': ['test']
+          name: 'request',
+          request: {
+            method: 'GET',
+            header: [],
+            url: {
+              raw: 'https://api.example.com/test',
+              protocol: 'https',
+              host: ['api', 'example', 'com'],
+              path: ['test']
             },
-            'auth': {
-              'basic': [
+            auth: {
+              basic: [
                 { key: 'username', value: 'testuser', type: 'string' },
                 { key: 'password', value: 'testpass', type: 'string' }
               ]
@@ -373,7 +373,7 @@ describe('postman-collection', () => {
       oauth2: null,
       digest: null
     });
-    
+
     // Request auth should default to 'none'
     expect(brunoCollection.items[0].request.auth).toEqual({
       mode: 'none',
@@ -388,31 +388,31 @@ describe('postman-collection', () => {
 
   it('should handle folder with auth object having unexpected type', async () => {
     const collectionWithFolderUnexpectedAuthType = {
-      'info': {
-        '_postman_id': '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
-        'name': 'collection with folder unexpected auth type',
-        'schema': 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
+      info: {
+        _postman_id: '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
+        name: 'collection with folder unexpected auth type',
+        schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'
       },
-      'item': [
+      item: [
         {
-          'name': 'folder',
-          'auth': {
-            'type': 'unexpected_folder_auth_type',
-            'bearer': {
-              'token': 'folder-token'
+          name: 'folder',
+          auth: {
+            type: 'unexpected_folder_auth_type',
+            bearer: {
+              token: 'folder-token'
             }
           },
-          'item': [
+          item: [
             {
-              'name': 'request',
-              'request': {
-                'method': 'GET',
-                'header': [],
-                'url': {
-                  'raw': 'https://api.example.com/test',
-                  'protocol': 'https',
-                  'host': ['api', 'example', 'com'],
-                  'path': ['test']
+              name: 'request',
+              request: {
+                method: 'GET',
+                header: [],
+                url: {
+                  raw: 'https://api.example.com/test',
+                  protocol: 'https',
+                  host: ['api', 'example', 'com'],
+                  path: ['test']
                 }
               }
             }
@@ -422,7 +422,7 @@ describe('postman-collection', () => {
     };
 
     const brunoCollection = await postmanToBruno(collectionWithFolderUnexpectedAuthType);
-    
+
     // Folder auth should default to 'none'
     expect(brunoCollection.items[0].root.request.auth).toEqual({
       mode: 'none',
@@ -453,52 +453,52 @@ describe('postman-collection', () => {
 // └── request (GET)
 
 const postmanCollection = {
-	"info": {
-		"_postman_id": "7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9",
-		"name": "simple collection",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
-		"_exporter_id": "21992467",
-		"_collection_link": "https://random-user-007.postman.co/workspace/testing~7523f559-3d5f-4c30-8315-3cb3c3ff98b7/collection/21992467-7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9?action=share&source=collection_link&creator=007"
-	},
-	"item": [
-		{
-			"name": "folder",
-			"item": [
-				{
-					"name": "request",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"url": {
-							"raw": "https://usebruno.com",
-							"protocol": "https",
-							"host": [
-								"usebruno",
-								"com"
-							]
-						}
-					},
-					"response": []
-				}
-			]
-		},
-		{
-			"name": "request",
-			"request": {
-				"method": "GET",
-				"header": [],
-				"url": {
-					"raw": "https://usebruno.com",
-					"protocol": "https",
-					"host": [
-						"usebruno",
-						"com"
-					]
-				}
-			},
-			"response": []
-		}
-	]
+  info: {
+    _postman_id: '7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9',
+    name: 'simple collection',
+    schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json',
+    _exporter_id: '21992467',
+    _collection_link: 'https://random-user-007.postman.co/workspace/testing~7523f559-3d5f-4c30-8315-3cb3c3ff98b7/collection/21992467-7f91bbd8-cb97-41ac-8d0b-e1fcd8bb4ce9?action=share&source=collection_link&creator=007'
+  },
+  item: [
+    {
+      name: 'folder',
+      item: [
+        {
+          name: 'request',
+          request: {
+            method: 'GET',
+            header: [],
+            url: {
+              raw: 'https://usebruno.com',
+              protocol: 'https',
+              host: [
+                'usebruno',
+                'com'
+              ]
+            }
+          },
+          response: []
+        }
+      ]
+    },
+    {
+      name: 'request',
+      request: {
+        method: 'GET',
+        header: [],
+        url: {
+          raw: 'https://usebruno.com',
+          protocol: 'https',
+          host: [
+            'usebruno',
+            'com'
+          ]
+        }
+      },
+      response: []
+    }
+  ]
 };
 
 // Simple Collection (bruno)
@@ -507,120 +507,120 @@ const postmanCollection = {
 // └── request (GET)
 
 const expectedOutput = {
-	"name": "simple collection",
-	"uid": "mockeduuidvalue123456",
-	"version": "1",
-	"items": [
-	  {
-      "uid": "mockeduuidvalue123456",	
-      "name": "folder",
-      "type": "folder",
-      "seq": 1,
-      "items": [
+  name: 'simple collection',
+  uid: 'mockeduuidvalue123456',
+  version: '1',
+  items: [
+    {
+      uid: 'mockeduuidvalue123456',
+      name: 'folder',
+      type: 'folder',
+      seq: 1,
+      items: [
         {
-          "uid": "mockeduuidvalue123456",
-          "name": "request",
-          "type": "http-request",
-          "seq": 1,
-          "request": {
-            "url": "https://usebruno.com",
-            "method": "GET",
-            "auth": {
-              "mode": "inherit",
-              "basic": null,
-              "bearer": null,
-              "awsv4": null,
-              "apikey": null,
-              "oauth2": null,
-              "digest": null
+          uid: 'mockeduuidvalue123456',
+          name: 'request',
+          type: 'http-request',
+          seq: 1,
+          request: {
+            url: 'https://usebruno.com',
+            method: 'GET',
+            auth: {
+              mode: 'inherit',
+              basic: null,
+              bearer: null,
+              awsv4: null,
+              apikey: null,
+              oauth2: null,
+              digest: null
             },
-            "headers": [],
-            "params": [],
-            "body": {
-              "mode": "none",
-              "json": null,
-              "text": null,
-              "xml": null,
-              "formUrlEncoded": [],
-              "multipartForm": []
+            headers: [],
+            params: [],
+            body: {
+              mode: 'none',
+              json: null,
+              text: null,
+              xml: null,
+              formUrlEncoded: [],
+              multipartForm: []
             },
-            "docs": ""
+            docs: ''
           }
         }
       ],
-      "root": {
-        "docs": "",
-        "meta": {
-        "name": "folder"
+      root: {
+        docs: '',
+        meta: {
+          name: 'folder'
         },
-        "request": {
-        "auth": {
-          "mode": "inherit",
-          "basic": null,
-          "bearer": null,
-          "awsv4": null,
-          "apikey": null,
-          "oauth2": null,
-          "digest": null
-        },
-        "headers": [],
-        "script": {},
-        "tests": "",
-        "vars": {}
+        request: {
+          auth: {
+            mode: 'inherit',
+            basic: null,
+            bearer: null,
+            awsv4: null,
+            apikey: null,
+            oauth2: null,
+            digest: null
+          },
+          headers: [],
+          script: {},
+          tests: '',
+          vars: {}
         }
       }
-	  },
-	  {
-      "uid": "mockeduuidvalue123456",
-      "name": "request",
-      "type": "http-request",
-      "seq": 2,
-      "request": {
-        "url": "https://usebruno.com",
-        "method": "GET",
-        "auth": {
-          "mode": "inherit",
-          "basic": null,
-          "bearer": null,
-          "awsv4": null,
-          "apikey": null,
-          "oauth2": null,
-          "digest": null
+    },
+    {
+      uid: 'mockeduuidvalue123456',
+      name: 'request',
+      type: 'http-request',
+      seq: 2,
+      request: {
+        url: 'https://usebruno.com',
+        method: 'GET',
+        auth: {
+          mode: 'inherit',
+          basic: null,
+          bearer: null,
+          awsv4: null,
+          apikey: null,
+          oauth2: null,
+          digest: null
         },
-        "headers": [],
-        "params": [],
-        "body": {
-          "mode": "none",
-          "json": null,
-          "text": null,
-          "xml": null,
-          "formUrlEncoded": [],
-          "multipartForm": []
+        headers: [],
+        params: [],
+        body: {
+          mode: 'none',
+          json: null,
+          text: null,
+          xml: null,
+          formUrlEncoded: [],
+          multipartForm: []
         },
-        "docs": ""
+        docs: ''
+      }
+    }
+  ],
+  environments: [],
+  root: {
+    docs: '',
+    meta: {
+      name: 'simple collection'
+    },
+    request: {
+      auth: {
+        mode: 'none',
+        basic: null,
+        bearer: null,
+        awsv4: null,
+        apikey: null,
+        oauth2: null,
+        digest: null
       },
-	  }
-	],
-	"environments": [],
-	"root": {
-	  "docs": "",
-	  "meta": {
-		"name": "simple collection"
-	  },
-	  "request": {
-		"auth": {
-		  "mode": "none",
-		  "basic": null,
-		  "bearer": null,
-		  "awsv4": null,
-		  "apikey": null,
-		  "oauth2": null,
-		  "digest": null
-		},
-		"headers": [],
-		"script": {},
-		"tests": "",
-		"vars": {}
-	  }
-	}
-  };
\ No newline at end of file
+      headers: [],
+      script: {},
+      tests: '',
+      vars: {}
+    }
+  }
+};
diff --git a/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-request.spec.js b/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-request.spec.js
index 93eed719a..333cedcbc 100644
--- a/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-request.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-request.spec.js
@@ -1,4 +1,4 @@
-const { default: postmanTranslation } = require("../../../../src/postman/postman-translations");
+const { default: postmanTranslation } = require('../../../../src/postman/postman-translations');
 
 describe('postmanTranslations - request commands', () => {
   test('should handle request commands', () => {
@@ -26,4 +26,20 @@ describe('postmanTranslations - request commands', () => {
     `;
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
-}); 
\ No newline at end of file
+
+  test('should handle legacy request object without pm prefix', () => {
+    const inputScript = `
+      const url = request.url;
+      const method = request.method;
+      const body = request.body;
+      const name = request.name;
+    `;
+    const expectedOutput = `
+      const url = req.getUrl();
+      const method = req.getMethod();
+      const body = req.getBody();
+      const name = req.getName();
+    `;
+    expect(postmanTranslation(inputScript)).toBe(expectedOutput);
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-response.spec.js b/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-response.spec.js
index 590825f13..ccfd2ee13 100644
--- a/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-response.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-response.spec.js
@@ -1,4 +1,4 @@
-const { default: postmanTranslation } = require("../../../../src/postman/postman-translations");
+const { default: postmanTranslation } = require('../../../../src/postman/postman-translations');
 
 describe('postmanTranslations - response commands', () => {
   test('should handle response commands', () => {
diff --git a/packages/bruno-converters/tests/postman/postman-to-bruno/process-auth.spec.js b/packages/bruno-converters/tests/postman/postman-to-bruno/process-auth.spec.js
index a6d90ed1b..ba05a4c18 100644
--- a/packages/bruno-converters/tests/postman/postman-to-bruno/process-auth.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-to-bruno/process-auth.spec.js
@@ -1,5 +1,4 @@
-const { processAuth } = require("../../../src/postman/postman-to-bruno");
-
+const { processAuth } = require('../../../src/postman/postman-to-bruno');
 
 describe('processAuth', () => {
   let requestObject;
@@ -466,7 +465,7 @@ describe('processAuth', () => {
 
   it('should handle auth object with null type', () => {
     const auth = {
-      type: null,
+      type: null
     };
     processAuth(auth, requestObject);
     expect(requestObject.auth.mode).toBe('none');
@@ -498,7 +497,7 @@ describe('processAuth', () => {
 
   it('should handle auth object with boolean type value', () => {
     const auth = {
-      type: "unknown_auth_type",
+      type: 'unknown_auth_type',
       unknown_auth_type: {
         accessKey: 'test-access-key',
         secretKey: 'test-secret-key'
diff --git a/packages/bruno-converters/tests/postman/postman-to-bruno/request-auth.spec.js b/packages/bruno-converters/tests/postman/postman-to-bruno/request-auth.spec.js
index 09cc712c9..ee37ba871 100644
--- a/packages/bruno-converters/tests/postman/postman-to-bruno/request-auth.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-to-bruno/request-auth.spec.js
@@ -2,8 +2,6 @@ import { describe, it, expect } from '@jest/globals';
 import postmanToBruno from '../../../src/postman/postman-to-bruno';
 
 describe('Request Authentication', () => {
-
-
   it('should handle basic auth at request level', async () => {
     const postmanCollection = {
       info: {
@@ -391,5 +389,4 @@ describe('Request Authentication', () => {
       basic: null, bearer: null, awsv4: null, apikey: null, oauth2: null, digest: null
     });
   });
-
 });
diff --git a/packages/bruno-converters/tests/postman/postman-translations/postman-comments.spec.js b/packages/bruno-converters/tests/postman/postman-translations/postman-comments.spec.js
index ba3f29d37..7cb5df0e5 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/postman-comments.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/postman-comments.spec.js
@@ -1,4 +1,4 @@
-const { default: postmanTranslation } = require("../../../src/postman/postman-translations");
+const { default: postmanTranslation } = require('../../../src/postman/postman-translations');
 
 describe('postmanTranslations - comment handling', () => {
   test('should not translate non-pm commands', () => {
@@ -16,15 +16,15 @@ describe('postmanTranslations - comment handling', () => {
   });
 
   test('should comment non-translated pm commands', () => {
-    const inputScript = "pm.test('random test', () => pm.globals.clear());";
-    const expectedOutput = "// test('random test', () => pm.globals.clear());";
+    const inputScript = 'pm.test(\'random test\', () => pm.globals.clear());';
+    const expectedOutput = '// test(\'random test\', () => pm.globals.clear());';
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
   test('should handle multiple pm commands on the same line', () => {
-    const inputScript = "pm.environment.get('key'); pm.environment.set('key', 'value');";
-    const expectedOutput = "bru.getEnvVar('key'); bru.setEnvVar('key', 'value');";
-    expect(postmanTranslation(inputScript)).toBe(expectedOutput); 
+    const inputScript = 'pm.environment.get(\'key\'); pm.environment.set(\'key\', \'value\');';
+    const expectedOutput = 'bru.getEnvVar(\'key\'); bru.setEnvVar(\'key\', \'value\');';
+    expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
   test('should handle comments and other JavaScript code', () => {
@@ -50,4 +50,4 @@ describe('postmanTranslations - comment handling', () => {
     `;
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/postman-cookie-conversions.spec.js b/packages/bruno-converters/tests/postman/postman-translations/postman-cookie-conversions.spec.js
index e4fe0ee32..9b32883a8 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/postman-cookie-conversions.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/postman-cookie-conversions.spec.js
@@ -1,15 +1,15 @@
-const { default: postmanTranslation } = require("../../../src/postman/postman-translations");
+const { default: postmanTranslation } = require('../../../src/postman/postman-translations');
 
 describe('postmanTranslations - cookie API conversions', () => {
   test('should convert pm.cookies.jar().get to bru.cookies.jar().getCookie', () => {
     const inputScript = `pm.cookies.jar().get('https://example.com', 'sessionId', (err, cookie) => {
       console.log(cookie);
     });`;
-    
+
     const expectedOutput = `bru.cookies.jar().getCookie('https://example.com', 'sessionId', (err, cookie) => {
       console.log(cookie);
     });`;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -17,11 +17,11 @@ describe('postmanTranslations - cookie API conversions', () => {
     const inputScript = `pm.cookies.jar().getAll('https://example.com', (err, cookies) => {
       console.log(cookies);
     });`;
-    
+
     const expectedOutput = `bru.cookies.jar().getCookies('https://example.com', (err, cookies) => {
       console.log(cookies);
     });`;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -29,11 +29,11 @@ describe('postmanTranslations - cookie API conversions', () => {
     const inputScript = `pm.cookies.jar().set('https://example.com', 'sessionId', 'abc123', (err) => {
       if (err) console.error(err);
     });`;
-    
+
     const expectedOutput = `bru.cookies.jar().setCookie('https://example.com', 'sessionId', 'abc123', (err) => {
       if (err) console.error(err);
     });`;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -41,11 +41,11 @@ describe('postmanTranslations - cookie API conversions', () => {
     const inputScript = `pm.cookies.jar().unset('https://example.com', 'sessionId', (err) => {
       if (err) console.error(err);
     });`;
-    
+
     const expectedOutput = `bru.cookies.jar().deleteCookie('https://example.com', 'sessionId', (err) => {
       if (err) console.error(err);
     });`;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -53,11 +53,11 @@ describe('postmanTranslations - cookie API conversions', () => {
     const inputScript = `pm.cookies.jar().clear('https://example.com', (err) => {
       if (err) console.error(err);
     });`;
-    
+
     const expectedOutput = `bru.cookies.jar().deleteCookies('https://example.com', (err) => {
       if (err) console.error(err);
     });`;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -71,7 +71,7 @@ describe('postmanTranslations - cookie API conversions', () => {
       pm.cookies.jar().unset('https://api.example.com', 'temp');
       pm.cookies.jar().clear('https://api.example.com');
     `;
-    
+
     const expectedOutput = `
       bru.cookies.jar().setCookie('https://api.example.com', 'auth', 'token123');
       const cookie = bru.cookies.jar().getCookie('https://api.example.com', 'auth');
@@ -81,7 +81,7 @@ describe('postmanTranslations - cookie API conversions', () => {
       bru.cookies.jar().deleteCookie('https://api.example.com', 'temp');
       bru.cookies.jar().deleteCookies('https://api.example.com');
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -91,13 +91,13 @@ describe('postmanTranslations - cookie API conversions', () => {
       jar.set('https://example.com', 'user', 'john');
       const userCookie = jar.get('https://example.com', 'user');
     `;
-    
+
     const expectedOutput = `
       const jar = bru.cookies.jar();
       jar.setCookie('https://example.com', 'user', 'john');
       const userCookie = jar.getCookie('https://example.com', 'user');
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -112,7 +112,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         }
       });
     `;
-    
+
     const expectedOutput = `
       const jar = bru.cookies.jar();
       jar.getCookie('https://api.example.com', 'authToken', (error, cookie) => {
@@ -123,7 +123,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         }
       });
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -138,7 +138,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         }
       });
     `;
-    
+
     const expectedOutput = `
       const jar = bru.cookies.jar();
       jar.getCookies('https://api.example.com', (error, cookies) => {
@@ -149,7 +149,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         }
       });
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -166,7 +166,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         if (error) console.error(error);
       });
     `;
-    
+
     const expectedOutput = `
       const jar = bru.cookies.jar();
       jar.setCookie('https://api.example.com', {
@@ -179,7 +179,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         if (error) console.error(error);
       });
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -194,7 +194,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         }
       });
     `;
-    
+
     const expectedOutput = `
       const jar = bru.cookies.jar();
       jar.deleteCookie('https://api.example.com', 'tempCookie', (error) => {
@@ -205,7 +205,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         }
       });
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -220,7 +220,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         }
       });
     `;
-    
+
     const expectedOutput = `
       const jar = bru.cookies.jar();
       jar.deleteCookies('https://api.example.com', (error) => {
@@ -231,7 +231,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         }
       });
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -261,7 +261,7 @@ describe('postmanTranslations - cookie API conversions', () => {
       cookieJar.unset('https://example.com', 'temp');
       cookieJar.clear('https://example.com');
     `;
-    
+
     const expectedOutput = `
       const cookieJar = bru.cookies.jar();
       
@@ -287,7 +287,7 @@ describe('postmanTranslations - cookie API conversions', () => {
       cookieJar.deleteCookie('https://example.com', 'temp');
       cookieJar.deleteCookies('https://example.com');
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
 
@@ -302,7 +302,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         console.log(cookies);
       });
     `;
-    
+
     const expectedOutput = `
       const jar = bru.cookies.jar();
       jar.getCookie('https://api.com', 'session');
@@ -313,7 +313,7 @@ describe('postmanTranslations - cookie API conversions', () => {
         console.log(cookies);
       });
     `;
-    
+
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/postman-edge-cases.spec.js b/packages/bruno-converters/tests/postman/postman-translations/postman-edge-cases.spec.js
index d304026ea..a70226102 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/postman-edge-cases.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/postman-edge-cases.spec.js
@@ -1,4 +1,4 @@
-const { default: postmanTranslation } = require("../../../src/postman/postman-translations");
+const { default: postmanTranslation } = require('../../../src/postman/postman-translations');
 
 describe('postmanTranslations - edge cases', () => {
   test('should handle nested commands and edge cases', () => {
@@ -44,4 +44,4 @@ describe('postmanTranslations - edge cases', () => {
     `;
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/postman-test-commands.spec.js b/packages/bruno-converters/tests/postman/postman-translations/postman-test-commands.spec.js
index 7c75b518e..5091b32f5 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/postman-test-commands.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/postman-test-commands.spec.js
@@ -1,4 +1,4 @@
-const { default: postmanTranslation } = require("../../../src/postman/postman-translations");
+const { default: postmanTranslation } = require('../../../src/postman/postman-translations');
 
 describe('postmanTranslations - test commands', () => {
   test('should handle test commands', () => {
@@ -20,4 +20,4 @@ describe('postmanTranslations - test commands', () => {
     `;
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/postman-variables.spec.js b/packages/bruno-converters/tests/postman/postman-translations/postman-variables.spec.js
index 70801f295..3ce310908 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/postman-variables.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/postman-variables.spec.js
@@ -1,4 +1,4 @@
-const { default: postmanTranslation } = require("../../../src/postman/postman-translations");
+const { default: postmanTranslation } = require('../../../src/postman/postman-translations');
 
 describe('postmanTranslations - variables commands', () => {
   test('should translate variable commands correctly', () => {
@@ -22,4 +22,4 @@ describe('postmanTranslations - variables commands', () => {
     `;
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/combined.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/combined.test.js
index 4916a10c0..86eb58eed 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/combined.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/combined.test.js
@@ -1,85 +1,85 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Combined API Features Translation', () => {
-    // Basic translation test
-    it('should translate code', () => {
-        const code = 'console.log("Hello, world!");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(code);
-    });
+  // Basic translation test
+  it('should translate code', () => {
+    const code = 'console.log("Hello, world!");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(code);
+  });
 
-    // Preserving comments
-    it('should preserve comments', () => {
-        const code = '// This is a comment';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('// This is a comment');
-    });
+  // Preserving comments
+  it('should preserve comments', () => {
+    const code = '// This is a comment';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('// This is a comment');
+  });
 
-    it('should preserve comments inside functions', () => {
-        const code = `
+  it('should preserve comments inside functions', () => {
+    const code = `
         function getUserDetails() {
             // Get user details from API
             const response = pm.response.json();
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         function getUserDetails() {
             // Get user details from API
             const response = res.getBody();
         }
         `);
-    });
+  });
 
-    it('should preserve comments inside if statements', () => {
-        const code = `
+  it('should preserve comments inside if statements', () => {
+    const code = `
         if (pm.response.code === 200) {
             // Success
             console.log("Success");
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         if (res.getStatus() === 200) {
             // Success
             console.log("Success");
         }
         `);
-    });
+  });
 
-    it('should preserve multiline comments', () => {
-        const code = `
+  it('should preserve multiline comments', () => {
+    const code = `
         /*
         This is a multiline comment
         */
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         /*
         This is a multiline comment
         */
         `);
-    });
+  });
 
-    it('should preserve comments inside for loops', () => {
-        const code = `
+  it('should preserve comments inside for loops', () => {
+    const code = `
         for (let i = 0; i < 10; i++) {
             // Loop iteration
             console.log(pm.response.json()[i]);
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         for (let i = 0; i < 10; i++) {
             // Loop iteration
             console.log(res.getBody()[i]);
         }
         `);
-    });
+  });
 
-    // Multiple transformations in the same code block
-    it('should handle multiple translations in the same code block', () => {
-        const code = `
+  // Multiple transformations in the same code block
+  it('should handle multiple translations in the same code block', () => {
+    const code = `
         const token = pm.environment.get("authToken");
         pm.test("Auth flow works", function() {
             const response = pm.response.json();
@@ -88,120 +88,118 @@ describe('Combined API Features Translation', () => {
             pm.collectionVariables.set("sessionId", response.session.id);
         });
         `;
-        const translatedCode = translateCode(code);
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).not.toContain('pm.test("Auth flow works", function() {');
-        expect(translatedCode).not.toContain('pm.expect(response.authenticated).to.be.true;');
-        expect(translatedCode).not.toContain('pm.environment.set("userId", response.user.id);');
-        expect(translatedCode).not.toContain('pm.collectionVariables.set("sessionId", response.session.id);');
-        expect(translatedCode).toContain('const token = bru.getEnvVar("authToken");');
-        expect(translatedCode).toContain('test("Auth flow works", function() {');
-        expect(translatedCode).toContain('const response = res.getBody();');
-        expect(translatedCode).toContain('expect(response.authenticated).to.be.true;');
-        expect(translatedCode).toContain('bru.setEnvVar("userId", response.user.id);');
-        expect(translatedCode).toContain('bru.setVar("sessionId", response.session.id);');
-    });
+    expect(translatedCode).not.toContain('pm.test("Auth flow works", function() {');
+    expect(translatedCode).not.toContain('pm.expect(response.authenticated).to.be.true;');
+    expect(translatedCode).not.toContain('pm.environment.set("userId", response.user.id);');
+    expect(translatedCode).not.toContain('pm.collectionVariables.set("sessionId", response.session.id);');
+    expect(translatedCode).toContain('const token = bru.getEnvVar("authToken");');
+    expect(translatedCode).toContain('test("Auth flow works", function() {');
+    expect(translatedCode).toContain('const response = res.getBody();');
+    expect(translatedCode).toContain('expect(response.authenticated).to.be.true;');
+    expect(translatedCode).toContain('bru.setEnvVar("userId", response.user.id);');
+    expect(translatedCode).toContain('bru.setVar("sessionId", response.session.id);');
+  });
 
-    // Nested expressions
-    it('should handle nested Postman API calls', () => {
-        const code = 'pm.environment.set("computed", pm.variables.get("base") + "-suffix");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.setEnvVar("computed", bru.getVar("base") + "-suffix");');
-    });
+  // Nested expressions
+  it('should handle nested Postman API calls', () => {
+    const code = 'pm.environment.set("computed", pm.variables.get("base") + "-suffix");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.setEnvVar("computed", bru.getVar("base") + "-suffix");');
+  });
 
-    it('should handle more complex nested expressions', () => {
-        const code = 'pm.collectionVariables.set("fullPath", pm.environment.get("baseUrl") + pm.variables.get("endpoint"));';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.setVar("fullPath", bru.getEnvVar("baseUrl") + bru.getVar("endpoint"));');
-    });
+  it('should handle more complex nested expressions', () => {
+    const code = 'pm.collectionVariables.set("fullPath", pm.environment.get("baseUrl") + pm.variables.get("endpoint"));';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.setVar("fullPath", bru.getEnvVar("baseUrl") + bru.getVar("endpoint"));');
+  });
 
-    // Unrelated code
-    it('should leave unrelated code untouched', () => {
-        const code = `
+  // Unrelated code
+  it('should leave unrelated code untouched', () => {
+    const code = `
         function calculateTotal(items) {
             return items.reduce((sum, item) => sum + item.price, 0);
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(code);
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(code);
+  });
 
-    it('should handle Postman API calls within JavaScript methods', () => {
-        const code = `
+  it('should handle Postman API calls within JavaScript methods', () => {
+    const code = `
         const helpers = {
             getAuthHeader: function() {
                 return "Bearer " + pm.environment.get("token");
             }
         };
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('return "Bearer " + bru.getEnvVar("token");');
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('return "Bearer " + bru.getEnvVar("token");');
+  });
 
-
-    it('should handle aliases with object destructuring', () => {
-        const code = `
+  it('should handle aliases with object destructuring', () => {
+    const code = `
         const { environment, variables } = pm;
         environment.set("token", "abc123");
         variables.get("userId");
         `;
-        const translatedCode = translateCode(code);
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe(`
+    expect(translatedCode).toBe(`
         bru.setEnvVar("token", "abc123");
         bru.getVar("userId");
         `);
-    });
+  });
 
-    // Code context tests
-    it('should translate pm commands inside functions', () => {
-        const code = `
+  // Code context tests
+  it('should translate pm commands inside functions', () => {
+    const code = `
         function getAuthHeader() {
             return "Bearer " + pm.environment.get("token");
         }
         `;
 
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         function getAuthHeader() {
             return "Bearer " + bru.getEnvVar("token");
         }
         `);
-    });
+  });
 
-    it('should translate pm commands inside if statements', () => {
-        const code = `
+  it('should translate pm commands inside if statements', () => {
+    const code = `
         if (pm.response.code === 200) {
             console.log("Success");
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         if (res.getStatus() === 200) {
             console.log("Success");
         }
         `);
-    });
+  });
 
-
-    it('should translate pm commands inside if statements', () => {
-        const code = `
+  it('should translate pm commands inside if statements', () => {
+    const code = `
         const json = pm.response.json();
         if (json.code === 200) {
             console.log("Success");
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const json = res.getBody();
         if (json.code === 200) {
             console.log("Success");
         }
         `);
-    });
+  });
 
-    it('should translate pm commands inside else statements', () => {
-        const code = `
+  it('should translate pm commands inside else statements', () => {
+    const code = `
         if (pm.response.code === 200) {
             console.log("Success");
             pm.response.to.have.status(200);
@@ -210,8 +208,8 @@ describe('Combined API Features Translation', () => {
             expect(res.getStatus()).to.equal(400);
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         if (res.getStatus() === 200) {
             console.log("Success");
             expect(res.getStatus()).to.equal(200);
@@ -220,40 +218,40 @@ describe('Combined API Features Translation', () => {
             expect(res.getStatus()).to.equal(400);
         }
         `);
-    });
+  });
 
-    it('should translate pm commands inside for loops', () => {
-        const code = `
+  it('should translate pm commands inside for loops', () => {
+    const code = `
         for (let i = 0; i < pm.response.json().length; i++) {
             console.log(pm.response.json()[i]);
         }
         `;
 
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         for (let i = 0; i < res.getBody().length; i++) {
             console.log(res.getBody()[i]);
         }
         `);
-    });
+  });
 
-    it('should translate pm commands inside while loops', () => {
-        const code = `
+  it('should translate pm commands inside while loops', () => {
+    const code = `
         while (pm.response.code === 200) {
             console.log("Success");
         }
         `;
 
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         while (res.getStatus() === 200) {
             console.log("Success");
         }
         `);
-    });
+  });
 
-    it('should translate pm commands inside switch statements', () => {
-        const code = `
+  it('should translate pm commands inside switch statements', () => {
+    const code = `
         switch (pm.response.code) {
             case 200:
                 console.log("Success");
@@ -261,18 +259,18 @@ describe('Combined API Features Translation', () => {
         }
         `;
 
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         switch (res.getStatus()) {
             case 200:
                 console.log("Success");
                 break;
         }
         `);
-    });
+  });
 
-    it('should translate pm commands inside try catch statements', () => {
-        const code = `
+  it('should translate pm commands inside try catch statements', () => {
+    const code = `
         try {
             pm.response.to.have.status(200);
         } catch (error) {
@@ -281,8 +279,8 @@ describe('Combined API Features Translation', () => {
         }
         `;
 
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         try {
             expect(res.getStatus()).to.equal(200);
         } catch (error) {
@@ -290,10 +288,10 @@ describe('Combined API Features Translation', () => {
             expect(res.getStatus()).to.equal(400);
         }
         `);
-    });
+  });
 
-    it('should translate aliases within if statements block', () => {
-        const code = `
+  it('should translate aliases within if statements block', () => {
+    const code = `
         const env = pm.environment;
         const vars = pm.variables;
         const collVars = pm.collectionVariables;
@@ -314,8 +312,8 @@ describe('Combined API Features Translation', () => {
         }
         `;
 
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         function processResponse() {
           if(res.getStatus() === 200) {
             console.log("Success");
@@ -328,10 +326,10 @@ describe('Combined API Features Translation', () => {
           }
         }
         `);
-    });
+  });
 
-    it('should handle pm aliases inside functions', () => {
-        const code = `
+  it('should handle pm aliases inside functions', () => {
+    const code = `
         const tempRes = pm.response;
         const tempTest = pm.test;
         const tempExpect = pm.expect;
@@ -347,9 +345,9 @@ describe('Combined API Features Translation', () => {
         }
         `;
 
-        const translatedCode = translateCode(code);
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe(`
+    expect(translatedCode).toBe(`
         function processResponse() {
             test("Status code is 200", function() { expect(res.getStatus()).to.equal(200); });
             bru.setEnvVar("userId", res.getBody().userId);
@@ -357,86 +355,86 @@ describe('Combined API Features Translation', () => {
             bru.setVar("sessionId", res.getBody().sessionId);
         }
         `);
-    });
+  });
 
-    it('should nested pm commands', () => {
-        const code = `
+  it('should nested pm commands', () => {
+    const code = `
         pm.collectionVariables.get(pm.environment.get('key'))
         pm.test("Status code is 200", function() {
             pm.response.to.have.status(200);
         });
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         bru.getVar(bru.getEnvVar('key'))
         test("Status code is 200", function() {
             expect(res.getStatus()).to.equal(200);
         });
         `);
-    });
+  });
 
-    it('should handle pm objects in template literals', () => {
-        const code = `
+  it('should handle pm objects in template literals', () => {
+    const code = `
         const baseUrl = pm.environment.get("baseUrl");
         const endpoint = pm.variables.get("endpoint");
         const url = \`\${baseUrl}/api/\${endpoint}\`;
         console.log(\`Response status: \${pm.response.code}\`);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const baseUrl = bru.getEnvVar("baseUrl");');
-        expect(translatedCode).toContain('const endpoint = bru.getVar("endpoint");');
-        expect(translatedCode).toContain('const url = `${baseUrl}/api/${endpoint}`;');
-        expect(translatedCode).toContain('console.log(`Response status: ${res.getStatus()}`);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle pm objects in arrow functions', () => {
-        const code = `
+    expect(translatedCode).toContain('const baseUrl = bru.getEnvVar("baseUrl");');
+    expect(translatedCode).toContain('const endpoint = bru.getVar("endpoint");');
+    expect(translatedCode).toContain('const url = `${baseUrl}/api/${endpoint}`;');
+    expect(translatedCode).toContain('console.log(`Response status: ${res.getStatus()}`);');
+  });
+
+  it('should handle pm objects in arrow functions', () => {
+    const code = `
         const getAuthHeader = () => "Bearer " + pm.environment.get("token");
         const processItems = items => items.forEach(item => {
             pm.variables.set(item.key, item.value);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const getAuthHeader = () => "Bearer " + bru.getEnvVar("token");');
-        expect(translatedCode).toContain('const processItems = items => items.forEach(item => {');
-        expect(translatedCode).toContain('bru.setVar(item.key, item.value);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('test', () => {
-        const code = `
+    expect(translatedCode).toContain('const getAuthHeader = () => "Bearer " + bru.getEnvVar("token");');
+    expect(translatedCode).toContain('const processItems = items => items.forEach(item => {');
+    expect(translatedCode).toContain('bru.setVar(item.key, item.value);');
+  });
+
+  it('test', () => {
+    const code = `
         const globals = pm.globals;
         const key = globals.get("key");
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const key = bru.getGlobalEnvVar("key");
         `);
-    })
+  });
 
-    it('should handle pm.response.to.have.body integrated with other assertions', () => {
-        const code = `
+  it('should handle pm.response.to.have.body integrated with other assertions', () => {
+    const code = `
         pm.test("Response validation", function() {
             pm.response.to.have.status(200);
             pm.response.to.have.body({"success": true});
             pm.response.to.have.header("Content-Type", "application/json");
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        const expectedOutput = `
+    const translatedCode = translateCode(code);
+
+    const expectedOutput = `
         test("Response validation", function() {
             expect(res.getStatus()).to.equal(200);
             expect(res.getBody()).to.equal({"success": true});
             expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");
         });
         `;
-        expect(translatedCode).toBe(expectedOutput);
-    });
+    expect(translatedCode).toBe(expectedOutput);
+  });
 
-    it('should handle pm.response.to.have.body with dynamic content', () => {
-        const code = `
+  it('should handle pm.response.to.have.body with dynamic content', () => {
+    const code = `
         const expectedResponse = {
             id: pm.environment.get("userId"),
             token: pm.variables.get("authToken"),
@@ -447,9 +445,9 @@ describe('Combined API Features Translation', () => {
             pm.response.to.have.body(expectedResponse);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        const expectedOutput = `
+    const translatedCode = translateCode(code);
+
+    const expectedOutput = `
         const expectedResponse = {
             id: bru.getEnvVar("userId"),
             token: bru.getVar("authToken"),
@@ -459,12 +457,12 @@ describe('Combined API Features Translation', () => {
         test("Dynamic response validation", function() {
             expect(res.getBody()).to.equal(expectedResponse);
         });
-        `
-        expect(translatedCode).toBe(expectedOutput);
-    });
+        `;
+    expect(translatedCode).toBe(expectedOutput);
+  });
 
-    it('should handle pm.response.to.have.body in control structures', () => {
-        const code = `
+  it('should handle pm.response.to.have.body in control structures', () => {
+    const code = `
         const jsonData = pm.response.json();
         
         if (jsonData.status === "success") {
@@ -476,9 +474,9 @@ describe('Combined API Features Translation', () => {
             pm.expect(jsonData.error).to.exist;
         }
         `;
-        const translatedCode = translateCode(code);
-        
-        const expectedOutput = `
+    const translatedCode = translateCode(code);
+
+    const expectedOutput = `
         const jsonData = res.getBody();
         
         if (jsonData.status === "success") {
@@ -490,6 +488,6 @@ describe('Combined API Features Translation', () => {
             expect(jsonData.error).to.exist;
         }
         `;
-        expect(translatedCode).toBe(expectedOutput);
-    });
-}); 
\ No newline at end of file
+    expect(translatedCode).toBe(expectedOutput);
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/environment.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/environment.test.js
index c3461f6de..47c46ce19 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/environment.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/environment.test.js
@@ -1,71 +1,71 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Environment Variable Translation', () => {
-    it('should translate pm.environment.get', () => {
-        const code = 'pm.environment.get("test");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.getEnvVar("test");');
-    }); 
+  it('should translate pm.environment.get', () => {
+    const code = 'pm.environment.get("test");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.getEnvVar("test");');
+  });
 
-    it('should translate pm.environment.set', () => {
-        const code = 'pm.environment.set("test", "value");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.setEnvVar("test", "value");');
-    });
+  it('should translate pm.environment.set', () => {
+    const code = 'pm.environment.set("test", "value");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.setEnvVar("test", "value");');
+  });
 
-    it('should translate pm.environment.has', () => {
-        const code = 'pm.environment.has("test")';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.getEnvVar("test") !== undefined && bru.getEnvVar("test") !== null');
-    });
+  it('should translate pm.environment.has', () => {
+    const code = 'pm.environment.has("test")';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.getEnvVar("test") !== undefined && bru.getEnvVar("test") !== null');
+  });
 
-    it('should translate pm.environment.unset', () => {
-        const code = 'pm.environment.unset("test");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.deleteEnvVar("test");');
-    });
+  it('should translate pm.environment.unset', () => {
+    const code = 'pm.environment.unset("test");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.deleteEnvVar("test");');
+  });
 
-    it('should translate pm.environment.name', () => {
-        const code = 'pm.environment.name;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.getEnvName();');
-    });
+  it('should translate pm.environment.name', () => {
+    const code = 'pm.environment.name;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.getEnvName();');
+  });
 
-    it('should handle nested Postman API calls with environment', () => {
-        const code = 'pm.environment.set("computed", pm.variables.get("base") + "-suffix");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.setEnvVar("computed", bru.getVar("base") + "-suffix");');
-    });
+  it('should handle nested Postman API calls with environment', () => {
+    const code = 'pm.environment.set("computed", pm.variables.get("base") + "-suffix");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.setEnvVar("computed", bru.getVar("base") + "-suffix");');
+  });
 
-    it('should handle JSON operations with environment variables', () => {
-        const code = 'pm.environment.set("user", JSON.stringify({ id: 123, name: "John" }));';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.setEnvVar("user", JSON.stringify({ id: 123, name: "John" }));');
-    });
+  it('should handle JSON operations with environment variables', () => {
+    const code = 'pm.environment.set("user", JSON.stringify({ id: 123, name: "John" }));';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.setEnvVar("user", JSON.stringify({ id: 123, name: "John" }));');
+  });
 
-    it('should handle JSON.parse with environment variables', () => {
-        const code = 'const userData = JSON.parse(pm.environment.get("user"));';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const userData = JSON.parse(bru.getEnvVar("user"));');
-    });
+  it('should handle JSON.parse with environment variables', () => {
+    const code = 'const userData = JSON.parse(pm.environment.get("user"));';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const userData = JSON.parse(bru.getEnvVar("user"));');
+  });
 
-    it('should translate pm.environment.name with different access patterns', () => {
-        const code = `
+  it('should translate pm.environment.name with different access patterns', () => {
+    const code = `
         const envName1 = pm.environment.name;
         const env = pm.environment;
         const envName2 = env.name;
         console.log(pm.environment.name);
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const envName1 = bru.getEnvName();
         const envName2 = bru.getEnvName();
         console.log(bru.getEnvName());
         `);
-    });
+  });
 
-    it('should handle environment aliases', () => {
-        const code = `
+  it('should handle environment aliases', () => {
+    const code = `
         const env = pm.environment;
         const name = env.name;
         const has = env.has("test");
@@ -73,37 +73,37 @@ describe('Environment Variable Translation', () => {
         const get = env.get("test");
         const unset = env.unset("test");
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const name = bru.getEnvName();
         const has = bru.getEnvVar("test") !== undefined && bru.getEnvVar("test") !== null;
         const set = bru.setEnvVar("test", "value");
         const get = bru.getEnvVar("test");
         const unset = bru.deleteEnvVar("test");
         `);
-    });
+  });
 
-    // Legacy API (postman.) tests related to environment
-    it('should translate postman.setEnvironmentVariable', () => {
-        const code = 'postman.setEnvironmentVariable("apiKey", "abc123");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.setEnvVar("apiKey", "abc123");');
-    });
+  // Legacy API (postman.) tests related to environment
+  it('should translate postman.setEnvironmentVariable', () => {
+    const code = 'postman.setEnvironmentVariable("apiKey", "abc123");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.setEnvVar("apiKey", "abc123");');
+  });
 
-    it('should translate postman.getEnvironmentVariable', () => {
-        const code = 'const baseUrl = postman.getEnvironmentVariable("baseUrl");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const baseUrl = bru.getEnvVar("baseUrl");');
-    });
+  it('should translate postman.getEnvironmentVariable', () => {
+    const code = 'const baseUrl = postman.getEnvironmentVariable("baseUrl");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const baseUrl = bru.getEnvVar("baseUrl");');
+  });
 
-    it('should translate postman.clearEnvironmentVariable', () => {
-        const code = 'postman.clearEnvironmentVariable("tempToken");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.deleteEnvVar("tempToken");');
-    });
+  it('should translate postman.clearEnvironmentVariable', () => {
+    const code = 'postman.clearEnvironmentVariable("tempToken");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.deleteEnvVar("tempToken");');
+  });
 
-    it('should handle all environment variable methods together', () => {
-        const code = `
+  it('should handle all environment variable methods together', () => {
+    const code = `
         // All environment variable methods
         const envName = pm.environment.name;
         const hasToken = pm.environment.has("token");
@@ -112,29 +112,29 @@ describe('Environment Variable Translation', () => {
         
         console.log(\`Environment: \${envName}, Has token: \${hasToken}, Token: \${token}\`);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const envName = bru.getEnvName();');
-        expect(translatedCode).toContain('const hasToken = bru.getEnvVar("token") !== undefined && bru.getEnvVar("token") !== null;');
-        expect(translatedCode).toContain('const token = bru.getEnvVar("token");');
-        expect(translatedCode).toContain('bru.setEnvVar("timestamp", new Date().toISOString());');
-    });
+    const translatedCode = translateCode(code);
 
-    // Additional robust tests for environment variables
-    it('should handle environment variables with computed property names', () => {
-        const code = `
+    expect(translatedCode).toContain('const envName = bru.getEnvName();');
+    expect(translatedCode).toContain('const hasToken = bru.getEnvVar("token") !== undefined && bru.getEnvVar("token") !== null;');
+    expect(translatedCode).toContain('const token = bru.getEnvVar("token");');
+    expect(translatedCode).toContain('bru.setEnvVar("timestamp", new Date().toISOString());');
+  });
+
+  // Additional robust tests for environment variables
+  it('should handle environment variables with computed property names', () => {
+    const code = `
         const prefix = "api";
         const suffix = "Key";
         pm.environment.set(prefix + "_" + suffix, "abc123");
         const computedValue = pm.environment.get(prefix + "_" + suffix);
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('bru.setEnvVar(prefix + "_" + suffix, "abc123");');
-        expect(translatedCode).toContain('const computedValue = bru.getEnvVar(prefix + "_" + suffix);');
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('bru.setEnvVar(prefix + "_" + suffix, "abc123");');
+    expect(translatedCode).toContain('const computedValue = bru.getEnvVar(prefix + "_" + suffix);');
+  });
 
-    it('should handle environment variables in complex object structures', () => {
-        const code = `
+  it('should handle environment variables in complex object structures', () => {
+    const code = `
         const config = {
             baseUrl: pm.environment.get("apiUrl"),
             headers: {
@@ -145,16 +145,16 @@ describe('Environment Variable Translation', () => {
             validate: pm.environment.has("validateResponses")
         };
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('baseUrl: bru.getEnvVar("apiUrl"),');
-        expect(translatedCode).toContain('"Authorization": "Bearer " + bru.getEnvVar("token"),');
-        expect(translatedCode).toContain('"X-Api-Key": bru.getEnvVar("apiKey") || "default-key"');
-        expect(translatedCode).toContain('timeout: parseInt(bru.getEnvVar("timeout") || "5000"),');
-        expect(translatedCode).toContain('validate: bru.getEnvVar("validateResponses") !== undefined && bru.getEnvVar("validateResponses") !== null');
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('baseUrl: bru.getEnvVar("apiUrl"),');
+    expect(translatedCode).toContain('"Authorization": "Bearer " + bru.getEnvVar("token"),');
+    expect(translatedCode).toContain('"X-Api-Key": bru.getEnvVar("apiKey") || "default-key"');
+    expect(translatedCode).toContain('timeout: parseInt(bru.getEnvVar("timeout") || "5000"),');
+    expect(translatedCode).toContain('validate: bru.getEnvVar("validateResponses") !== undefined && bru.getEnvVar("validateResponses") !== null');
+  });
 
-    it('should handle environment variables in conditionals correctly', () => {
-        const code = `
+  it('should handle environment variables in conditionals correctly', () => {
+    const code = `
         if (pm.environment.has("apiKey")) {
             if (pm.environment.get("apiKey").length > 0) {
                 console.log("Valid API key exists");
@@ -165,29 +165,29 @@ describe('Environment Variable Translation', () => {
             console.log("No API key defined");
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('if (bru.getEnvVar("apiKey") !== undefined && bru.getEnvVar("apiKey") !== null) {');
-        expect(translatedCode).toContain('if (bru.getEnvVar("apiKey").length > 0) {');
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('if (bru.getEnvVar("apiKey") !== undefined && bru.getEnvVar("apiKey") !== null) {');
+    expect(translatedCode).toContain('if (bru.getEnvVar("apiKey").length > 0) {');
+  });
 
-    it('should handle multiple levels of environment variable aliasing', () => {
-        const code = `
+  it('should handle multiple levels of environment variable aliasing', () => {
+    const code = `
         const env = pm.environment;
         
         env.set("key", "value");
         const value = env.get("key");
         const exists = env.has("key");
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         bru.setEnvVar("key", "value");
         const value = bru.getEnvVar("key");
         const exists = bru.getEnvVar("key") !== undefined && bru.getEnvVar("key") !== null;
         `);
-    });
+  });
 
-    it('should handle environment variables with dynamic values', () => {
-        const code = `
+  it('should handle environment variables with dynamic values', () => {
+    const code = `
         // Generate a timestamp for this request
         const timestamp = new Date().toISOString();
         pm.environment.set("requestTimestamp", timestamp);
@@ -201,14 +201,14 @@ describe('Environment Variable Translation', () => {
         expiryTime.setMinutes(expiryTime.getMinutes() + 30);
         pm.environment.set("tokenExpiry", expiryTime.getTime());
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('bru.setEnvVar("requestTimestamp", timestamp);');
-        expect(translatedCode).toContain('bru.setEnvVar("requestId", uniqueId);');
-        expect(translatedCode).toContain('bru.setEnvVar("tokenExpiry", expiryTime.getTime());');
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('bru.setEnvVar("requestTimestamp", timestamp);');
+    expect(translatedCode).toContain('bru.setEnvVar("requestId", uniqueId);');
+    expect(translatedCode).toContain('bru.setEnvVar("tokenExpiry", expiryTime.getTime());');
+  });
 
-    it('should handle environment variables in try-catch blocks', () => {
-        const code = `
+  it('should handle environment variables in try-catch blocks', () => {
+    const code = `
         try {
             const configStr = pm.environment.get("config");
             const config = JSON.parse(configStr);
@@ -218,13 +218,13 @@ describe('Environment Variable Translation', () => {
             pm.environment.set("configError", error.message);
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('const configStr = bru.getEnvVar("config");');
-        expect(translatedCode).toContain('bru.setEnvVar("configError", error.message);');
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('const configStr = bru.getEnvVar("config");');
+    expect(translatedCode).toContain('bru.setEnvVar("configError", error.message);');
+  });
 
-    it('should handle legacy environment and pm.setEnvironmentVariable together', () => {
-        const code = `
+  it('should handle legacy environment and pm.setEnvironmentVariable together', () => {
+    const code = `
         // Legacy style
         postman.setEnvironmentVariable("legacyKey", "legacyValue");
         
@@ -234,9 +234,9 @@ describe('Environment Variable Translation', () => {
         // Another legacy form
         pm.setEnvironmentVariable("thirdKey", "thirdValue");
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('bru.setEnvVar("legacyKey", "legacyValue");');
-        expect(translatedCode).toContain('const value = bru.getEnvVar("anotherKey");');
-        expect(translatedCode).toContain('bru.setEnvVar("thirdKey", "thirdValue");');
-    });
-}); 
\ No newline at end of file
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('bru.setEnvVar("legacyKey", "legacyValue");');
+    expect(translatedCode).toContain('const value = bru.getEnvVar("anotherKey");');
+    expect(translatedCode).toContain('bru.setEnvVar("thirdKey", "thirdValue");');
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/exec-flow.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/exec-flow.test.js
index 053e99685..838b6a838 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/exec-flow.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/exec-flow.test.js
@@ -1,33 +1,33 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Execution Flow Translation', () => {
-    // Request flow control
-    it('should translate pm.setNextRequest', () => {
-        const code = 'pm.setNextRequest("Get User Details");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.setNextRequest("Get User Details");');
-    });
+  // Request flow control
+  it('should translate pm.setNextRequest', () => {
+    const code = 'pm.setNextRequest("Get User Details");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.setNextRequest("Get User Details");');
+  });
 
-    it('should translate pm.execution.skipRequest', () => {
-        const code = 'if (condition) pm.execution.skipRequest();';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('if (condition) bru.runner.skipRequest();');
-    });
+  it('should translate pm.execution.skipRequest', () => {
+    const code = 'if (condition) pm.execution.skipRequest();';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('if (condition) bru.runner.skipRequest();');
+  });
 
-    it('should translate pm.execution.setNextRequest(null)', () => {
-        const code = 'pm.execution.setNextRequest(null);';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.runner.stopExecution();');
-    });
+  it('should translate pm.execution.setNextRequest(null)', () => {
+    const code = 'pm.execution.setNextRequest(null);';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.runner.stopExecution();');
+  });
 
-    it('should translate pm.execution.setNextRequest("null")', () => {
-        const code = 'pm.execution.setNextRequest("null");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('bru.runner.stopExecution();');
-    });
+  it('should translate pm.execution.setNextRequest("null")', () => {
+    const code = 'pm.execution.setNextRequest("null");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('bru.runner.stopExecution();');
+  });
 
-    it('should handle pm.execution.setNextRequest with non-null parameters', () => {
-        const code = `
+  it('should handle pm.execution.setNextRequest with non-null parameters', () => {
+    const code = `
         // Continue normal flow
         pm.execution.setNextRequest("Get user details");
         
@@ -35,14 +35,14 @@ describe('Execution Flow Translation', () => {
         const nextReq = "Update profile";
         pm.execution.setNextRequest(nextReq);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('bru.runner.setNextRequest("Get user details");');
-        expect(translatedCode).toContain('bru.runner.setNextRequest(nextReq);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle all execution control methods together', () => {
-        const code = `
+    expect(translatedCode).toContain('bru.runner.setNextRequest("Get user details");');
+    expect(translatedCode).toContain('bru.runner.setNextRequest(nextReq);');
+  });
+
+  it('should handle all execution control methods together', () => {
+    const code = `
         // All execution control methods
         if (pm.response.code === 401) {
             pm.execution.skipRequest();
@@ -52,13 +52,13 @@ describe('Execution Flow Translation', () => {
             pm.setNextRequest("Get User Details");
         }
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('if (res.getStatus() === 401) {');
-        expect(translatedCode).toContain('bru.runner.skipRequest();');
-        expect(translatedCode).toContain('} else if (res.getStatus() === 500) {');
-        expect(translatedCode).toContain('bru.runner.stopExecution();');
-        expect(translatedCode).toContain('} else {');
-        expect(translatedCode).toContain('bru.setNextRequest("Get User Details");');
-    });
-}); 
\ No newline at end of file
+    const translatedCode = translateCode(code);
+
+    expect(translatedCode).toContain('if (res.getStatus() === 401) {');
+    expect(translatedCode).toContain('bru.runner.skipRequest();');
+    expect(translatedCode).toContain('} else if (res.getStatus() === 500) {');
+    expect(translatedCode).toContain('bru.runner.stopExecution();');
+    expect(translatedCode).toContain('} else {');
+    expect(translatedCode).toContain('bru.setNextRequest("Get User Details");');
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/legacy-global-apis.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/legacy-global-apis.test.js
index 489bf734a..549611acd 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/legacy-global-apis.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/legacy-global-apis.test.js
@@ -6,12 +6,12 @@ describe('Legacy Postman API Translation', () => {
       const input = `
         const data = JSON.parse(responseBody);
 `;
-      
+
       const result = translateCode(input);
       const expected = `
         const data = res.getBody();
 `;
-      
+
       expect(result).toEqual(expected);
     });
 
@@ -20,9 +20,9 @@ describe('Legacy Postman API Translation', () => {
         console.log(responseHeaders);
         const headers = responseHeaders;
       `;
-      
+
       const result = translateCode(input);
-      
+
       expect(result).toContain('res.getHeaders()');
       expect(result).not.toContain('responseHeaders');
     });
@@ -32,9 +32,9 @@ describe('Legacy Postman API Translation', () => {
         console.log(responseTime);
         const time = responseTime;
       `;
-      
+
       const result = translateCode(input);
-      
+
       expect(result).toContain('res.getResponseTime()');
       expect(result).not.toContain('responseTime');
     });
@@ -44,9 +44,9 @@ describe('Legacy Postman API Translation', () => {
         const data = JSON.parse(responseBody);
         console.log(data);
       `;
-      
+
       const result = translateCode(input);
-      
+
       expect(result).toContain('res.getBody()');
       expect(result).not.toContain('JSON.parse(responseBody)');
       expect(result).not.toContain('responseBody');
@@ -61,7 +61,7 @@ describe('Legacy Postman API Translation', () => {
       const expected = `
         console.log(res.getBody());
       `;
-      
+
       expect(result).toContain(expected);
     });
 
@@ -73,9 +73,9 @@ describe('Legacy Postman API Translation', () => {
         
         console.log(data, headers, time);
       `;
-      
+
       const result = translateCode(input);
-      
+
       expect(result).toContain('res.getBody()');
       expect(result).toContain('res.getHeaders()');
       expect(result).toContain('res.getResponseTime()');
@@ -91,13 +91,13 @@ describe('Legacy Postman API Translation', () => {
         const responseBody = pm.response.json();
         console.log(responseBody);
       `;
-      
+
       const result = translateCode(input);
       const expected = `
         const responseBody = res.getBody();
         console.log(responseBody);
       `;
-      
+
       // pm.response.json() should be transformed to res.getBody() (Postman API transformation)
       expect(result).toEqual(expected);
     });
@@ -107,13 +107,13 @@ describe('Legacy Postman API Translation', () => {
         const responseHeaders = pm.response.headers;
         console.log(responseHeaders);
       `;
-      
+
       const result = translateCode(input);
       const expected = `
         const responseHeaders = res.getHeaders();
         console.log(responseHeaders);
       `;
-      
+
       expect(result).toEqual(expected);
     });
 
@@ -122,13 +122,13 @@ describe('Legacy Postman API Translation', () => {
         const responseTime = pm.response.responseTime;
         console.log(responseTime);
       `;
-      
+
       const result = translateCode(input);
       const expected = `
         const responseTime = res.getResponseTime();
         console.log(responseTime);
       `;
-      
+
       expect(result).toEqual(expected);
     });
 
@@ -138,14 +138,14 @@ describe('Legacy Postman API Translation', () => {
         const data = JSON.parse(responseBody);
         console.log(data);
       `;
-      
+
       const result = translateCode(input);
       const expected = `
         const responseBody = res.getBody();
         const data = JSON.parse(responseBody);
         console.log(data);
       `;
-      
+
       expect(result).toEqual(expected);
     });
   });
@@ -158,7 +158,7 @@ describe('Legacy Postman API Translation', () => {
         console.log(responseHeaders);
         console.log(responseTime);
       `;
-      
+
       const result = translateCode(input);
       const expected = `
         const responseBody = res.getBody();
@@ -166,9 +166,8 @@ describe('Legacy Postman API Translation', () => {
         console.log(res.getHeaders());
         console.log(res.getResponseTime());
       `;
-      
-      expect(result).toEqual(expected);
 
+      expect(result).toEqual(expected);
     });
 
     test('should translate JSON.parse(responseBody) only when no conflict exists', () => {
@@ -177,14 +176,14 @@ describe('Legacy Postman API Translation', () => {
         const data = JSON.parse(responseBody);
         console.log(responseHeaders);
       `;
-      
+
       const result = translateCode(input);
       const expected = `
         const responseHeaders = res.getHeaders();
         const data = res.getBody();
         console.log(responseHeaders);
       `;
-      
+
       expect(result).toEqual(expected);
     });
   });
@@ -197,7 +196,7 @@ describe('Legacy Postman API Translation', () => {
           console.log(responseHeaders);
         }
       `;
-      
+
       const result = translateCode(input);
       const expected = `
         function test(responseBody) {
@@ -205,7 +204,7 @@ describe('Legacy Postman API Translation', () => {
           console.log(res.getHeaders());
         }
       `;
-      
+
       expect(result).toEqual(expected);
     });
 
@@ -217,9 +216,9 @@ describe('Legacy Postman API Translation', () => {
         };
         console.log(responseTime);
       `;
-      
+
       const result = translateCode(input);
-      
+
       const expected = `
         const config = {
           responseBody: 'custom',
@@ -227,7 +226,7 @@ describe('Legacy Postman API Translation', () => {
         };
         console.log(res.getResponseTime());
       `;
-      
+
       expect(result).toEqual(expected);
     });
 
@@ -237,15 +236,15 @@ describe('Legacy Postman API Translation', () => {
         responseHeaders = 'new headers';
         console.log(responseTime);
       `;
-      
+
       const result = translateCode(input);
-      
+
       const expected = `
         responseBody = 'new value';
         responseHeaders = 'new headers';
         console.log(res.getResponseTime());
       `;
-      
+
       expect(result).toEqual(expected);
     });
 
@@ -261,9 +260,9 @@ describe('Legacy Postman API Translation', () => {
           console.log(responseHeaders);
         }
       `;
-      
+
       const result = translateCode(input);
-      
+
       const expected = `
         const responseBody = res.getBody();
         const data = JSON.parse(responseBody);
@@ -275,7 +274,7 @@ describe('Legacy Postman API Translation', () => {
           console.log(res.getHeaders());
         }
       `;
-      
+
       expect(result).toEqual(expected);
     });
   });
@@ -286,13 +285,13 @@ describe('Legacy Postman API Translation', () => {
         const data = { name: 'test' };
         console.log(data.name);
       `;
-      
+
       const result = translateCode(input);
       const expected = `
         const data = { name: 'test' };
         console.log(data.name);
       `;
-      
+
       expect(result).toEqual(expected);
     });
   });
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/legacy-tests-syntax.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/legacy-tests-syntax.test.js
index 34c6f32a6..f10203bbe 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/legacy-tests-syntax.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/legacy-tests-syntax.test.js
@@ -1,156 +1,156 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Legacy Tests[] Syntax Translation', () => {
-    it('should handle tests[] commands', () => {
-        const code = `
+  it('should handle tests[] commands', () => {
+    const code = `
         tests["Status code is 200"] = pm.response.code === 200;`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         test("Status code is 200", function() {
                 expect(Boolean(res.getStatus() === 200)).to.be.true;
         });`);
-    });
+  });
 
-    it('should handle tests[] with complex expressions', () => {
-        const code = `
+  it('should handle tests[] with complex expressions', () => {
+    const code = `
         tests["Response has valid data"] = pm.response.json().data && pm.response.json().data.length > 0;`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         test("Response has valid data", function() {
                 expect(Boolean(res.getBody().data && res.getBody().data.length > 0)).to.be.true;
         });`);
-    });
+  });
 
-    it('should handle tests[] with string equality', () => {
-        const code = `
+  it('should handle tests[] with string equality', () => {
+    const code = `
         tests["Content-Type is application/json"] = pm.response.headers.get("Content-Type") === "application/json";`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         test("Content-Type is application/json", function() {
                 expect(Boolean(res.getHeader("Content-Type") === "application/json")).to.be.true;
         });`);
-    });
+  });
 
-    it('should handle tests[] with function calls', () => {
-        const code = `
+  it('should handle tests[] with function calls', () => {
+    const code = `
         tests["Response time is acceptable"] = pm.response.responseTime < 500;`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         test("Response time is acceptable", function() {
                 expect(Boolean(res.getResponseTime() < 500)).to.be.true;
         });`);
-    });
+  });
 
-    it('should handle tests[] with variable references', () => {
-        const code = `
+  it('should handle tests[] with variable references', () => {
+    const code = `
         const expectedStatus = 201;
         tests["Status code is correct"] = pm.response.code === expectedStatus;`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const expectedStatus = 201;
         test("Status code is correct", function() {
                 expect(Boolean(res.getStatus() === expectedStatus)).to.be.true;
         });`);
-    });
+  });
 
-    it('should handle multiple tests[] statements', () => {
-        const code = `
+  it('should handle multiple tests[] statements', () => {
+    const code = `
         tests["Status code is 200"] = pm.response.code === 200;
         tests["Response has data"] = pm.response.json().hasOwnProperty("data");`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         test("Status code is 200", function() {
                 expect(Boolean(res.getStatus() === 200)).to.be.true;
         });
         test("Response has data", function() {
                 expect(Boolean(res.getBody().hasOwnProperty("data"))).to.be.true;
         });`);
-    });
+  });
 
-    it('should handle tests[] with special characters in name', () => {
-        const code = `
+  it('should handle tests[] with special characters in name', () => {
+    const code = `
         tests["Special characters: !@#$%^&*()"] = true;`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         test("Special characters: !@#$%^&*()", function() {
                 expect(Boolean(true)).to.be.true;
         });`);
-    });
+  });
 
-    it('should handle tests[] with pm.environment variables', () => {
-        const code = `
+  it('should handle tests[] with pm.environment variables', () => {
+    const code = `
         tests["Response matches environment variable"] = pm.response.json().id === pm.environment.get("expectedId");`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         test("Response matches environment variable", function() {
                 expect(Boolean(res.getBody().id === bru.getEnvVar("expectedId"))).to.be.true;
         });`);
-    });
+  });
 
-    it('should handle nested pm objects in tests[] assignments', () => {
-        const code = `
+  it('should handle nested pm objects in tests[] assignments', () => {
+    const code = `
         tests["Authentication header is present"] = pm.request.headers.has("Authorization");
         tests["Data count is correct"] = pm.response.json().items.length === pm.variables.get("expectedCount");
         `;
-        const translatedCode = translateCode(code);
-        
-        // The exact translation might vary depending on implementation details,
-        // but we can check for key transformations
-        expect(translatedCode).toContain('test("Authentication header is present"');
-        expect(translatedCode).toContain('test("Data count is correct"');
-        expect(translatedCode).toContain('res.getBody().items.length === bru.getVar("expectedCount")');
-    });
+    const translatedCode = translateCode(code);
 
-    // Additional robust tests for legacy tests[] syntax
-    it('should handle tests[] with complex boolean expressions', () => {
-        const code = `
+    // The exact translation might vary depending on implementation details,
+    // but we can check for key transformations
+    expect(translatedCode).toContain('test("Authentication header is present"');
+    expect(translatedCode).toContain('test("Data count is correct"');
+    expect(translatedCode).toContain('res.getBody().items.length === bru.getVar("expectedCount")');
+  });
+
+  // Additional robust tests for legacy tests[] syntax
+  it('should handle tests[] with complex boolean expressions', () => {
+    const code = `
         tests["Complex validation"] = (pm.response.code >= 200 && pm.response.code < 300) || 
                                      (pm.response.json().success === true && pm.response.json().data !== null);`;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Complex validation", function() {');
-        expect(translatedCode).toContain('expect(Boolean((res.getStatus() >= 200 && res.getStatus() < 300) ||');
-        expect(translatedCode).toContain('(res.getBody().success === true && res.getBody().data !== null))).to.be.true;');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle tests[] with array methods', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Complex validation", function() {');
+    expect(translatedCode).toContain('expect(Boolean((res.getStatus() >= 200 && res.getStatus() < 300) ||');
+    expect(translatedCode).toContain('(res.getBody().success === true && res.getBody().data !== null))).to.be.true;');
+  });
+
+  it('should handle tests[] with array methods', () => {
+    const code = `
         tests["All items have an ID"] = pm.response.json().items.every(item => item.hasOwnProperty('id'));
         tests["Has premium item"] = pm.response.json().items.some(item => item.type === 'premium');`;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("All items have an ID", function() {');
-        expect(translatedCode).toContain('expect(Boolean(res.getBody().items.every(item => item.hasOwnProperty(\'id\')))).to.be.true;');
-        expect(translatedCode).toContain('test("Has premium item", function() {');
-        expect(translatedCode).toContain('expect(Boolean(res.getBody().items.some(item => item.type === \'premium\'))).to.be.true;');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle tests[] with template literals in the name', () => {
-        const code = `
+    expect(translatedCode).toContain('test("All items have an ID", function() {');
+    expect(translatedCode).toContain('expect(Boolean(res.getBody().items.every(item => item.hasOwnProperty(\'id\')))).to.be.true;');
+    expect(translatedCode).toContain('test("Has premium item", function() {');
+    expect(translatedCode).toContain('expect(Boolean(res.getBody().items.some(item => item.type === \'premium\'))).to.be.true;');
+  });
+
+  it('should handle tests[] with template literals in the name', () => {
+    const code = `
         const endpoint = "users";
         tests[\`Endpoint \${endpoint} returns valid response\`] = pm.response.code === 200;`;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const endpoint = "users";');
-        expect(translatedCode).toContain('test(`Endpoint ${endpoint} returns valid response`, function() {');
-        expect(translatedCode).toContain('expect(Boolean(res.getStatus() === 200)).to.be.true;');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle tests[] with deep property access', () => {
-        const code = `
+    expect(translatedCode).toContain('const endpoint = "users";');
+    expect(translatedCode).toContain('test(`Endpoint ${endpoint} returns valid response`, function() {');
+    expect(translatedCode).toContain('expect(Boolean(res.getStatus() === 200)).to.be.true;');
+  });
+
+  it('should handle tests[] with deep property access', () => {
+    const code = `
         tests["User has admin role"] = pm.response.json().user && 
                                      pm.response.json().user.roles && 
                                      pm.response.json().user.roles.includes('admin');`;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("User has admin role", function() {');
-        expect(translatedCode).toContain('expect(Boolean(res.getBody().user &&');
-        expect(translatedCode).toContain('res.getBody().user.roles &&');
-        expect(translatedCode).toContain('res.getBody().user.roles.includes(\'admin\'))).to.be.true;');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle tests[] with JSON schema validation patterns', () => {
-        const code = `
+    expect(translatedCode).toContain('test("User has admin role", function() {');
+    expect(translatedCode).toContain('expect(Boolean(res.getBody().user &&');
+    expect(translatedCode).toContain('res.getBody().user.roles &&');
+    expect(translatedCode).toContain('res.getBody().user.roles.includes(\'admin\'))).to.be.true;');
+  });
+
+  it('should handle tests[] with JSON schema validation patterns', () => {
+    const code = `
         const schema = {
             type: "object",
             required: ["id", "name"],
@@ -166,20 +166,20 @@ describe('Legacy Tests[] Syntax Translation', () => {
         tests["Has required fields"] = data.hasOwnProperty('id') && data.hasOwnProperty('name');
         tests["ID is string"] = typeof data.id === 'string';
         tests["Name is string"] = typeof data.name === 'string';`;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const schema = {');
-        expect(translatedCode).toContain('type: "object",');
-        expect(translatedCode).toContain('required: ["id", "name"],');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('test("Has required fields", function() {');
-        expect(translatedCode).toContain('expect(Boolean(data.hasOwnProperty(\'id\') && data.hasOwnProperty(\'name\'))).to.be.true;');
-        expect(translatedCode).toContain('test("ID is string", function() {');
-        expect(translatedCode).toContain('expect(Boolean(typeof data.id === \'string\')).to.be.true;');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle tests[] within conditional blocks', () => {
-        const code = `
+    expect(translatedCode).toContain('const schema = {');
+    expect(translatedCode).toContain('type: "object",');
+    expect(translatedCode).toContain('required: ["id", "name"],');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('test("Has required fields", function() {');
+    expect(translatedCode).toContain('expect(Boolean(data.hasOwnProperty(\'id\') && data.hasOwnProperty(\'name\'))).to.be.true;');
+    expect(translatedCode).toContain('test("ID is string", function() {');
+    expect(translatedCode).toContain('expect(Boolean(typeof data.id === \'string\')).to.be.true;');
+  });
+
+  it('should handle tests[] within conditional blocks', () => {
+    const code = `
         const data = pm.response.json();
         
         if (pm.response.code === 200) {
@@ -191,22 +191,22 @@ describe('Legacy Tests[] Syntax Translation', () => {
         } else {
             tests["Error response has message"] = data.hasOwnProperty('message');
         }`;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('if (res.getStatus() === 200) {');
-        expect(translatedCode).toContain('test("Success response has data", function() {');
-        expect(translatedCode).toContain('expect(Boolean(data.hasOwnProperty(\'items\'))).to.be.true;');
-        expect(translatedCode).toContain('if (data.items.length > 0) {');
-        expect(translatedCode).toContain('test("First item has ID", function() {');
-        expect(translatedCode).toContain('expect(Boolean(data.items[0].hasOwnProperty(\'id\'))).to.be.true;');
-        expect(translatedCode).toContain('} else {');
-        expect(translatedCode).toContain('test("Error response has message", function() {');
-        expect(translatedCode).toContain('expect(Boolean(data.hasOwnProperty(\'message\'))).to.be.true;');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle tests[] with combination of legacy and modern styles', () => {
-        const code = `
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('if (res.getStatus() === 200) {');
+    expect(translatedCode).toContain('test("Success response has data", function() {');
+    expect(translatedCode).toContain('expect(Boolean(data.hasOwnProperty(\'items\'))).to.be.true;');
+    expect(translatedCode).toContain('if (data.items.length > 0) {');
+    expect(translatedCode).toContain('test("First item has ID", function() {');
+    expect(translatedCode).toContain('expect(Boolean(data.items[0].hasOwnProperty(\'id\'))).to.be.true;');
+    expect(translatedCode).toContain('} else {');
+    expect(translatedCode).toContain('test("Error response has message", function() {');
+    expect(translatedCode).toContain('expect(Boolean(data.hasOwnProperty(\'message\'))).to.be.true;');
+  });
+
+  it('should handle tests[] with combination of legacy and modern styles', () => {
+    const code = `
         // Legacy style
         tests["Status code is 200"] = pm.response.code === 200;
         
@@ -219,20 +219,20 @@ describe('Legacy Tests[] Syntax Translation', () => {
             // Mix by using tests[] inside pm.test
             tests["All items have price"] = json.items.every(item => item.hasOwnProperty('price'));
         });`;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Status code is 200", function() {');
-        expect(translatedCode).toContain('expect(Boolean(res.getStatus() === 200)).to.be.true;');
-        expect(translatedCode).toContain('test("Response has valid data", function() {');
-        expect(translatedCode).toContain('const json = res.getBody();');
-        expect(translatedCode).toContain('expect(json).to.be.an(\'object\');');
-        expect(translatedCode).toContain('expect(json.items).to.be.an(\'array\');');
-        expect(translatedCode).toContain('test("All items have price", function() {');
-        expect(translatedCode).toContain('expect(Boolean(json.items.every(item => item.hasOwnProperty(\'price\')))).to.be.true;');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle complex real-world tests[] example', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Status code is 200", function() {');
+    expect(translatedCode).toContain('expect(Boolean(res.getStatus() === 200)).to.be.true;');
+    expect(translatedCode).toContain('test("Response has valid data", function() {');
+    expect(translatedCode).toContain('const json = res.getBody();');
+    expect(translatedCode).toContain('expect(json).to.be.an(\'object\');');
+    expect(translatedCode).toContain('expect(json.items).to.be.an(\'array\');');
+    expect(translatedCode).toContain('test("All items have price", function() {');
+    expect(translatedCode).toContain('expect(Boolean(json.items.every(item => item.hasOwnProperty(\'price\')))).to.be.true;');
+  });
+
+  it('should handle complex real-world tests[] example', () => {
+    const code = `
         // Parse response
         const response = pm.response.json();
         
@@ -264,20 +264,20 @@ describe('Legacy Tests[] Syntax Translation', () => {
             pm.environment.set("targetItemId", targetItem.id);
             tests["Found target item"] = true;
         }`;
-        const translatedCode = translateCode(code);
-        
-        // Check key transformations
-        expect(translatedCode).toContain('const response = res.getBody();');
-        expect(translatedCode).toContain('test("Status code is 200", function() {');
-        expect(translatedCode).toContain('expect(Boolean(res.getStatus() === 200)).to.be.true;');
-        expect(translatedCode).toContain('test("Has content-type header", function() {');
-        expect(translatedCode).toContain('expect(Boolean(res.getHeaders().has("Content-Type"))).to.be.true;');
-        expect(translatedCode).toContain('test("Content-Type is JSON", function() {');
-        expect(translatedCode).toContain('expect(Boolean(res.getHeader("Content-Type").includes("application/json"))).to.be.true;');
-        expect(translatedCode).toContain('const expectedItems = parseInt(bru.getEnvVar("expectedItemCount"));');
-        expect(translatedCode).toContain('test("Has correct number of items", function() {');
-        expect(translatedCode).toContain('expect(Boolean(response.items.length === expectedItems)).to.be.true;');
-        expect(translatedCode).toContain('const targetItem = response.items.find(item => item.name === bru.getVar("targetItemName"));');
-        expect(translatedCode).toContain('bru.setEnvVar("targetItemId", targetItem.id);');
-    });
-}); 
\ No newline at end of file
+    const translatedCode = translateCode(code);
+
+    // Check key transformations
+    expect(translatedCode).toContain('const response = res.getBody();');
+    expect(translatedCode).toContain('test("Status code is 200", function() {');
+    expect(translatedCode).toContain('expect(Boolean(res.getStatus() === 200)).to.be.true;');
+    expect(translatedCode).toContain('test("Has content-type header", function() {');
+    expect(translatedCode).toContain('expect(Boolean(res.getHeaders().has("Content-Type"))).to.be.true;');
+    expect(translatedCode).toContain('test("Content-Type is JSON", function() {');
+    expect(translatedCode).toContain('expect(Boolean(res.getHeader("Content-Type").includes("application/json"))).to.be.true;');
+    expect(translatedCode).toContain('const expectedItems = parseInt(bru.getEnvVar("expectedItemCount"));');
+    expect(translatedCode).toContain('test("Has correct number of items", function() {');
+    expect(translatedCode).toContain('expect(Boolean(response.items.length === expectedItems)).to.be.true;');
+    expect(translatedCode).toContain('const targetItem = response.items.find(item => item.name === bru.getVar("targetItemName"));');
+    expect(translatedCode).toContain('bru.setEnvVar("targetItemId", targetItem.id);');
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/multiline-syntax.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/multiline-syntax.test.js
index a9be82130..cb7a61685 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/multiline-syntax.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/multiline-syntax.test.js
@@ -90,7 +90,7 @@ describe('Multiline Syntax Handling', () => {
     const translatedCode = translateCode(code);
     expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("content-type".toLowerCase())');
   });
-  
+
   it('should handle response properties with multiline syntax', () => {
     const code = `
     const responseBody = pm
@@ -189,7 +189,7 @@ describe('Multiline Syntax Handling', () => {
     expect(translatedCode).toContain('.property(\'success\')');
     expect(translatedCode).toContain('.equal(true)');
   });
-  
+
   it('should handle a comprehensive script with various multiline formats', () => {
     const code = `
     // This comprehensive script tests different multiline styles and whitespace variations
@@ -253,31 +253,31 @@ describe('Multiline Syntax Handling', () => {
       }
     }
     `;
-    
+
     const translatedCode = translateCode(code);
-    
+
     expect(translatedCode).toContain('const baseUrl = bru.getEnvVar("baseUrl")');
     expect(translatedCode).toContain('const apiKey = bru.getEnvVar("apiKey")');
     expect(translatedCode).toContain('const userId = bru.getEnvVar("userId")');
-    
+
     // Check variables translations
     expect(translatedCode).toContain('bru.setVar("testId", "test-" + Date.now())');
     expect(translatedCode).toContain('bru.setVar("timestamp", new Date().toISOString())');
-    
+
     // Check collection variables
     expect(translatedCode).toContain('bru.setVar("lastRun", new Date())');
-    
+
     // Check complex conditionals
     expect(translatedCode).toContain('if (bru.getEnvVar("apiKey") !== undefined && bru.getEnvVar("apiKey") !== null &&');
     expect(translatedCode).toContain('bru.hasVar("testId"))');
-    
+
     // Check response testing
     expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200)');
     expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("content-type".toLowerCase())');
-    
+
     // Check flow control
     expect(translatedCode).toContain('if (res.getStatus() === 401)');
     expect(translatedCode).toContain('bru.runner.stopExecution()');
     expect(translatedCode).toContain('bru.runner.setNextRequest("Next API Call")');
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/postman-references.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/postman-references.test.js
index 20e7890a7..99adb5447 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/postman-references.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/postman-references.test.js
@@ -38,7 +38,7 @@ describe('Postman to PM References Conversion', () => {
         pm.expect(pm.response.code).to.equal(200);
     });
     `;
-    
+
     const translatedCode = translateCode(code);
     expect(translatedCode).toContain('const apiKey = bru.getEnvVar("apiKey");');
     expect(translatedCode).toContain('const baseUrl = bru.getEnvVar("baseUrl");');
@@ -51,7 +51,7 @@ describe('Postman to PM References Conversion', () => {
     const { environment } = postman;
     environment.set("key", "value");
     `;
-    
+
     const translatedCode = translateCode(code);
     expect(translatedCode).toContain('bru.setEnvVar("key", "value");');
   });
@@ -67,7 +67,7 @@ describe('Postman to PM References Conversion', () => {
         postman.setNextRequest("Development Flow");
     }
     `;
-    
+
     const translatedCode = translateCode(code);
     expect(translatedCode).toContain('if (bru.getEnvVar("isProduction") === "true") {');
     expect(translatedCode).toContain('const apiUrl = bru.getEnvVar("prodUrl");');
@@ -86,7 +86,7 @@ describe('Postman to PM References Conversion', () => {
     // Set environment variables with response data
     postman.setEnvironmentVariable("lastResponseCode", responseCode);
     `;
-    
+
     const translatedCode = translateCode(code);
     expect(translatedCode).toContain('const responseCode = res.getStatus();');
     expect(translatedCode).toContain('const responseBody = res.getBody();');
@@ -99,7 +99,7 @@ describe('Postman to PM References Conversion', () => {
     console.log("This is a pm script");
     const message = "We're using pm to test our API";
     `;
-    
+
     const translatedCode = translateCode(code);
     expect(translatedCode).toContain('console.log("This is a pm script");');
     expect(translatedCode).toContain('const message = "We\'re using pm to test our API";');
@@ -121,7 +121,7 @@ describe('Postman to PM References Conversion', () => {
         postman.expect(code).to.equal(200);
     });
     `;
-    
+
     const translatedCode = translateCode(code);
     // Should handle the aliases properly
     expect(translatedCode).toContain('const apiKey = bru.getEnvVar("apiKey");');
@@ -129,4 +129,4 @@ describe('Postman to PM References Conversion', () => {
     expect(translatedCode).toContain('test("Response is valid", function() {');
     expect(translatedCode).toContain('expect(code).to.equal(200);');
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/request.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/request.test.js
index a81bc6c72..989fd3817 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/request.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/request.test.js
@@ -1,54 +1,54 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Request Translation', () => {
-    it('should translate pm.request.url', () => {
-        const code = 'const requestUrl = pm.request.url;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const requestUrl = req.getUrl();');
-    });
+  it('should translate pm.request.url', () => {
+    const code = 'const requestUrl = pm.request.url;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const requestUrl = req.getUrl();');
+  });
 
-    it('should translate pm.request.method', () => {
-        const code = 'const method = pm.request.method;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const method = req.getMethod();');
-    });
+  it('should translate pm.request.method', () => {
+    const code = 'const method = pm.request.method;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const method = req.getMethod();');
+  });
 
-    it('should translate pm.request.headers', () => {
-        const code = 'const headers = pm.request.headers;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const headers = req.getHeaders();');
-    });
+  it('should translate pm.request.headers', () => {
+    const code = 'const headers = pm.request.headers;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const headers = req.getHeaders();');
+  });
 
-    it('should translate pm.request.body', () => {
-        const code = 'const body = pm.request.body;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const body = req.getBody();');
-    });
+  it('should translate pm.request.body', () => {
+    const code = 'const body = pm.request.body;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const body = req.getBody();');
+  });
 
-    it('should translate pm.response.statusText', () => {
-        const code = 'const statusText = pm.response.statusText;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const statusText = res.statusText;');
-    });
+  it('should translate pm.response.statusText', () => {
+    const code = 'const statusText = pm.response.statusText;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const statusText = res.statusText;');
+  });
 
-    it('should translate multiple request methods in one block', () => {
-        const code = `
+  it('should translate multiple request methods in one block', () => {
+    const code = `
         const url = pm.request.url;
         const method = pm.request.method;
         const headers = pm.request.headers;
         const body = pm.request.body;
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const url = req.getUrl();
         const method = req.getMethod();
         const headers = req.getHeaders();
         const body = req.getBody();
         `);
-    });
+  });
 
-    it('should handle request and response properties together', () => {
-        const code = `
+  it('should handle request and response properties together', () => {
+    const code = `
         // Get request data
         const url = pm.request.url;
         const method = pm.request.method;
@@ -63,18 +63,18 @@ describe('Request Translation', () => {
             pm.expect(url).to.include("/api/items");
         });
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('const url = req.getUrl();');
-        expect(translatedCode).toContain('const method = req.getMethod();');
-        expect(translatedCode).toContain('const statusCode = res.getStatus();');
-        expect(translatedCode).toContain('const statusText = res.statusText;');
-        expect(translatedCode).toContain('test("Request was made correctly", function() {');
-        expect(translatedCode).toContain('expect(method).to.equal("POST");');
-        expect(translatedCode).toContain('expect(url).to.include("/api/items");');
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('const url = req.getUrl();');
+    expect(translatedCode).toContain('const method = req.getMethod();');
+    expect(translatedCode).toContain('const statusCode = res.getStatus();');
+    expect(translatedCode).toContain('const statusText = res.statusText;');
+    expect(translatedCode).toContain('test("Request was made correctly", function() {');
+    expect(translatedCode).toContain('expect(method).to.equal("POST");');
+    expect(translatedCode).toContain('expect(url).to.include("/api/items");');
+  });
 
-    it('should handle request properties in conditional blocks', () => {
-        const code = `
+  it('should handle request properties in conditional blocks', () => {
+    const code = `
         if (pm.request.method === "POST") {
             console.log("This is a POST request to " + pm.request.url);
             pm.test("Request has correct content-type", function() {
@@ -82,16 +82,16 @@ describe('Request Translation', () => {
             });
         }
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('if (req.getMethod() === "POST") {');
-        expect(translatedCode).toContain('console.log("This is a POST request to " + req.getUrl());');
-        expect(translatedCode).toContain('test("Request has correct content-type", function() {');
-        // Note: The expectation for headers.has might be transformed differently
-        // depending on how complex transformations are handled
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('if (req.getMethod() === "POST") {');
+    expect(translatedCode).toContain('console.log("This is a POST request to " + req.getUrl());');
+    expect(translatedCode).toContain('test("Request has correct content-type", function() {');
+    // Note: The expectation for headers.has might be transformed differently
+    // depending on how complex transformations are handled
+  });
 
-    it('should handle request data extraction and variable setting', () => {
-        const code = `
+  it('should handle request data extraction and variable setting', () => {
+    const code = `
         // Extract request data
         const requestData = pm.request.body;
         const contentType = pm.request.headers.get("Content-Type");
@@ -100,9 +100,25 @@ describe('Request Translation', () => {
         pm.variables.set("lastRequestBody", JSON.stringify(requestData));
         pm.environment.set("lastContentType", contentType);
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('const requestData = req.getBody();');
-        expect(translatedCode).toContain('bru.setVar("lastRequestBody", JSON.stringify(requestData));');
-        expect(translatedCode).toContain('bru.setEnvVar("lastContentType", contentType);');
-    });
-}); 
\ No newline at end of file
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('const requestData = req.getBody();');
+    expect(translatedCode).toContain('bru.setVar("lastRequestBody", JSON.stringify(requestData));');
+    expect(translatedCode).toContain('bru.setEnvVar("lastContentType", contentType);');
+  });
+
+  it('should translate legacy request.* properties', () => {
+    const code = `
+        const url = request.url;
+        const method = request.method;
+        const body = request.body;
+        const name = request.name;
+        `;
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
+        const url = req.getUrl();
+        const method = req.getMethod();
+        const body = req.getBody();
+        const name = req.getName();
+        `);
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/response.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/response.test.js
index 5df2fe5bb..d154ba9ef 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/response.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/response.test.js
@@ -1,111 +1,111 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Response Translation', () => {
-    // Basic response property tests
-    it('should translate pm.response.json', () => {
-        const code = 'const jsonData = pm.response.json();';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const jsonData = res.getBody();');
-    });
+  // Basic response property tests
+  it('should translate pm.response.json', () => {
+    const code = 'const jsonData = pm.response.json();';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const jsonData = res.getBody();');
+  });
 
-    it('should translate pm.response.code', () => {
-        const code = 'if (pm.response.code === 200) { console.log("Success"); }';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('if (res.getStatus() === 200) { console.log("Success"); }');
-    });
+  it('should translate pm.response.code', () => {
+    const code = 'if (pm.response.code === 200) { console.log("Success"); }';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('if (res.getStatus() === 200) { console.log("Success"); }');
+  });
 
-    it('should translate pm.response.text', () => {
-        const code = 'const responseText = pm.response.text();';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const responseText = JSON.stringify(res.getBody());');
-    });
+  it('should translate pm.response.text', () => {
+    const code = 'const responseText = pm.response.text();';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const responseText = JSON.stringify(res.getBody());');
+  });
 
-    it('should translate pm.response.responseTime', () => {
-        const code = 'console.log("Response time:", pm.response.responseTime);';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('console.log("Response time:", res.getResponseTime());');
-    });
+  it('should translate pm.response.responseTime', () => {
+    const code = 'console.log("Response time:", pm.response.responseTime);';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('console.log("Response time:", res.getResponseTime());');
+  });
 
-    it('should translate pm.response.statusText', () => {
-        const code = 'console.log("Status text:", pm.response.statusText);';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('console.log("Status text:", res.statusText);');
-    });
+  it('should translate pm.response.statusText', () => {
+    const code = 'console.log("Status text:", pm.response.statusText);';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('console.log("Status text:", res.statusText);');
+  });
 
-    it('should translate pm.response.headers', () => {
-        const code = 'console.log("Headers:", pm.response.headers);';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('console.log("Headers:", res.getHeaders());');
-    });
+  it('should translate pm.response.headers', () => {
+    const code = 'console.log("Headers:", pm.response.headers);';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('console.log("Headers:", res.getHeaders());');
+  });
 
-    // Complex response transformations
-    it('should transform pm.response.to.have.status', () => {
-        const code = 'pm.response.to.have.status(201);';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('expect(res.getStatus()).to.equal(201);');
-    });
+  // Complex response transformations
+  it('should transform pm.response.to.have.status', () => {
+    const code = 'pm.response.to.have.status(201);';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('expect(res.getStatus()).to.equal(201);');
+  });
 
-    it('should transform pm.response.to.have.header with single argument', () => {
-        const code = 'pm.response.to.have.header("Content-Type");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase());');
-    });
-    
-    it('should transform multiple pm.response.to.have.header statements', () => {
-        const code = `
+  it('should transform pm.response.to.have.header with single argument', () => {
+    const code = 'pm.response.to.have.header("Content-Type");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase());');
+  });
+
+  it('should transform multiple pm.response.to.have.header statements', () => {
+    const code = `
         pm.response.to.have.header("Content-Type", "application/json");
         pm.response.to.have.header("Cache-Control", "no-cache");
         `;
-        const translatedCode = translateCode(code);
-        
-        // Check for the existence of all four assertions (two pairs)
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");');
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Cache-Control".toLowerCase(), "no-cache");');
-    });
-    
-    it('should transform pm.response.to.have.header inside control structures', () => {
-        const code = `
+    const translatedCode = translateCode(code);
+
+    // Check for the existence of all four assertions (two pairs)
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");');
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Cache-Control".toLowerCase(), "no-cache");');
+  });
+
+  it('should transform pm.response.to.have.header inside control structures', () => {
+    const code = `
         if (pm.response.code === 200) {
             pm.response.to.have.header("Content-Type", "application/json");
         }
         `;
-        const translatedCode = translateCode(code);
-        
-        // The assertions should be inside the if block
-        expect(translatedCode).toContain('if (res.getStatus() === 200) {');
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");');
-    });
-    
-    it('should transform pm.response.to.have.header with variable parameters', () => {
-        const code = `
+    const translatedCode = translateCode(code);
+
+    // The assertions should be inside the if block
+    expect(translatedCode).toContain('if (res.getStatus() === 200) {');
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");');
+  });
+
+  it('should transform pm.response.to.have.header with variable parameters', () => {
+    const code = `
         const headerName = "Content-Type";
         const expectedValue = "application/json";
         pm.response.to.have.header(headerName, expectedValue);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const headerName = "Content-Type";');
-        expect(translatedCode).toContain('const expectedValue = "application/json";');
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(headerName.toLowerCase(), expectedValue);');
-    });
+    const translatedCode = translateCode(code);
 
-    // Response aliases tests
-    it('should handle response aliases', () => {
-        const code = `
+    expect(translatedCode).toContain('const headerName = "Content-Type";');
+    expect(translatedCode).toContain('const expectedValue = "application/json";');
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(headerName.toLowerCase(), expectedValue);');
+  });
+
+  // Response aliases tests
+  it('should handle response aliases', () => {
+    const code = `
         const response = pm.response;
         const status = response.status;
         const body = response.json();
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const status = res.statusText;
         const body = res.getBody();
         `);
-    });
+  });
 
-    // Response to.have.status with different formats
-    it('should handle pm.response.to.have.status with different status codes', () => {
-        const code = `
+  // Response to.have.status with different formats
+  it('should handle pm.response.to.have.status with different status codes', () => {
+    const code = `
         // Test different status codes
         pm.response.to.have.status(200); // OK
         pm.response.to.have.status(201); // Created
@@ -117,97 +117,96 @@ describe('Response Translation', () => {
         const expectedStatus = 200;
         pm.response.to.have.status(expectedStatus);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(201);');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(400);');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(404);');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(500);');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(expectedStatus);');
-    });
+    const translatedCode = translateCode(code);
 
-    // Alias for pm.response.to.have.status
-    it('should handle pm.response.to.have.status alias', () => {
-        const code = `
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(201);');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(400);');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(404);');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(500);');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(expectedStatus);');
+  });
+
+  // Alias for pm.response.to.have.status
+  it('should handle pm.response.to.have.status alias', () => {
+    const code = `
         const resp = pm.response;
         resp.to.have.status(200);
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         expect(res.getStatus()).to.equal(200);
         `);
-    });
+  });
 
-    it('should handle pm.response.to.have.header alias', () => {
-        const code = `
+  it('should handle pm.response.to.have.header alias', () => {
+    const code = `
         const resp = pm.response;
         resp.to.have.header("Content-Type");
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase());
         `);
-    });
-    
-    it('should handle pm.response.to.have.header alias with value check', () => {
-        const code = `
+  });
+
+  it('should handle pm.response.to.have.header alias with value check', () => {
+    const code = `
         const resp = pm.response;
         resp.to.have.header("Content-Type", "application/json");
         `;
-        const translatedCode = translateCode(code);
-        
-        // Check for both assertions when using an alias
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");');
-    });
+    const translatedCode = translateCode(code);
 
-    
-    it('should translate response.status', () => {
-        const code = `
+    // Check for both assertions when using an alias
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");');
+  });
+
+  it('should translate response.status', () => {
+    const code = `
         const resp = pm.response;
         const statusCode = resp.status;
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const statusCode = res.statusText;
         `);
-    });
-    
-    it('should translate response.body', () => {
-        const code = `
+  });
+
+  it('should translate response.body', () => {
+    const code = `
         const resp = pm.response;
         const responseBody = resp.json();
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const responseBody = res.getBody();
         `);
-    });
+  });
 
-    it('should translate response.headers', () => {
-        const code = `
+  it('should translate response.headers', () => {
+    const code = `
         const resp = pm.response;
         const headers = resp.headers;
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const headers = res.getHeaders();
         `);
-    });
+  });
 
-    it('should translate pm.response.statusText', () => {
-        const code = `
+  it('should translate pm.response.statusText', () => {
+    const code = `
         const resp = pm.response;
         const statusText = resp.statusText;
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const statusText = res.statusText;
         `);
-    });
-    
-    it('should translate multiple response methods in one block', () => {
-        const code = `
+  });
+
+  it('should translate multiple response methods in one block', () => {
+    const code = `
         const resp = pm.response;
         const statusCode = resp.code;
         const statusText = resp.statusText;
@@ -216,8 +215,8 @@ describe('Response Translation', () => {
         const time = resp.responseTime;
         resp.to.have.status(200);
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         const statusCode = res.getStatus();
         const statusText = res.statusText;
         const jsonData = res.getBody();
@@ -225,25 +224,25 @@ describe('Response Translation', () => {
         const time = res.getResponseTime();
         expect(res.getStatus()).to.equal(200);
         `);
-    });
+  });
 
-    it('should handle accessing nested properties on response objects', () => {
-        const code = `
+  it('should handle accessing nested properties on response objects', () => {
+    const code = `
         const resp = pm.response;
         const data = resp.json();
         if (data && data.user && data.user.id) {
             pm.environment.set("userId", data.user.id);
         }
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).not.toContain('const resp = pm.response;');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('bru.setEnvVar("userId", data.user.id);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle all response property methods together', () => {
-        const code = `
+    expect(translatedCode).not.toContain('const resp = pm.response;');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('bru.setEnvVar("userId", data.user.id);');
+  });
+
+  it('should handle all response property methods together', () => {
+    const code = `
         // All response property methods
         const statusCode = pm.response.code;
         const responseBody = pm.response.json();
@@ -258,47 +257,47 @@ describe('Response Translation', () => {
             pm.expect(statusText).to.equal('OK');
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const statusCode = res.getStatus();');
-        expect(translatedCode).toContain('const responseBody = res.getBody();');
-        expect(translatedCode).toContain('const responseText = JSON.stringify(res.getBody());');
-        expect(translatedCode).toContain('const responseTime = res.getResponseTime();');
-        expect(translatedCode).toContain('const statusText = res.statusText;');
-        expect(translatedCode).toContain('test("Response is valid", function() {');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
-        expect(translatedCode).toContain('expect(responseBody).to.be.an(\'object\');');
-        expect(translatedCode).toContain('expect(responseTime).to.be.below(1000);');
-        expect(translatedCode).toContain('expect(statusText).to.equal(\'OK\');');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle pm objects with array access on response', () => {
-        const code = `
+    expect(translatedCode).toContain('const statusCode = res.getStatus();');
+    expect(translatedCode).toContain('const responseBody = res.getBody();');
+    expect(translatedCode).toContain('const responseText = JSON.stringify(res.getBody());');
+    expect(translatedCode).toContain('const responseTime = res.getResponseTime();');
+    expect(translatedCode).toContain('const statusText = res.statusText;');
+    expect(translatedCode).toContain('test("Response is valid", function() {');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
+    expect(translatedCode).toContain('expect(responseBody).to.be.an(\'object\');');
+    expect(translatedCode).toContain('expect(responseTime).to.be.below(1000);');
+    expect(translatedCode).toContain('expect(statusText).to.equal(\'OK\');');
+  });
+
+  it('should handle pm objects with array access on response', () => {
+    const code = `
         const items = pm.response.json().items;
         for (let i = 0; i < items.length; i++) {
             pm.collectionVariables.set("item_" + i, items[i].id);
         }
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const items = res.getBody().items;');
-        expect(translatedCode).toContain('bru.setVar("item_" + i, items[i].id);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle response JSON with optional chaining and nullish coalescing', () => {
-        const code = `
+    expect(translatedCode).toContain('const items = res.getBody().items;');
+    expect(translatedCode).toContain('bru.setVar("item_" + i, items[i].id);');
+  });
+
+  it('should handle response JSON with optional chaining and nullish coalescing', () => {
+    const code = `
         const userId = pm.response.json()?.user?.id ?? "anonymous";
         const items = pm.response.json()?.data?.items || [];
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const userId = res.getBody()?.user?.id ?? "anonymous";');
-        expect(translatedCode).toContain('const items = res.getBody()?.data?.items || [];');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle response headers with different access patterns', () => {
-        // will need to handle get, set methods, bruno does not support this yet
-        const code = `
+    expect(translatedCode).toContain('const userId = res.getBody()?.user?.id ?? "anonymous";');
+    expect(translatedCode).toContain('const items = res.getBody()?.data?.items || [];');
+  });
+
+  it('should handle response headers with different access patterns', () => {
+    // will need to handle get, set methods, bruno does not support this yet
+    const code = `
         const contentType = pm.response.headers.get('Content-Type');
         const contentLength = pm.response.headers.get('Content-Length');
         console.log("contentType", contentType);
@@ -310,34 +309,34 @@ describe('Response Translation', () => {
             pm.expect(contentType).to.include('application/json');
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        // Check how header access is translated
-        expect(translatedCode).toContain('const contentType = res.getHeader(\'Content-Type\');');
-        expect(translatedCode).toContain('const contentLength = res.getHeader(\'Content-Length\');');
-        expect(translatedCode).toContain('console.log("contentType", contentType);');
-        expect(translatedCode).toContain('console.log("contentLength", contentLength);');
-        expect(translatedCode).not.toContain('pm.test')
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(\'Content-Type\'.toLowerCase())');
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(\'Content-Length\'.toLowerCase())');
-        expect(translatedCode).toContain('expect(contentType).to.include(\'application/json\')');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should transform response data with array destructuring', () => {
-        const code = `
+    // Check how header access is translated
+    expect(translatedCode).toContain('const contentType = res.getHeader(\'Content-Type\');');
+    expect(translatedCode).toContain('const contentLength = res.getHeader(\'Content-Length\');');
+    expect(translatedCode).toContain('console.log("contentType", contentType);');
+    expect(translatedCode).toContain('console.log("contentLength", contentLength);');
+    expect(translatedCode).not.toContain('pm.test');
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(\'Content-Type\'.toLowerCase())');
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(\'Content-Length\'.toLowerCase())');
+    expect(translatedCode).toContain('expect(contentType).to.include(\'application/json\')');
+  });
+
+  it('should transform response data with array destructuring', () => {
+    const code = `
         const { id, name, items } = pm.response.json();
         const [first, second] = items;
         pm.environment.set("userId", id);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const { id, name, items } = res.getBody();');
-        expect(translatedCode).toContain('const [first, second] = items;');
-        expect(translatedCode).toContain('bru.setEnvVar("userId", id);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle response in complex conditionals', () => {
-        const code = `
+    expect(translatedCode).toContain('const { id, name, items } = res.getBody();');
+    expect(translatedCode).toContain('const [first, second] = items;');
+    expect(translatedCode).toContain('bru.setEnvVar("userId", id);');
+  });
+
+  it('should handle response in complex conditionals', () => {
+    const code = `
         if (pm.response.code >= 200 && pm.response.code < 300) {
             if (pm.response.headers.get('Content-Type').includes('application/json')) {
                 const data = pm.response.json();
@@ -354,18 +353,18 @@ describe('Response Translation', () => {
             console.error("Request failed with status:", pm.response.code);
         }
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('if (res.getStatus() >= 200 && res.getStatus() < 300) {');
-        expect(translatedCode).toContain('if (res.getHeader(\'Content-Type\').includes(\'application/json\')) {');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('bru.setEnvVar("authToken", data.token);');
-        expect(translatedCode).toContain('} else if (res.getStatus() === 404) {');
-        expect(translatedCode).toContain('console.error("Request failed with status:", res.getStatus());');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle response processing with try-catch', () => {
-        const code = `
+    expect(translatedCode).toContain('if (res.getStatus() >= 200 && res.getStatus() < 300) {');
+    expect(translatedCode).toContain('if (res.getHeader(\'Content-Type\').includes(\'application/json\')) {');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('bru.setEnvVar("authToken", data.token);');
+    expect(translatedCode).toContain('} else if (res.getStatus() === 404) {');
+    expect(translatedCode).toContain('console.error("Request failed with status:", res.getStatus());');
+  });
+
+  it('should handle response processing with try-catch', () => {
+    const code = `
         try {
             const data = pm.response.json();
             pm.environment.set("userData", JSON.stringify(data.user));
@@ -375,16 +374,16 @@ describe('Response Translation', () => {
             pm.environment.set("rawResponse", text);
         }
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('bru.setEnvVar("userData", JSON.stringify(data.user));');
-        expect(translatedCode).toContain('const text = JSON.stringify(res.getBody());');
-        expect(translatedCode).toContain('bru.setEnvVar("rawResponse", text);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle JSON path style access to response data', () => {
-        const code = `
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('bru.setEnvVar("userData", JSON.stringify(data.user));');
+    expect(translatedCode).toContain('const text = JSON.stringify(res.getBody());');
+    expect(translatedCode).toContain('bru.setEnvVar("rawResponse", text);');
+  });
+
+  it('should handle JSON path style access to response data', () => {
+    const code = `
         const data = pm.response.json();
         const userId = data.user.id;
         const userEmail = data.user.contact.email;
@@ -392,31 +391,31 @@ describe('Response Translation', () => {
         
         pm.environment.set("userId", userId);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('const userId = data.user.id;');
-        expect(translatedCode).toContain('const userEmail = data.user.contact.email;');
-        expect(translatedCode).toContain('const firstItem = data.items[0];');
-        expect(translatedCode).toContain('bru.setEnvVar("userId", userId);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle template literals with response data', () => {
-        const code = `
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('const userId = data.user.id;');
+    expect(translatedCode).toContain('const userEmail = data.user.contact.email;');
+    expect(translatedCode).toContain('const firstItem = data.items[0];');
+    expect(translatedCode).toContain('bru.setEnvVar("userId", userId);');
+  });
+
+  it('should handle template literals with response data', () => {
+    const code = `
         const data = pm.response.json();
         const welcomeMessage = \`Hello, \${data.user.name}! Your ID is \${data.user.id}.\`;
         
         pm.environment.set("welcomeMessage", welcomeMessage);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('const welcomeMessage = `Hello, ${data.user.name}! Your ID is ${data.user.id}.`;');
-        expect(translatedCode).toContain('bru.setEnvVar("welcomeMessage", welcomeMessage);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle response processing in arrow functions', () => {
-        const code = `
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('const welcomeMessage = `Hello, ${data.user.name}! Your ID is ${data.user.id}.`;');
+    expect(translatedCode).toContain('bru.setEnvVar("welcomeMessage", welcomeMessage);');
+  });
+
+  it('should handle response processing in arrow functions', () => {
+    const code = `
         const processItems = () => {
             const items = pm.response.json().items;
             return items.map(item => item.id);
@@ -425,16 +424,16 @@ describe('Response Translation', () => {
         const itemIds = processItems();
         pm.environment.set("itemIds", JSON.stringify(itemIds));
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const items = res.getBody().items;');
-        expect(translatedCode).toContain('return items.map(item => item.id);');
-        expect(translatedCode).toContain('const itemIds = processItems();');
-        expect(translatedCode).toContain('bru.setEnvVar("itemIds", JSON.stringify(itemIds));');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle complex inline operations with response data', () => {
-        const code = `
+    expect(translatedCode).toContain('const items = res.getBody().items;');
+    expect(translatedCode).toContain('return items.map(item => item.id);');
+    expect(translatedCode).toContain('const itemIds = processItems();');
+    expect(translatedCode).toContain('bru.setEnvVar("itemIds", JSON.stringify(itemIds));');
+  });
+
+  it('should handle complex inline operations with response data', () => {
+    const code = `
         const items = pm.response.json().items;
         const totalValue = items.reduce((sum, item) => sum + item.price, 0);
         const highValueItems = items.filter(item => item.price > 100);
@@ -443,18 +442,18 @@ describe('Response Translation', () => {
         pm.environment.set("totalValue", totalValue);
         pm.environment.set("highValueItemCount", highValueItems.length);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const items = res.getBody().items;');
-        expect(translatedCode).toContain('const totalValue = items.reduce((sum, item) => sum + item.price, 0);');
-        expect(translatedCode).toContain('const highValueItems = items.filter(item => item.price > 100);');
-        expect(translatedCode).toContain('const itemNames = items.map(item => item.name);');
-        expect(translatedCode).toContain('bru.setEnvVar("totalValue", totalValue);');
-        expect(translatedCode).toContain('bru.setEnvVar("highValueItemCount", highValueItems.length);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle complex test structure with pm.response.to.have.header', () => {
-        const code = `
+    expect(translatedCode).toContain('const items = res.getBody().items;');
+    expect(translatedCode).toContain('const totalValue = items.reduce((sum, item) => sum + item.price, 0);');
+    expect(translatedCode).toContain('const highValueItems = items.filter(item => item.price > 100);');
+    expect(translatedCode).toContain('const itemNames = items.map(item => item.name);');
+    expect(translatedCode).toContain('bru.setEnvVar("totalValue", totalValue);');
+    expect(translatedCode).toContain('bru.setEnvVar("highValueItemCount", highValueItems.length);');
+  });
+
+  it('should handle complex test structure with pm.response.to.have.header', () => {
+    const code = `
         pm.test("Response headers validation", function() {
             pm.response.to.have.header("Content-Type", "application/json");
             pm.response.to.have.header("Cache-Control");
@@ -463,22 +462,22 @@ describe('Response Translation', () => {
             pm.expect(responseTime).to.be.below(1000);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        // Check for test function conversion
-        expect(translatedCode).toContain('test("Response headers validation", function() {');
-        
-        // Check for header assertions inside the test callback
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");');
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Cache-Control".toLowerCase())');
-        
-        // Check that other test assertions are preserved
-        expect(translatedCode).toContain('const responseTime = res.getResponseTime();');
-        expect(translatedCode).toContain('expect(responseTime).to.be.below(1000);');
-    });
-    
-    it('should handle dynamic header names in pm.response.to.have.header', () => {
-        const code = `
+    const translatedCode = translateCode(code);
+
+    // Check for test function conversion
+    expect(translatedCode).toContain('test("Response headers validation", function() {');
+
+    // Check for header assertions inside the test callback
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Content-Type".toLowerCase(), "application/json");');
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property("Cache-Control".toLowerCase())');
+
+    // Check that other test assertions are preserved
+    expect(translatedCode).toContain('const responseTime = res.getResponseTime();');
+    expect(translatedCode).toContain('expect(responseTime).to.be.below(1000);');
+  });
+
+  it('should handle dynamic header names in pm.response.to.have.header', () => {
+    const code = `
         function checkHeaderPresent(headerName) {
             pm.response.to.have.header(headerName);
         }
@@ -490,98 +489,98 @@ describe('Response Translation', () => {
         checkHeaderPresent("Authorization");
         validateHeader("Content-Type", "application/json");
         `;
-        const translatedCode = translateCode(code);
-        
-        // Check function transformations
-        expect(translatedCode).toContain('function checkHeaderPresent(headerName) {');
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(headerName.toLowerCase())');
-        
-        expect(translatedCode).toContain('function validateHeader(headerName, expectedValue) {');
-        expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(headerName.toLowerCase(), expectedValue);');
-        
-        // Check function calls
-        expect(translatedCode).toContain('checkHeaderPresent("Authorization");');
-        expect(translatedCode).toContain('validateHeader("Content-Type", "application/json");');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should transform pm.response.to.have.body with string literal', () => {
-        const code = 'pm.response.to.have.body("Expected response body");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('expect(res.getBody()).to.equal("Expected response body");');
-    });
+    // Check function transformations
+    expect(translatedCode).toContain('function checkHeaderPresent(headerName) {');
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(headerName.toLowerCase())');
 
-    it('should transform pm.response.to.have.body with variable parameter', () => {
-        const code = `
+    expect(translatedCode).toContain('function validateHeader(headerName, expectedValue) {');
+    expect(translatedCode).toContain('expect(res.getHeaders()).to.have.property(headerName.toLowerCase(), expectedValue);');
+
+    // Check function calls
+    expect(translatedCode).toContain('checkHeaderPresent("Authorization");');
+    expect(translatedCode).toContain('validateHeader("Content-Type", "application/json");');
+  });
+
+  it('should transform pm.response.to.have.body with string literal', () => {
+    const code = 'pm.response.to.have.body("Expected response body");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('expect(res.getBody()).to.equal("Expected response body");');
+  });
+
+  it('should transform pm.response.to.have.body with variable parameter', () => {
+    const code = `
         const expectedBody = {"status": "success", "data": [1, 2, 3]};
         pm.response.to.have.body(expectedBody);
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toContain('const expectedBody = {"status": "success", "data": [1, 2, 3]};');
-        expect(translatedCode).toContain('expect(res.getBody()).to.equal(expectedBody);');
-    });
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toContain('const expectedBody = {"status": "success", "data": [1, 2, 3]};');
+    expect(translatedCode).toContain('expect(res.getBody()).to.equal(expectedBody);');
+  });
 
-    it('should transform pm.response.to.have.body with JSON object', () => {
-        const code = `pm.response.to.have.body({"status": "success", "message": "Operation completed"});`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('expect(res.getBody()).to.equal({"status": "success", "message": "Operation completed"});');
-    });
+  it('should transform pm.response.to.have.body with JSON object', () => {
+    const code = `pm.response.to.have.body({"status": "success", "message": "Operation completed"});`;
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('expect(res.getBody()).to.equal({"status": "success", "message": "Operation completed"});');
+  });
 
-    it('should transform pm.response.to.have.body inside test function', () => {
-        const code = `
+  it('should transform pm.response.to.have.body inside test function', () => {
+    const code = `
         pm.test("Response body validation", function() {
             const expectedResponse = {"result": true};
             pm.response.to.have.body(expectedResponse);
         });
         `;
-        const translatedCode = translateCode(code);
-        const expectedOutput = `
+    const translatedCode = translateCode(code);
+    const expectedOutput = `
         test("Response body validation", function() {
             const expectedResponse = {"result": true};
             expect(res.getBody()).to.equal(expectedResponse);
         });
-        `
-        expect(translatedCode).toBe(expectedOutput);
-    });
+        `;
+    expect(translatedCode).toBe(expectedOutput);
+  });
 
-    it('should transform pm.response.to.have.body with response alias', () => {
-        const code = `
+  it('should transform pm.response.to.have.body with response alias', () => {
+    const code = `
         const resp = pm.response;
         resp.to.have.body({"status": "ok"});
         `;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         expect(res.getBody()).to.equal({"status": "ok"});
         `);
-    });
+  });
 
-    // --- getSize translations ---------------------------
-    it('should translate pm.response.size()', () => {
-        const code = 'const size = pm.response.size();';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const size = res.getSize();');
-    });
+  // --- getSize translations ---------------------------
+  it('should translate pm.response.size()', () => {
+    const code = 'const size = pm.response.size();';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const size = res.getSize();');
+  });
 
-    it('should translate pm.response.size().body', () => {
-        const code = 'const bodySize = pm.response.size().body;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const bodySize = res.getSize().body;');
-    });
+  it('should translate pm.response.size().body', () => {
+    const code = 'const bodySize = pm.response.size().body;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const bodySize = res.getSize().body;');
+  });
 
-    it('should translate pm.response.size().header', () => {
-        const code = 'const headerSize = pm.response.size().header;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const headerSize = res.getSize().header;');
-    });
+  it('should translate pm.response.size().header', () => {
+    const code = 'const headerSize = pm.response.size().header;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const headerSize = res.getSize().header;');
+  });
 
-    it('should translate pm.response.size().total', () => {
-        const code = 'const totalSize = pm.response.size().total;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const totalSize = res.getSize().total;');
-    });
+  it('should translate pm.response.size().total', () => {
+    const code = 'const totalSize = pm.response.size().total;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const totalSize = res.getSize().total;');
+  });
 
-    it('should translate pm.response.responseSize alias', () => {
-        const code = 'const responseSize = pm.response.responseSize;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('const responseSize = res.getSize().body;');
-    });
-}); 
\ No newline at end of file
+  it('should translate pm.response.responseSize alias', () => {
+    const code = 'const responseSize = pm.response.responseSize;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('const responseSize = res.getSize().body;');
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/scoped-variables.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/scoped-variables.test.js
index 9ed5ed700..d6c8966b2 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/scoped-variables.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/scoped-variables.test.js
@@ -1,7 +1,7 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Scoped Variables', () => {
- it.skip('should handle scoped variables correctly', () => {
+  it.skip('should handle scoped variables correctly', () => {
     const code = `
     const response = pm.response;
     const status = response.status;
@@ -11,7 +11,7 @@ describe('Scoped Variables', () => {
         const status = response.status;
         console.log(status);
     }
-    `
+    `;
     const result = translateCode(code);
     console.log(result);
     expect(result).toBe(`
@@ -22,8 +22,8 @@ describe('Scoped Variables', () => {
         const status = response.status;
         console.log(status);
     }
-    `)
-  })
+    `);
+  });
 
   it.skip('should handle scoped variables correctly', () => {
     const code = `
@@ -35,7 +35,7 @@ describe('Scoped Variables', () => {
         const status = response.status;
         console.log(status);
     }
-    `
+    `;
     const result = translateCode(code);
     console.log(result);
     expect(result).toBe(`
@@ -46,6 +46,6 @@ describe('Scoped Variables', () => {
         const status = res.statusText;
         console.log(status);
     }
-    `)
-  })
-})
\ No newline at end of file
+    `);
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/testing-framework.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/testing-framework.test.js
index fc3988f1f..ab6c690b6 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/testing-framework.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/testing-framework.test.js
@@ -1,59 +1,59 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Testing Framework Translation', () => {
-    // Basic testing framework translations
-    it('should translate pm.test', () => {
-        const code = 'pm.test("Status code is 200", function() { pm.response.to.have.status(200); });';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('test("Status code is 200", function() { expect(res.getStatus()).to.equal(200); });');
-    });
+  // Basic testing framework translations
+  it('should translate pm.test', () => {
+    const code = 'pm.test("Status code is 200", function() { pm.response.to.have.status(200); });';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('test("Status code is 200", function() { expect(res.getStatus()).to.equal(200); });');
+  });
 
-    it('should translate pm.expect', () => {
-        const code = 'pm.expect(jsonData.success).to.be.true;';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('expect(jsonData.success).to.be.true;');
-    });
+  it('should translate pm.expect', () => {
+    const code = 'pm.expect(jsonData.success).to.be.true;';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('expect(jsonData.success).to.be.true;');
+  });
 
-    it('should translate pm.expect.fail', () => {
-        const code = 'if (!isValid) pm.expect.fail("Data is invalid");';
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe('if (!isValid) expect.fail("Data is invalid");');
-    });
+  it('should translate pm.expect.fail', () => {
+    const code = 'if (!isValid) pm.expect.fail("Data is invalid");';
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe('if (!isValid) expect.fail("Data is invalid");');
+  });
 
-    // Tests with response assertions
-    it('should translate pm.response.to.have.status in tests', () => {
-        const code = `
+  // Tests with response assertions
+  it('should translate pm.response.to.have.status in tests', () => {
+    const code = `
         pm.test("Check environment and call successful", function () {
             pm.expect(pm.environment.name).to.equal("ENVIRONMENT_NAME");
             pm.response.to.have.status(200);
         });`;
-        const translatedCode = translateCode(code);
-        expect(translatedCode).toBe(`
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
         test("Check environment and call successful", function () {
             expect(bru.getEnvName()).to.equal("ENVIRONMENT_NAME");
             expect(res.getStatus()).to.equal(200);
         });`);
-    });
+  });
 
-    // Test aliases
-    it('should handle test aliases', () => {
-        const code = `
+  // Test aliases
+  it('should handle test aliases', () => {
+    const code = `
         const { test, expect } = pm;
         
         test("Status code is 200", function () {
             expect(pm.response.code).to.equal(200);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).not.toContain('const { test, expect } = pm');
-        expect(translatedCode).toContain('test("Status code is 200", function () {');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
-    });
+    const translatedCode = translateCode(code);
 
-    // Tests inside different code structures
-    it('should translate pm commands inside tests with nested functions', () => {
-        const code = `
+    expect(translatedCode).not.toContain('const { test, expect } = pm');
+    expect(translatedCode).toContain('test("Status code is 200", function () {');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
+  });
+
+  // Tests inside different code structures
+  it('should translate pm commands inside tests with nested functions', () => {
+    const code = `
         pm.test("Auth flow works", function() {
             const response = pm.response.json();
             pm.expect(response.authenticated).to.be.true;
@@ -61,29 +61,29 @@ describe('Testing Framework Translation', () => {
             pm.collectionVariables.set("sessionId", response.session.id);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Auth flow works", function() {');
-        expect(translatedCode).toContain('const response = res.getBody();');
-        expect(translatedCode).toContain('expect(response.authenticated).to.be.true;');
-        expect(translatedCode).toContain('bru.setEnvVar("userId", response.user.id);');
-        expect(translatedCode).toContain('bru.setVar("sessionId", response.session.id);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should translate pm.test with arrow functions', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Auth flow works", function() {');
+    expect(translatedCode).toContain('const response = res.getBody();');
+    expect(translatedCode).toContain('expect(response.authenticated).to.be.true;');
+    expect(translatedCode).toContain('bru.setEnvVar("userId", response.user.id);');
+    expect(translatedCode).toContain('bru.setVar("sessionId", response.session.id);');
+  });
+
+  it('should translate pm.test with arrow functions', () => {
+    const code = `
         pm.test("Status code is 200", () => {
             pm.expect(pm.response.code).to.eql(200);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Status code is 200", () => {');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.eql(200);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle multiple test assertions in one function', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Status code is 200", () => {');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.eql(200);');
+  });
+
+  it('should handle multiple test assertions in one function', () => {
+    const code = `
         pm.test("The response has all properties", () => {
             const responseJson = pm.response.json();
             pm.expect(responseJson.type).to.eql('vip');
@@ -91,18 +91,18 @@ describe('Testing Framework Translation', () => {
             pm.expect(responseJson.id).to.have.lengthOf(1);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("The response has all properties", () => {');
-        expect(translatedCode).toContain('const responseJson = res.getBody();');
-        expect(translatedCode).toContain('expect(responseJson.type).to.eql(\'vip\');');
-        expect(translatedCode).toContain('expect(responseJson.name).to.be.a(\'string\');');
-        expect(translatedCode).toContain('expect(responseJson.id).to.have.lengthOf(1);');
-    });
+    const translatedCode = translateCode(code);
 
-    // Test with aliased variables
-    it('should translate aliases within test functions', () => {
-        const code = `
+    expect(translatedCode).toContain('test("The response has all properties", () => {');
+    expect(translatedCode).toContain('const responseJson = res.getBody();');
+    expect(translatedCode).toContain('expect(responseJson.type).to.eql(\'vip\');');
+    expect(translatedCode).toContain('expect(responseJson.name).to.be.a(\'string\');');
+    expect(translatedCode).toContain('expect(responseJson.id).to.have.lengthOf(1);');
+  });
+
+  // Test with aliased variables
+  it('should translate aliases within test functions', () => {
+    const code = `
         const tempRes = pm.response;
         const tempTest = pm.test;
         const tempExpect = pm.expect;
@@ -111,18 +111,18 @@ describe('Testing Framework Translation', () => {
             tempExpect(tempRes.code).to.equal(200); 
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).not.toContain('const tempRes = pm.response;');
-        expect(translatedCode).not.toContain('const tempTest = pm.test;');
-        expect(translatedCode).not.toContain('const tempExpect = pm.expect;');
-        expect(translatedCode).toContain('test("Status code is 200", function() {');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
-    });
+    const translatedCode = translateCode(code);
 
-    // Additional robust tests for testing framework
-    it('should handle nested test functions', () => {
-        const code = `
+    expect(translatedCode).not.toContain('const tempRes = pm.response;');
+    expect(translatedCode).not.toContain('const tempTest = pm.test;');
+    expect(translatedCode).not.toContain('const tempExpect = pm.expect;');
+    expect(translatedCode).toContain('test("Status code is 200", function() {');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
+  });
+
+  // Additional robust tests for testing framework
+  it('should handle nested test functions', () => {
+    const code = `
         pm.test("Main test group", function() {
             const responseJson = pm.response.json();
             
@@ -137,18 +137,18 @@ describe('Testing Framework Translation', () => {
             });
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Main test group", function() {');
-        expect(translatedCode).toContain('const responseJson = res.getBody();');
-        expect(translatedCode).toContain('test("User data validation", function() {');
-        expect(translatedCode).toContain('expect(responseJson.user).to.be.an(\'object\');');
-        expect(translatedCode).toContain('test("Settings validation", function() {');
-        expect(translatedCode).toContain('expect(responseJson.settings.notifications).to.be.a(\'boolean\');');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle test with dynamic test names', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Main test group", function() {');
+    expect(translatedCode).toContain('const responseJson = res.getBody();');
+    expect(translatedCode).toContain('test("User data validation", function() {');
+    expect(translatedCode).toContain('expect(responseJson.user).to.be.an(\'object\');');
+    expect(translatedCode).toContain('test("Settings validation", function() {');
+    expect(translatedCode).toContain('expect(responseJson.settings.notifications).to.be.a(\'boolean\');');
+  });
+
+  it('should handle test with dynamic test names', () => {
+    const code = `
         const endpoint = pm.variables.get("currentEndpoint");
         
         pm.test(\`\${endpoint} returns correct data\`, function() {
@@ -156,16 +156,16 @@ describe('Testing Framework Translation', () => {
             pm.expect(responseJson).to.be.an('object');
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const endpoint = bru.getVar("currentEndpoint");');
-        expect(translatedCode).toContain('test(`${endpoint} returns correct data`, function() {');
-        expect(translatedCode).toContain('const responseJson = res.getBody();');
-        expect(translatedCode).toContain('expect(responseJson).to.be.an(\'object\');');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle test with conditional execution', () => {
-        const code = `
+    expect(translatedCode).toContain('const endpoint = bru.getVar("currentEndpoint");');
+    expect(translatedCode).toContain('test(`${endpoint} returns correct data`, function() {');
+    expect(translatedCode).toContain('const responseJson = res.getBody();');
+    expect(translatedCode).toContain('expect(responseJson).to.be.an(\'object\');');
+  });
+
+  it('should handle test with conditional execution', () => {
+    const code = `
         const responseJson = pm.response.json();
         
         if (responseJson.type === 'user') {
@@ -180,19 +180,19 @@ describe('Testing Framework Translation', () => {
             });
         }
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const responseJson = res.getBody();');
-        expect(translatedCode).toContain('if (responseJson.type === \'user\') {');
-        expect(translatedCode).toContain('test("User validation", function() {');
-        expect(translatedCode).toContain('expect(responseJson.name).to.be.a(\'string\');');
-        expect(translatedCode).toContain('} else if (responseJson.type === \'admin\') {');
-        expect(translatedCode).toContain('test("Admin validation", function() {');
-        expect(translatedCode).toContain('expect(responseJson.accessLevel).to.be.above(5);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle assertions with logical operators', () => {
-        const code = `
+    expect(translatedCode).toContain('const responseJson = res.getBody();');
+    expect(translatedCode).toContain('if (responseJson.type === \'user\') {');
+    expect(translatedCode).toContain('test("User validation", function() {');
+    expect(translatedCode).toContain('expect(responseJson.name).to.be.a(\'string\');');
+    expect(translatedCode).toContain('} else if (responseJson.type === \'admin\') {');
+    expect(translatedCode).toContain('test("Admin validation", function() {');
+    expect(translatedCode).toContain('expect(responseJson.accessLevel).to.be.above(5);');
+  });
+
+  it('should handle assertions with logical operators', () => {
+    const code = `
         pm.test("Response has valid structure", function() {
             const data = pm.response.json();
             
@@ -201,17 +201,17 @@ describe('Testing Framework Translation', () => {
             pm.expect(!data.deleted).to.be.true;
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Response has valid structure", function() {');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('expect(data.id && data.name).to.be.ok;');
-        expect(translatedCode).toContain('expect(data.active || data.pending).to.be.true;');
-        expect(translatedCode).toContain('expect(!data.deleted).to.be.true;');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle array and object assertions', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Response has valid structure", function() {');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('expect(data.id && data.name).to.be.ok;');
+    expect(translatedCode).toContain('expect(data.active || data.pending).to.be.true;');
+    expect(translatedCode).toContain('expect(!data.deleted).to.be.true;');
+  });
+
+  it('should handle array and object assertions', () => {
+    const code = `
         pm.test("Array and object validations", function() {
             const data = pm.response.json();
             
@@ -226,20 +226,20 @@ describe('Testing Framework Translation', () => {
             pm.expect(data.user).to.include({active: true});
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Array and object validations", function() {');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('expect(data.items).to.be.an(\'array\');');
-        expect(translatedCode).toContain('expect(data.items).to.have.lengthOf.at.least(1);');
-        expect(translatedCode).toContain('expect(data.items[0]).to.have.property(\'id\');');
-        expect(translatedCode).toContain('expect(data.user).to.be.an(\'object\');');
-        expect(translatedCode).toContain('expect(data.user).to.have.all.keys(\'id\', \'name\', \'email\');');
-        expect(translatedCode).toContain('expect(data.user).to.include({active: true});');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle chai assertions with deep equality', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Array and object validations", function() {');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('expect(data.items).to.be.an(\'array\');');
+    expect(translatedCode).toContain('expect(data.items).to.have.lengthOf.at.least(1);');
+    expect(translatedCode).toContain('expect(data.items[0]).to.have.property(\'id\');');
+    expect(translatedCode).toContain('expect(data.user).to.be.an(\'object\');');
+    expect(translatedCode).toContain('expect(data.user).to.have.all.keys(\'id\', \'name\', \'email\');');
+    expect(translatedCode).toContain('expect(data.user).to.include({active: true});');
+  });
+
+  it('should handle chai assertions with deep equality', () => {
+    const code = `
         pm.test("Deep equality checks", function() {
             const data = pm.response.json();
             
@@ -253,20 +253,20 @@ describe('Testing Framework Translation', () => {
             pm.expect(data.meta).to.deep.include({format: 'json'});
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Deep equality checks", function() {');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('expect(data.config).to.deep.equal({');
-        expect(translatedCode).toContain('version: "1.0",');
-        expect(translatedCode).toContain('active: true,');
-        expect(translatedCode).toContain('features: ["search", "export"]');
-        expect(translatedCode).toContain('expect(data.tags).to.have.members([\'api\', \'test\']);');
-        expect(translatedCode).toContain('expect(data.meta).to.deep.include({format: \'json\'});');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle chai assertions with string comparisons', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Deep equality checks", function() {');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('expect(data.config).to.deep.equal({');
+    expect(translatedCode).toContain('version: "1.0",');
+    expect(translatedCode).toContain('active: true,');
+    expect(translatedCode).toContain('features: ["search", "export"]');
+    expect(translatedCode).toContain('expect(data.tags).to.have.members([\'api\', \'test\']);');
+    expect(translatedCode).toContain('expect(data.meta).to.deep.include({format: \'json\'});');
+  });
+
+  it('should handle chai assertions with string comparisons', () => {
+    const code = `
         pm.test("String validations", function() {
             const data = pm.response.json();
             
@@ -277,19 +277,19 @@ describe('Testing Framework Translation', () => {
             pm.expect(data.code).to.have.lengthOf(8);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("String validations", function() {');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('expect(data.id).to.be.a(\'string\');');
-        expect(translatedCode).toContain('expect(data.name).to.match(/^[A-Za-z\\s]+$/);');
-        expect(translatedCode).toContain('expect(data.description).to.include(\'API\');');
-        expect(translatedCode).toContain('expect(data.url).to.have.string(\'api/v1\');');
-        expect(translatedCode).toContain('expect(data.code).to.have.lengthOf(8);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle assertions with numeric comparisons', () => {
-        const code = `
+    expect(translatedCode).toContain('test("String validations", function() {');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('expect(data.id).to.be.a(\'string\');');
+    expect(translatedCode).toContain('expect(data.name).to.match(/^[A-Za-z\\s]+$/);');
+    expect(translatedCode).toContain('expect(data.description).to.include(\'API\');');
+    expect(translatedCode).toContain('expect(data.url).to.have.string(\'api/v1\');');
+    expect(translatedCode).toContain('expect(data.code).to.have.lengthOf(8);');
+  });
+
+  it('should handle assertions with numeric comparisons', () => {
+    const code = `
         pm.test("Numeric validations", function() {
             const data = pm.response.json();
             
@@ -300,19 +300,19 @@ describe('Testing Framework Translation', () => {
             pm.expect(data.quantity * data.price).to.equal(data.total);
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Numeric validations", function() {');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('expect(data.count).to.be.a(\'number\');');
-        expect(translatedCode).toContain('expect(data.count).to.be.above(0);');
-        expect(translatedCode).toContain('expect(data.price).to.be.within(10, 100);');
-        expect(translatedCode).toContain('expect(data.discount).to.be.at.most(25);');
-        expect(translatedCode).toContain('expect(data.quantity * data.price).to.equal(data.total);');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle pm.expect.fail with conditions', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Numeric validations", function() {');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('expect(data.count).to.be.a(\'number\');');
+    expect(translatedCode).toContain('expect(data.count).to.be.above(0);');
+    expect(translatedCode).toContain('expect(data.price).to.be.within(10, 100);');
+    expect(translatedCode).toContain('expect(data.discount).to.be.at.most(25);');
+    expect(translatedCode).toContain('expect(data.quantity * data.price).to.equal(data.total);');
+  });
+
+  it('should handle pm.expect.fail with conditions', () => {
+    const code = `
         pm.test("Validate critical fields", function() {
             const data = pm.response.json();
             
@@ -328,19 +328,19 @@ describe('Testing Framework Translation', () => {
             pm.expect(data.name).to.be.a('string');
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('test("Validate critical fields", function() {');
-        expect(translatedCode).toContain('const data = res.getBody();');
-        expect(translatedCode).toContain('if (!data.id) {');
-        expect(translatedCode).toContain('expect.fail("Missing ID field");');
-        expect(translatedCode).toContain('if (data.status !== \'active\' && data.status !== \'pending\') {');
-        expect(translatedCode).toContain('expect.fail("Invalid status: " + data.status);');
-        expect(translatedCode).toContain('expect(data.name).to.be.a(\'string\');');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle complex test compositions', () => {
-        const code = `
+    expect(translatedCode).toContain('test("Validate critical fields", function() {');
+    expect(translatedCode).toContain('const data = res.getBody();');
+    expect(translatedCode).toContain('if (!data.id) {');
+    expect(translatedCode).toContain('expect.fail("Missing ID field");');
+    expect(translatedCode).toContain('if (data.status !== \'active\' && data.status !== \'pending\') {');
+    expect(translatedCode).toContain('expect.fail("Invalid status: " + data.status);');
+    expect(translatedCode).toContain('expect(data.name).to.be.a(\'string\');');
+  });
+
+  it('should handle complex test compositions', () => {
+    const code = `
         // Helper function
         function validateUserObject(user) {
             pm.expect(user).to.be.an('object');
@@ -384,16 +384,16 @@ describe('Testing Framework Translation', () => {
             }
         });
         `;
-        const translatedCode = translateCode(code);
-        
-        // Test key transformations
-        expect(translatedCode).toContain('function validateUserObject(user) {');
-        expect(translatedCode).toContain('expect(user).to.be.an(\'object\');');
-        expect(translatedCode).toContain('test("Response validation", function() {');
-        expect(translatedCode).toContain('const response = res.getBody();');
-        expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
-        expect(translatedCode).toContain('test("Related users validation", function() {');
-        expect(translatedCode).toContain('test(`User at index ${index}`, function() {');
-        expect(translatedCode).toContain('bru.setEnvVar("validUsers", JSON.stringify(validUsers));');
-    });
-}); 
\ No newline at end of file
+    const translatedCode = translateCode(code);
+
+    // Test key transformations
+    expect(translatedCode).toContain('function validateUserObject(user) {');
+    expect(translatedCode).toContain('expect(user).to.be.an(\'object\');');
+    expect(translatedCode).toContain('test("Response validation", function() {');
+    expect(translatedCode).toContain('const response = res.getBody();');
+    expect(translatedCode).toContain('expect(res.getStatus()).to.equal(200);');
+    expect(translatedCode).toContain('test("Related users validation", function() {');
+    expect(translatedCode).toContain('test(`User at index ${index}`, function() {');
+    expect(translatedCode).toContain('bru.setEnvVar("validUsers", JSON.stringify(validUsers));');
+  });
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/transformers/send-request.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/transformers/send-request.test.js
index 68ac426d4..dadb15830 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/transformers/send-request.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/transformers/send-request.test.js
@@ -803,4 +803,4 @@ describe('Send Request Translation', () => {
       `);
     });
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/variable-chaining.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/variable-chaining.test.js
index 3c700000e..86b987b6d 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/variable-chaining.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/variable-chaining.test.js
@@ -7,9 +7,9 @@ describe('Variable Chaining Resolution', () => {
       const alias = original;
       const data = alias.json();
     `;
-    
+
     const translatedCode = translateCode(code);
-    
+
     // Check that alias.json() was properly resolved to res.getBody()
     expect(translatedCode).toContain('const data = res.getBody();');
     // The original variable declarations should be removed
@@ -30,26 +30,26 @@ describe('Variable Chaining Resolution', () => {
       // This should not be replaced
       const unrelatedVar = "some value";
     `;
-    
+
     const translatedCode = translateCode(code);
-    
+
     // Check correct replacements
     expect(translatedCode).not.toContain('const respVar');
     expect(translatedCode).not.toContain('const envVar');
     expect(translatedCode).toContain('const statusCode = res.getStatus();');
     expect(translatedCode).toContain('const envValue = bru.getEnvVar("key");');
-    
+
     // Check that unrelated variables are preserved
     expect(translatedCode).toContain('const unrelatedVar = "some value";');
   });
-  
+
   /**
    * This test verifies that when multiple variables are declared in a single statement,
    * only the ones referencing Postman objects are removed and the others are preserved.
-   * 
+   *
    * For example, in a statement like:
    *   const response = pm.response, counter = 5, helper = "test";
-   * 
+   *
    * Only 'response' should be removed, resulting in:
    *   const counter = 5, helper = "test";
    */
@@ -67,25 +67,25 @@ describe('Variable Chaining Resolution', () => {
       let env = pm.environment, timeout = 1000, isValid = true;
       const baseUrl = env.get("baseUrl");
     `;
-    
+
     const translatedCode = translateCode(code);
-    
+
     // Postman references should be replaced
     expect(translatedCode).not.toContain('response = pm.response');
     expect(translatedCode).not.toContain('env = pm.environment');
-    
+
     // Regular variables should be preserved
     expect(translatedCode).toContain('const counter = 5');
     expect(translatedCode).toContain('helper = "test"');
     expect(translatedCode).toContain('timeout = 1000');
     expect(translatedCode).toContain('isValid = true');
-    
+
     // References to Postman objects should be properly translated
     expect(translatedCode).toContain('const statusCode = res.getStatus();');
     expect(translatedCode).toContain('const baseUrl = bru.getEnvVar("baseUrl");');
-    
+
     // Console logs with regular variables should be preserved
     expect(translatedCode).toContain('console.log("Counter value:", counter);');
     expect(translatedCode).toContain('console.log("Helper string:", helper);');
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/variables.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/variables.test.js
index fe0f80593..43824a0f8 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/variables.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/variables.test.js
@@ -1,171 +1,171 @@
 import translateCode from '../../../../src/utils/jscode-shift-translator';
 
 describe('Variables Translation', () => {
-    // Regular variables tests
-    it('should translate pm.variables.get', () => {
-        const code = 'pm.variables.get("test");';
-        const translatedCode = translateCode(code);
+  // Regular variables tests
+  it('should translate pm.variables.get', () => {
+    const code = 'pm.variables.get("test");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.getVar("test");');
-    });
+    expect(translatedCode).toBe('bru.getVar("test");');
+  });
 
-    it('should translate pm.variables.set', () => {
-        const code = 'pm.variables.set("test", "value");';
-        const translatedCode = translateCode(code);
+  it('should translate pm.variables.set', () => {
+    const code = 'pm.variables.set("test", "value");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.setVar("test", "value");');
-    });
+    expect(translatedCode).toBe('bru.setVar("test", "value");');
+  });
 
-    it('should translate pm.variables.has', () => {
-        const code = 'pm.variables.has("userId");';
-        const translatedCode = translateCode(code);
+  it('should translate pm.variables.has', () => {
+    const code = 'pm.variables.has("userId");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.hasVar("userId");');
-    });
+    expect(translatedCode).toBe('bru.hasVar("userId");');
+  });
 
-    it('should translate pm.variables.replaceIn', () => {
-        const code = 'pm.variables.replaceIn("Hello {{name}}");';
-        const translatedCode = translateCode(code);
+  it('should translate pm.variables.replaceIn', () => {
+    const code = 'pm.variables.replaceIn("Hello {{name}}");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.interpolate("Hello {{name}}");');
-    });
+    expect(translatedCode).toBe('bru.interpolate("Hello {{name}}");');
+  });
 
-    it('should translate pm.variables.replaceIn with variables and expressions', () => {
-        const code = 'const greeting = pm.variables.replaceIn("Hello {{name}}, your user id is {{userId}}");';
-        const translatedCode = translateCode(code);
+  it('should translate pm.variables.replaceIn with variables and expressions', () => {
+    const code = 'const greeting = pm.variables.replaceIn("Hello {{name}}, your user id is {{userId}}");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('const greeting = bru.interpolate("Hello {{name}}, your user id is {{userId}}");');
-    });
+    expect(translatedCode).toBe('const greeting = bru.interpolate("Hello {{name}}, your user id is {{userId}}");');
+  });
 
-    it('should translate pm.variables.replaceIn within complex expressions', () => {
-        const code = 'const url = baseUrl + pm.variables.replaceIn("/users/{{userId}}/profile");';
-        const translatedCode = translateCode(code);
+  it('should translate pm.variables.replaceIn within complex expressions', () => {
+    const code = 'const url = baseUrl + pm.variables.replaceIn("/users/{{userId}}/profile");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('const url = baseUrl + bru.interpolate("/users/{{userId}}/profile");');
-    });
+    expect(translatedCode).toBe('const url = baseUrl + bru.interpolate("/users/{{userId}}/profile");');
+  });
 
-    it('should translate pm.variables.replaceIn with multiple nested variable references', () => {
-        const code = 'const template = pm.variables.replaceIn("{{prefix}}-{{env}}-{{suffix}}");';
-        const translatedCode = translateCode(code);
+  it('should translate pm.variables.replaceIn with multiple nested variable references', () => {
+    const code = 'const template = pm.variables.replaceIn("{{prefix}}-{{env}}-{{suffix}}");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('const template = bru.interpolate("{{prefix}}-{{env}}-{{suffix}}");');
-    });
+    expect(translatedCode).toBe('const template = bru.interpolate("{{prefix}}-{{env}}-{{suffix}}");');
+  });
 
-    it('should translate aliased variables.replaceIn', () => {
-        const code = `
+  it('should translate aliased variables.replaceIn', () => {
+    const code = `
             const variables = pm.variables;
             const message = variables.replaceIn("Welcome, {{username}}!");
             `;
-        const translatedCode = translateCode(code);
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe(`
+    expect(translatedCode).toBe(`
             const message = bru.interpolate("Welcome, {{username}}!");
             `);
-    });
+  });
 
-    // Collection variables tests
-    it('should translate pm.collectionVariables.get', () => {
-        const code = 'pm.collectionVariables.get("apiUrl");';
-        const translatedCode = translateCode(code);
+  // Collection variables tests
+  it('should translate pm.collectionVariables.get', () => {
+    const code = 'pm.collectionVariables.get("apiUrl");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.getVar("apiUrl");');
-    });
+    expect(translatedCode).toBe('bru.getVar("apiUrl");');
+  });
 
-    it('should translate pm.collectionVariables.set', () => {
-        const code = 'pm.collectionVariables.set("token", jsonData.token);';
-        const translatedCode = translateCode(code);
+  it('should translate pm.collectionVariables.set', () => {
+    const code = 'pm.collectionVariables.set("token", jsonData.token);';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.setVar("token", jsonData.token);');
-    });
+    expect(translatedCode).toBe('bru.setVar("token", jsonData.token);');
+  });
 
-    it('should translate pm.collectionVariables.has', () => {
-        const code = 'pm.collectionVariables.has("authToken");';
-        const translatedCode = translateCode(code);
+  it('should translate pm.collectionVariables.has', () => {
+    const code = 'pm.collectionVariables.has("authToken");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.hasVar("authToken");');
-    });
+    expect(translatedCode).toBe('bru.hasVar("authToken");');
+  });
 
-    it('should translate pm.collectionVariables.unset', () => {
-        const code = 'pm.collectionVariables.unset("tempVar");';
-        const translatedCode = translateCode(code);
+  it('should translate pm.collectionVariables.unset', () => {
+    const code = 'pm.collectionVariables.unset("tempVar");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.deleteVar("tempVar");');
-    });
+    expect(translatedCode).toBe('bru.deleteVar("tempVar");');
+  });
 
-      it('should handle pm.globals.get', () => {
-        const code = 'pm.globals.get("test");';
-        const translatedCode = translateCode(code);
+  it('should handle pm.globals.get', () => {
+    const code = 'pm.globals.get("test");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.getGlobalEnvVar("test");');
-    });
+    expect(translatedCode).toBe('bru.getGlobalEnvVar("test");');
+  });
 
-    it('should handle pm.globals.set', () => {
-        const code = 'pm.globals.set("test", "value");';
-        const translatedCode = translateCode(code);
+  it('should handle pm.globals.set', () => {
+    const code = 'pm.globals.set("test", "value");';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('bru.setGlobalEnvVar("test", "value");');
-    });
+    expect(translatedCode).toBe('bru.setGlobalEnvVar("test", "value");');
+  });
 
-    // Alias tests for variables
-    it('should handle variables aliases', () => {
-        const code = `
+  // Alias tests for variables
+  it('should handle variables aliases', () => {
+    const code = `
         const vars = pm.variables;
         const has = vars.has("test");
         const set = vars.set("test", "value");
         const get = vars.get("test");
         `;
-        const translatedCode = translateCode(code);
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe(`
+    expect(translatedCode).toBe(`
         const has = bru.hasVar("test");
         const set = bru.setVar("test", "value");
         const get = bru.getVar("test");
         `);
-    });
+  });
 
-    // Alias tests for collection variables
-    it('should handle collection variables aliases', () => {
-        const code = `
+  // Alias tests for collection variables
+  it('should handle collection variables aliases', () => {
+    const code = `
         const collVars = pm.collectionVariables;
         const has = collVars.has("test");
         const set = collVars.set("test", "value");
         const get = collVars.get("test");
         const unset = collVars.unset("test");
         `;
-        const translatedCode = translateCode(code);
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe(`
+    expect(translatedCode).toBe(`
         const has = bru.hasVar("test");
         const set = bru.setVar("test", "value");
         const get = bru.getVar("test");
         const unset = bru.deleteVar("test");
         `);
-    });
+  });
 
-    it('should handle pm.globals aliases', () => {
-        const code = `
+  it('should handle pm.globals aliases', () => {
+    const code = `
         const globals = pm.globals;
         const get = globals.get("test");
         const set = globals.set("test", "value");
         `;
-        const translatedCode = translateCode(code);
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe(`
+    expect(translatedCode).toBe(`
         const get = bru.getGlobalEnvVar("test");
         const set = bru.setGlobalEnvVar("test", "value");
         `);
-    })
+  });
 
-    // Combined tests
-    it('should handle conditional expressions with variable calls', () => {
-        const code = 'const userStatus = pm.variables.has("userId") ? "logged-in" : "guest";';
-        const translatedCode = translateCode(code);
+  // Combined tests
+  it('should handle conditional expressions with variable calls', () => {
+    const code = 'const userStatus = pm.variables.has("userId") ? "logged-in" : "guest";';
+    const translatedCode = translateCode(code);
 
-        expect(translatedCode).toBe('const userStatus = bru.hasVar("userId") ? "logged-in" : "guest";');
-    });
+    expect(translatedCode).toBe('const userStatus = bru.hasVar("userId") ? "logged-in" : "guest";');
+  });
 
-    it('should handle all variable methods together', () => {
-        const code = `
+  it('should handle all variable methods together', () => {
+    const code = `
         // All variable methods
         const hasUserId = pm.variables.has("userId");
         const userId = pm.variables.get("userId");
@@ -173,15 +173,15 @@ describe('Variables Translation', () => {
         
         console.log(\`Has userId: \${hasUserId}, User ID: \${userId}\`);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const hasUserId = bru.hasVar("userId");');
-        expect(translatedCode).toContain('const userId = bru.getVar("userId");');
-        expect(translatedCode).toContain('bru.setVar("requestTime", new Date().toISOString());');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle all collection variable methods together', () => {
-        const code = `
+    expect(translatedCode).toContain('const hasUserId = bru.hasVar("userId");');
+    expect(translatedCode).toContain('const userId = bru.getVar("userId");');
+    expect(translatedCode).toContain('bru.setVar("requestTime", new Date().toISOString());');
+  });
+
+  it('should handle all collection variable methods together', () => {
+    const code = `
         // All collection variable methods
         const hasApiUrl = pm.collectionVariables.has("apiUrl");
         const apiUrl = pm.collectionVariables.get("apiUrl");
@@ -190,18 +190,18 @@ describe('Variables Translation', () => {
         
         console.log(\`Has API URL: \${hasApiUrl}, API URL: \${apiUrl}\`);
         `;
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toContain('const hasApiUrl = bru.hasVar("apiUrl");');
-        expect(translatedCode).toContain('const apiUrl = bru.getVar("apiUrl");');
-        expect(translatedCode).toContain('bru.setVar("requestTime", new Date().toISOString());');
-        expect(translatedCode).toContain('bru.deleteVar("tempVar");');
-    });
+    const translatedCode = translateCode(code);
 
-    it('should handle more complex nested expressions with variables', () => {
-        const code = 'pm.collectionVariables.set("fullPath", pm.environment.get("baseUrl") + pm.variables.get("endpoint"));';
-        const translatedCode = translateCode(code);
-        
-        expect(translatedCode).toBe('bru.setVar("fullPath", bru.getEnvVar("baseUrl") + bru.getVar("endpoint"));');
-    });    
-}); 
\ No newline at end of file
+    expect(translatedCode).toContain('const hasApiUrl = bru.hasVar("apiUrl");');
+    expect(translatedCode).toContain('const apiUrl = bru.getVar("apiUrl");');
+    expect(translatedCode).toContain('bru.setVar("requestTime", new Date().toISOString());');
+    expect(translatedCode).toContain('bru.deleteVar("tempVar");');
+  });
+
+  it('should handle more complex nested expressions with variables', () => {
+    const code = 'pm.collectionVariables.set("fullPath", pm.environment.get("baseUrl") + pm.variables.get("endpoint"));';
+    const translatedCode = translateCode(code);
+
+    expect(translatedCode).toBe('bru.setVar("fullPath", bru.getEnvVar("baseUrl") + bru.getVar("endpoint"));');
+  });
+});
diff --git a/packages/bruno-converters/tests/utils/getMemberExpressionString.test.js b/packages/bruno-converters/tests/utils/getMemberExpressionString.test.js
index f5dd69f09..fe1f9b5fc 100644
--- a/packages/bruno-converters/tests/utils/getMemberExpressionString.test.js
+++ b/packages/bruno-converters/tests/utils/getMemberExpressionString.test.js
@@ -12,7 +12,7 @@ describe('getMemberExpressionString', () => {
       ),
       j.identifier('get')
     );
-    
+
     const result = getMemberExpressionString(memberExpr);
     expect(result).toBe('pm.environment.get');
   });
@@ -28,7 +28,7 @@ describe('getMemberExpressionString', () => {
       j.literal('get'),
       true // computed
     );
-    
+
     const result = getMemberExpressionString(memberExpr);
     expect(result).toBe('pm.environment.get');
   });
@@ -40,7 +40,7 @@ describe('getMemberExpressionString', () => {
       j.identifier('varName'),
       true // computed
     );
-    
+
     const result = getMemberExpressionString(memberExpr);
     expect(result).toBe('obj.[computed]');
   });
@@ -50,4 +50,4 @@ describe('getMemberExpressionString', () => {
     const result = getMemberExpressionString(identifier);
     expect(result).toBe('pm');
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-electron/notarize.js b/packages/bruno-electron/notarize.js
index d76c3624e..101154ae5 100644
--- a/packages/bruno-electron/notarize.js
+++ b/packages/bruno-electron/notarize.js
@@ -20,11 +20,11 @@ const notarize = async function (params) {
 
   try {
     await electron_notarize.notarize({
-        appBundleId: appId,
-        appPath: appPath,
-        appleId: process.env.APPLE_ID,
-        appleIdPassword: process.env.APPLE_ID_PASSWORD,
-        ascProvider: 'W7LPPWA48L'
+      appBundleId: appId,
+      appPath: appPath,
+      appleId: process.env.APPLE_ID,
+      appleIdPassword: process.env.APPLE_ID_PASSWORD,
+      ascProvider: 'W7LPPWA48L'
     });
   } catch (error) {
     console.error(error);
@@ -33,4 +33,4 @@ const notarize = async function (params) {
   console.log(`Done notarizing ${appId}`);
 };
 
-module.exports = notarize;
\ No newline at end of file
+module.exports = notarize;
diff --git a/packages/bruno-electron/package.json b/packages/bruno-electron/package.json
index a5712543d..4e042394d 100644
--- a/packages/bruno-electron/package.json
+++ b/packages/bruno-electron/package.json
@@ -32,6 +32,7 @@
     "@aws-sdk/credential-providers": "3.750.0",
     "@grpc/grpc-js": "^1.13.2",
     "@grpc/proto-loader": "^0.7.13",
+    "@lydell/node-pty": "^1.1.0",
     "@usebruno/common": "0.1.0",
     "@usebruno/converters": "^0.1.0",
     "@usebruno/filestore": "^0.1.0",
@@ -40,7 +41,6 @@
     "@usebruno/node-machine-id": "^2.0.0",
     "@usebruno/requests": "^0.1.0",
     "@usebruno/schema": "0.7.0",
-    "@usebruno/vm2": "^3.9.13",
     "about-window": "^1.15.2",
     "aws4-axios": "^3.3.0",
     "axios": "^1.8.3",
@@ -62,7 +62,7 @@
     "https-proxy-agent": "^7.0.2",
     "iconv-lite": "^0.6.3",
     "is-valid-path": "^0.1.1",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
     "nanoid": "3.3.8",
diff --git a/packages/bruno-electron/src/app/about-bruno.js b/packages/bruno-electron/src/app/about-bruno.js
index 484a062be..63f3df566 100644
--- a/packages/bruno-electron/src/app/about-bruno.js
+++ b/packages/bruno-electron/src/app/about-bruno.js
@@ -1,4 +1,4 @@
-module.exports = function aboutBruno({version}) {
+module.exports = function aboutBruno({ version }) {
   return `
     <!DOCTYPE html>
     <html lang="en">
@@ -173,4 +173,4 @@ module.exports = function aboutBruno({version}) {
     </body>
     </html>
   `;
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-electron/src/app/collection-watcher.js b/packages/bruno-electron/src/app/collection-watcher.js
index 92f789ea2..c8a88dd77 100644
--- a/packages/bruno-electron/src/app/collection-watcher.js
+++ b/packages/bruno-electron/src/app/collection-watcher.js
@@ -2,7 +2,13 @@ const _ = require('lodash');
 const fs = require('fs');
 const path = require('path');
 const chokidar = require('chokidar');
-const { hasBruExtension, isWSLPath, normalizeAndResolvePath, sizeInMB } = require('../utils/filesystem');
+const {
+  hasRequestExtension,
+  isWSLPath,
+  normalizeAndResolvePath,
+  sizeInMB,
+  getCollectionFormat
+} = require('../utils/filesystem');
 const {
   parseEnvironment,
   parseRequest,
@@ -19,7 +25,7 @@ const { setDotEnvVars } = require('../store/process-env');
 const { setBrunoConfig } = require('../store/bruno-config');
 const EnvironmentSecretsStore = require('../store/env-secrets');
 const UiStateSnapshot = require('../store/ui-state-snapshot');
-const { parseBruFileMeta, hydrateRequestWithUuid } = require('../utils/collection');
+const { parseFileMeta, hydrateRequestWithUuid } = require('../utils/collection');
 const { parseLargeRequestWithRedaction } = require('../utils/parse');
 const { transformBrunoConfigAfterRead } = require('../utils/transfomBrunoConfig');
 
@@ -41,21 +47,45 @@ const isBrunoConfigFile = (pathname, collectionPath) => {
   return dirname === collectionPath && basename === 'bruno.json';
 };
 
-const isBruEnvironmentConfig = (pathname, collectionPath) => {
+const isEnvironmentsFolder = (pathname, collectionPath) => {
   const dirname = path.dirname(pathname);
   const envDirectory = path.join(collectionPath, 'environments');
-  const basename = path.basename(pathname);
 
-  return dirname === envDirectory && hasBruExtension(basename);
+  return dirname === envDirectory;
 };
 
-const isCollectionRootBruFile = (pathname, collectionPath) => {
+const isFolderRootFile = (pathname, collectionPath) => {
+  const basename = path.basename(pathname);
+  const format = getCollectionFormat(collectionPath);
+
+  if (format === 'yml') {
+    return basename === 'folder.yml';
+  } else if (format === 'bru') {
+    return basename === 'folder.bru';
+  }
+
+  return false;
+};
+
+const isCollectionRootFile = (pathname, collectionPath) => {
   const dirname = path.dirname(pathname);
   const basename = path.basename(pathname);
-  return dirname === collectionPath && basename === 'collection.bru';
+
+  // return if we are not at the root of the collection
+  if (dirname !== collectionPath) {
+    return false;
+  }
+
+  return basename === 'collection.bru' || basename === 'opencollection.yml';
 };
 
-const hydrateBruCollectionFileWithUuid = (collectionRoot) => {
+const envHasSecrets = (environment = {}) => {
+  const secrets = _.filter(environment.variables, (v) => v.secret);
+
+  return secrets && secrets.length > 0;
+};
+
+const hydrateCollectionRootWithUuid = (collectionRoot) => {
   const params = _.get(collectionRoot, 'request.params', []);
   const headers = _.get(collectionRoot, 'request.headers', []);
   const requestVars = _.get(collectionRoot, 'request.vars.req', []);
@@ -69,12 +99,6 @@ const hydrateBruCollectionFileWithUuid = (collectionRoot) => {
   return collectionRoot;
 };
 
-const envHasSecrets = (environment = {}) => {
-  const secrets = _.filter(environment.variables, (v) => v.secret);
-
-  return secrets && secrets.length > 0;
-};
-
 const addEnvironmentFile = async (win, pathname, collectionUid, collectionPath) => {
   try {
     const basename = path.basename(pathname);
@@ -86,10 +110,14 @@ const addEnvironmentFile = async (win, pathname, collectionUid, collectionPath)
       }
     };
 
-    let bruContent = fs.readFileSync(pathname, 'utf8');
+    const format = getCollectionFormat(collectionPath);
+    let content = fs.readFileSync(pathname, 'utf8');
 
-    file.data = await parseEnvironment(bruContent);
-    file.data.name = basename.substring(0, basename.length - 4);
+    file.data = await parseEnvironment(content, { format });
+
+    // Extract name by removing the extension
+    const ext = path.extname(basename);
+    file.data.name = basename.substring(0, basename.length - ext.length);
     file.data.uid = getRequestUid(pathname);
 
     _.each(_.get(file, 'data.variables', []), (variable) => (variable.uid = uuid()));
@@ -123,9 +151,14 @@ const changeEnvironmentFile = async (win, pathname, collectionUid, collectionPat
       }
     };
 
-    const bruContent = fs.readFileSync(pathname, 'utf8');
-    file.data = await parseEnvironment(bruContent);
-    file.data.name = basename.substring(0, basename.length - 4);
+    const format = getCollectionFormat(collectionPath);
+    const content = fs.readFileSync(pathname, 'utf8');
+
+    file.data = await parseEnvironment(content, { format });
+
+    // Extract name by removing the extension
+    const ext = path.extname(basename);
+    file.data.name = basename.substring(0, basename.length - ext.length);
     file.data.uid = getRequestUid(pathname);
     _.each(_.get(file, 'data.variables', []), (variable) => (variable.uid = uuid()));
 
@@ -177,29 +210,18 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     try {
       const content = fs.readFileSync(pathname, 'utf8');
       let brunoConfig = JSON.parse(content);
-      /*
-      * This is a temporary migration to convert grpc to protobuf
-      * This got added on september 18, 2025
-      * TODO: Remove this after 1st January, 2026
-      */
-      if (brunoConfig.grpc) {
-        brunoConfig.protobuf = brunoConfig.grpc;
-        delete brunoConfig.grpc;
-        const stringifiedConfig = JSON.stringify(brunoConfig, null, 2);
-        fs.writeFileSync(pathname, stringifiedConfig);
 
-        const payload = {
-          collectionUid,
-          brunoConfig: brunoConfig
-        };
-
-        win.webContents.send('main:bruno-config-update', payload);
-      }
-
-      // Transform the config to add existence checks for protobuf files and import paths
+      // Transform the config to add exists metadata for protobuf files and import paths
       brunoConfig = await transformBrunoConfigAfterRead(brunoConfig, collectionPath);
 
       setBrunoConfig(collectionUid, brunoConfig);
+
+      const payload = {
+        collectionUid,
+        brunoConfig: brunoConfig
+      };
+
+      win.webContents.send('main:bruno-config-update', payload);
     } catch (err) {
       console.error(err);
     }
@@ -223,11 +245,12 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     }
   }
 
-  if (isBruEnvironmentConfig(pathname, collectionPath)) {
+  if (isEnvironmentsFolder(pathname, collectionPath)) {
     return addEnvironmentFile(win, pathname, collectionUid, collectionPath);
   }
 
-  if (isCollectionRootBruFile(pathname, collectionPath)) {
+  if (isCollectionRootFile(pathname, collectionPath)) {
+    const format = getCollectionFormat(collectionPath);
     const file = {
       meta: {
         collectionUid,
@@ -238,20 +261,45 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     };
 
     try {
-      let bruContent = fs.readFileSync(pathname, 'utf8');
+      let content = fs.readFileSync(pathname, 'utf8');
+      let parsed = await parseCollection(content, { format });
 
-      file.data = await parseCollection(bruContent);
+      let collectionRoot, brunoConfig;
+      if (format === 'yml') {
+        collectionRoot = parsed.collectionRoot;
+        brunoConfig = parsed.brunoConfig;
+      } else {
+        collectionRoot = parsed;
+        brunoConfig = undefined;
+      }
 
-      hydrateBruCollectionFileWithUuid(file.data);
+      file.data = collectionRoot;
+
+      hydrateCollectionRootWithUuid(file.data);
       win.webContents.send('main:collection-tree-updated', 'addFile', file);
-      return;
+
+      // in yml format, opencollection.yml also contains the bruno config
+      if (format === 'yml') {
+        // Transform the config to add exists metadata for protobuf files and import paths
+        brunoConfig = await transformBrunoConfigAfterRead(brunoConfig, collectionPath);
+
+        setBrunoConfig(collectionUid, brunoConfig);
+
+        const payload = {
+          collectionUid,
+          brunoConfig: brunoConfig
+        };
+
+        win.webContents.send('main:bruno-config-update', payload);
+      }
     } catch (err) {
       console.error(err);
-      return;
     }
+
+    return;
   }
 
-  if (path.basename(pathname) === 'folder.bru') {
+  if (isFolderRootFile(pathname, collectionPath)) {
     const file = {
       meta: {
         collectionUid,
@@ -262,11 +310,11 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     };
 
     try {
-      let bruContent = fs.readFileSync(pathname, 'utf8');
+      let format = getCollectionFormat(collectionPath);
+      let content = fs.readFileSync(pathname, 'utf8');
+      file.data = await parseFolder(content, { format });
 
-      file.data = await parseCollection(bruContent);
-
-      hydrateBruCollectionFileWithUuid(file.data);
+      hydrateCollectionRootWithUuid(file.data);
       win.webContents.send('main:collection-tree-updated', 'addFile', file);
       return;
     } catch (err) {
@@ -275,7 +323,8 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     }
   }
 
-  if (hasBruExtension(pathname)) {
+  const format = getCollectionFormat(collectionPath);
+  if (hasRequestExtension(pathname, format)) {
     watcher.addFileToProcessing(collectionUid, pathname);
 
     const file = {
@@ -287,17 +336,17 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     };
 
     const fileStats = fs.statSync(pathname);
-    let bruContent = fs.readFileSync(pathname, 'utf8');
+    let content = fs.readFileSync(pathname, 'utf8');
+
     // If worker thread is not used, we can directly parse the file
     if (!useWorkerThread) {
       try {
-        file.data = await parseRequest(bruContent);
+        file.data = await parseRequest(content, { format });
         file.partial = false;
         file.loading = false;
         file.size = sizeInMB(fileStats?.size);
         hydrateRequestWithUuid(file.data, pathname);
         win.webContents.send('main:collection-tree-updated', 'addFile', file);
-        
       } catch (error) {
         console.error(error);
       } finally {
@@ -314,7 +363,7 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
         type: 'http-request'
       };
 
-      const metaJson = parseBruFileMeta(bruContent);
+      const metaJson = parseFileMeta(content, format);
       file.data = metaJson;
       file.partial = true;
       file.loading = false;
@@ -331,13 +380,16 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
         win.webContents.send('main:collection-tree-updated', 'addFile', file);
 
         // This is to update the file info in the UI
-        file.data = await parseRequestViaWorker(bruContent);
+        file.data = await parseRequestViaWorker(content, {
+          format,
+          filename: pathname
+        });
         file.partial = false;
         file.loading = false;
         hydrateRequestWithUuid(file.data, pathname);
         win.webContents.send('main:collection-tree-updated', 'addFile', file);
       }
-    } catch(error) {
+    } catch (error) {
       file.data = {
         name: path.basename(pathname),
         type: 'http-request'
@@ -365,18 +417,19 @@ const addDirectory = async (win, pathname, collectionUid, collectionPath) => {
 
   let name = path.basename(pathname);
   let seq;
-  const folderBruFilePath = path.join(pathname, `folder.bru`);
+
+  const format = getCollectionFormat(collectionPath);
+  const folderFilePath = path.join(pathname, `folder.${format}`);
 
   try {
-    if (fs.existsSync(folderBruFilePath)) {
-      let folderBruFileContent = fs.readFileSync(folderBruFilePath, 'utf8');
-      let folderBruData = await parseFolder(folderBruFileContent);
-      name = folderBruData?.meta?.name || name;
-      seq = folderBruData?.meta?.seq;
+    if (fs.existsSync(folderFilePath)) {
+      let folderFileContent = fs.readFileSync(folderFilePath, 'utf8');
+      let folderData = await parseFolder(folderFileContent, { format });
+      name = folderData?.meta?.name || name;
+      seq = folderData?.meta?.seq;
     }
-  }
-  catch(error) {
-    console.error('Error occured while parsing folder.bru file!');
+  } catch (error) {
+    console.error(`Error occured while parsing folder.${format} file`);
     console.error(error);
   }
 
@@ -399,19 +452,22 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
       const content = fs.readFileSync(pathname, 'utf8');
       let brunoConfig = JSON.parse(content);
 
-      // Transform the config to add existence checks for protobuf files and import paths
+      // Transform the config to add file existence checks for protobuf files and import paths
       brunoConfig = await transformBrunoConfigAfterRead(brunoConfig, collectionPath);
 
+      setBrunoConfig(collectionUid, brunoConfig);
+
       const payload = {
         collectionUid,
         brunoConfig: brunoConfig
       };
 
-      setBrunoConfig(collectionUid, brunoConfig);
       win.webContents.send('main:bruno-config-update', payload);
     } catch (err) {
       console.error(err);
     }
+
+    return;
   }
 
   if (isDotEnvFile(pathname, collectionPath)) {
@@ -430,13 +486,15 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
     } catch (err) {
       console.error(err);
     }
+
+    return;
   }
 
-  if (isBruEnvironmentConfig(pathname, collectionPath)) {
+  if (isEnvironmentsFolder(pathname, collectionPath)) {
     return changeEnvironmentFile(win, pathname, collectionUid, collectionPath);
   }
 
-  if (isCollectionRootBruFile(pathname, collectionPath)) {
+  if (isCollectionRootFile(pathname, collectionPath)) {
     const file = {
       meta: {
         collectionUid,
@@ -447,19 +505,46 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
     };
 
     try {
-      let bruContent = fs.readFileSync(pathname, 'utf8');
+      let content = fs.readFileSync(pathname, 'utf8');
+      let format = getCollectionFormat(collectionPath);
+      let parsed = await parseCollection(content, { format });
 
-      file.data = await parseCollection(bruContent);
-      hydrateBruCollectionFileWithUuid(file.data);
+      let collectionRoot, brunoConfig;
+      if (format === 'yml') {
+        collectionRoot = parsed.collectionRoot;
+        brunoConfig = parsed.brunoConfig;
+      } else {
+        collectionRoot = parsed;
+        brunoConfig = undefined;
+      }
+
+      file.data = collectionRoot;
+
+      hydrateCollectionRootWithUuid(file.data);
       win.webContents.send('main:collection-tree-updated', 'change', file);
-      return;
+
+      // in yml format, opencollection.yml also contains the bruno config
+      if (format === 'yml') {
+        // Transform the config to add exists metadata for protobuf files and import paths
+        brunoConfig = await transformBrunoConfigAfterRead(brunoConfig, collectionPath);
+
+        setBrunoConfig(collectionUid, brunoConfig);
+
+        const payload = {
+          collectionUid,
+          brunoConfig: brunoConfig
+        };
+
+        win.webContents.send('main:bruno-config-update', payload);
+      }
     } catch (err) {
       console.error(err);
-      return;
     }
+
+    return;
   }
 
-  if (path.basename(pathname) === 'folder.bru') {
+  if (isFolderRootFile(pathname, collectionPath)) {
     const file = {
       meta: {
         collectionUid,
@@ -470,11 +555,11 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
     };
 
     try {
-      let bruContent = fs.readFileSync(pathname, 'utf8');
+      let format = getCollectionFormat(collectionPath);
+      let content = fs.readFileSync(pathname, 'utf8');
+      file.data = await parseFolder(content, { format });
 
-      file.data = await parseCollection(bruContent);
-
-      hydrateBruCollectionFileWithUuid(file.data);
+      hydrateCollectionRootWithUuid(file.data);
       win.webContents.send('main:collection-tree-updated', 'change', file);
       return;
     } catch (err) {
@@ -483,7 +568,8 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
     }
   }
 
-  if (hasBruExtension(pathname)) {
+  const format = getCollectionFormat(collectionPath);
+  if (hasRequestExtension(pathname, format)) {
     try {
       const file = {
         meta: {
@@ -493,21 +579,18 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
         }
       };
 
-      const bru = fs.readFileSync(pathname, 'utf8');
+      const content = fs.readFileSync(pathname, 'utf8');
       const fileStats = fs.statSync(pathname);
 
-      if (fileStats.size >= MAX_FILE_SIZE) {
-        const parsedData = await parseLargeRequestWithRedaction(bru);
-        file.data = parsedData;
-        file.size = sizeInMB(fileStats?.size);
-        hydrateRequestWithUuid(file.data, pathname);
-        win.webContents.send('main:collection-tree-updated', 'change', file);
+      if (fileStats.size >= MAX_FILE_SIZE && format === 'bru') {
+        file.data = await parseLargeRequestWithRedaction(content);
       } else {
-        file.data = await parseRequest(bru);
-        file.size = sizeInMB(fileStats?.size);
-        hydrateRequestWithUuid(file.data, pathname);
-        win.webContents.send('main:collection-tree-updated', 'change', file);
+        file.data = await parseRequest(content, { format });
       }
+
+      file.size = sizeInMB(fileStats?.size);
+      hydrateRequestWithUuid(file.data, pathname);
+      win.webContents.send('main:collection-tree-updated', 'change', file);
     } catch (err) {
       console.error(err);
     }
@@ -517,16 +600,24 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
 const unlink = (win, pathname, collectionUid, collectionPath) => {
   console.log(`watcher unlink: ${pathname}`);
 
-  if (isBruEnvironmentConfig(pathname, collectionPath)) {
+  if (isEnvironmentsFolder(pathname, collectionPath)) {
     return unlinkEnvironmentFile(win, pathname, collectionUid);
   }
 
-  if (hasBruExtension(pathname)) {
+  const format = getCollectionFormat(collectionPath);
+  if (hasRequestExtension(pathname, format)) {
+    const basename = path.basename(pathname);
+    const dirname = path.dirname(pathname);
+
+    if (basename === 'opencollection.yml' && dirname === collectionPath) {
+      return;
+    }
+
     const file = {
       meta: {
         collectionUid,
         pathname,
-        name: path.basename(pathname)
+        name: basename
       }
     };
     win.webContents.send('main:collection-tree-updated', 'unlink', file);
@@ -540,15 +631,15 @@ const unlinkDir = async (win, pathname, collectionUid, collectionPath) => {
     return;
   }
 
-
-  const folderBruFilePath = path.join(pathname, `folder.bru`);
+  const format = getCollectionFormat(collectionPath);
+  const folderFilePath = path.join(pathname, `folder.${format}`);
 
   let name = path.basename(pathname);
 
-  if (fs.existsSync(folderBruFilePath)) {
-    let folderBruFileContent = fs.readFileSync(folderBruFilePath, 'utf8');
-    let folderBruData = await parseFolder(folderBruFileContent);
-    name = folderBruData?.meta?.name || name;
+  if (fs.existsSync(folderFilePath)) {
+    let folderFileContent = fs.readFileSync(folderFilePath, 'utf8');
+    let folderData = await parseFolder(folderFileContent, { format });
+    name = folderData?.meta?.name || name;
   }
 
   const directory = {
@@ -564,10 +655,10 @@ const unlinkDir = async (win, pathname, collectionUid, collectionPath) => {
 const onWatcherSetupComplete = (win, watchPath, collectionUid, watcher) => {
   // Mark discovery as complete
   watcher.completeCollectionDiscovery(win, collectionUid);
-  
+
   const UiStateSnapshotStore = new UiStateSnapshot();
   const collectionsSnapshotState = UiStateSnapshotStore.getCollections();
-  const collectionSnapshotState = collectionsSnapshotState?.find(c => c?.pathname == watchPath);
+  const collectionSnapshotState = collectionsSnapshotState?.find((c) => c?.pathname == watchPath);
   win.webContents.send('main:hydrate-app-with-ui-state-snapshot', collectionSnapshotState);
 };
 
@@ -582,8 +673,8 @@ class CollectionWatcher {
     if (!this.loadingStates[collectionUid]) {
       this.loadingStates[collectionUid] = {
         isDiscovering: false, // Initial discovery phase
-        isProcessing: false,  // Processing discovered files
-        pendingFiles: new Set(), // Files that need processing
+        isProcessing: false, // Processing discovered files
+        pendingFiles: new Set() // Files that need processing
       };
     }
   }
@@ -591,10 +682,10 @@ class CollectionWatcher {
   startCollectionDiscovery(win, collectionUid) {
     this.initializeLoadingState(collectionUid);
     const state = this.loadingStates[collectionUid];
-    
+
     state.isDiscovering = true;
     state.pendingFiles.clear();
-    
+
     win.webContents.send('main:collection-loading-state-updated', {
       collectionUid,
       isLoading: true
@@ -609,10 +700,10 @@ class CollectionWatcher {
 
   markFileAsProcessed(win, collectionUid, filepath) {
     if (!this.loadingStates[collectionUid]) return;
-    
+
     const state = this.loadingStates[collectionUid];
     state.pendingFiles.delete(filepath);
-    
+
     // If discovery is complete and no pending files, mark as not loading
     if (!state.isDiscovering && state.pendingFiles.size === 0 && state.isProcessing) {
       state.isProcessing = false;
@@ -625,10 +716,10 @@ class CollectionWatcher {
 
   completeCollectionDiscovery(win, collectionUid) {
     if (!this.loadingStates[collectionUid]) return;
-    
+
     const state = this.loadingStates[collectionUid];
     state.isDiscovering = false;
-    
+
     // If there are pending files, start processing phase
     if (state.pendingFiles.size > 0) {
       state.isProcessing = true;
@@ -651,7 +742,7 @@ class CollectionWatcher {
     }
 
     this.initializeLoadingState(collectionUid);
-    
+
     this.startCollectionDiscovery(win, collectionUid);
 
     const ignores = brunoConfig?.ignore || [];
@@ -720,7 +811,7 @@ class CollectionWatcher {
       this.watchers[watchPath].close();
       this.watchers[watchPath] = null;
     }
-    
+
     if (collectionUid) {
       this.cleanupLoadingState(collectionUid);
     }
@@ -729,7 +820,7 @@ class CollectionWatcher {
   getWatcherByItemPath(itemPath) {
     const paths = Object.keys(this.watchers);
 
-    const watcherPath = paths?.find(collectionPath => {
+    const watcherPath = paths?.find((collectionPath) => {
       const absCollectionPath = path.resolve(collectionPath);
       const absItemPath = path.resolve(itemPath);
 
@@ -745,7 +836,7 @@ class CollectionWatcher {
       watcher.unwatch(itemPath);
     }
   }
-  
+
   addItemPathInWatcher(itemPath) {
     const watcher = this.getWatcherByItemPath(itemPath);
     if (watcher && !watcher?.has?.(itemPath)) {
diff --git a/packages/bruno-electron/src/app/collections.js b/packages/bruno-electron/src/app/collections.js
index 29846d98c..f86d2cece 100644
--- a/packages/bruno-electron/src/app/collections.js
+++ b/packages/bruno-electron/src/app/collections.js
@@ -2,15 +2,19 @@ const fs = require('fs');
 const path = require('path');
 const { dialog, ipcMain } = require('electron');
 const Yup = require('yup');
-const { isDirectory, normalizeAndResolvePath, getCollectionStats } = require('../utils/filesystem');
+const { isDirectory, getCollectionStats, normalizeAndResolvePath } = require('../utils/filesystem');
 const { generateUidBasedOnHash } = require('../utils/common');
 const { transformBrunoConfigAfterRead } = require('../utils/transfomBrunoConfig');
+const { parseCollection } = require('@usebruno/filestore');
 
 // todo: bruno.json config schema validation errors must be propagated to the UI
 const configSchema = Yup.object({
   name: Yup.string().max(256, 'name must be 256 characters or less').required('name is required'),
   type: Yup.string().oneOf(['collection']).required('type is required'),
-  version: Yup.string().oneOf(['1']).required('type is required')
+  // For BRU format collections
+  version: Yup.string().oneOf(['1']).notRequired(),
+  // For YAML format collections (opencollection)
+  opencollection: Yup.string().notRequired()
 });
 
 const readConfigFile = async (pathname) => {
@@ -31,9 +35,25 @@ const validateSchema = async (config) => {
 };
 
 const getCollectionConfigFile = async (pathname) => {
+  // Check for opencollection.yml first
+  const ocYmlPath = path.join(pathname, 'opencollection.yml');
+  if (fs.existsSync(ocYmlPath)) {
+    try {
+      const content = fs.readFileSync(ocYmlPath, 'utf8');
+      const {
+        brunoConfig
+      } = parseCollection(content, { format: 'yml' });
+      await validateSchema(brunoConfig);
+      return brunoConfig;
+    } catch (err) {
+      throw new Error(`Unable to parse opencollection.yml: ${err.message}`);
+    }
+  }
+
+  // Fall back to bruno.json
   const configFilePath = path.join(pathname, 'bruno.json');
   if (!fs.existsSync(configFilePath)) {
-    throw new Error(`The collection is not valid (bruno.json not found)`);
+    throw new Error(`The collection is not valid (neither bruno.json nor opencollection.yml found)`);
   }
 
   const config = await readConfigFile(configFilePath);
@@ -112,7 +132,21 @@ const openCollection = async (win, watcher, collectionPath, options = {}) => {
   }
 };
 
+const openCollectionsByPathname = async (win, watcher, collectionPaths, options = {}) => {
+  for (const collectionPath of collectionPaths) {
+    const resolvedPath = path.isAbsolute(collectionPath)
+      ? collectionPath
+      : normalizeAndResolvePath(collectionPath);
+    if (isDirectory(resolvedPath)) {
+      await openCollection(win, watcher, resolvedPath, options);
+    } else {
+      console.error(`Cannot open unknown folder: "${resolvedPath}"`);
+    }
+  }
+};
+
 module.exports = {
   openCollection,
-  openCollectionDialog
+  openCollectionDialog,
+  openCollectionsByPathname
 };
diff --git a/packages/bruno-electron/src/app/menu-template.js b/packages/bruno-electron/src/app/menu-template.js
index d1eabffd7..d5d05c737 100644
--- a/packages/bruno-electron/src/app/menu-template.js
+++ b/packages/bruno-electron/src/app/menu-template.js
@@ -83,11 +83,11 @@ const template = [
             width: 350,
             height: 250,
             webPreferences: {
-              nodeIntegration: true,
-            },
+              nodeIntegration: true
+            }
           });
           aboutWindow.removeMenu();
-          aboutWindow.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(aboutBruno({version}))}`);
+          aboutWindow.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(aboutBruno({ version }))}`);
         }
       },
       { label: 'Documentation', click: () => ipcMain.emit('main:open-docs') }
diff --git a/packages/bruno-electron/src/app/onboarding.js b/packages/bruno-electron/src/app/onboarding.js
index de7b575e2..b2de55e77 100644
--- a/packages/bruno-electron/src/app/onboarding.js
+++ b/packages/bruno-electron/src/app/onboarding.js
@@ -27,7 +27,7 @@ function getDefaultCollectionLocation() {
 /**
  * Import sample collection for new users
  */
-async function importSampleCollection(collectionLocation, mainWindow, lastOpenedCollections) {
+async function importSampleCollection(collectionLocation, mainWindow) {
   // Handle both development and production paths
   const sampleCollectionPath = app.isPackaged
     ? path.join(process.resourcesPath, 'data', 'sample-collection.json')
@@ -56,7 +56,6 @@ async function importSampleCollection(collectionLocation, mainWindow, lastOpened
       collectionToImport,
       collectionLocation,
       mainWindow,
-      lastOpenedCollections,
       collectionName
     );
 
@@ -80,14 +79,15 @@ async function onboardUser(mainWindow, lastOpenedCollections) {
       // Check if user already has collections (indicates they're an existing user)
       // Onboarding was added in a later version, so for existing users we should skip it
       // to avoid creating sample collections
-      const collections = await lastOpenedCollections.getAll();
+      // lastOpenedCollections is still used here to check for existing collections during migration
+      const collections = lastOpenedCollections ? lastOpenedCollections.getAll() : [];
       if (collections.length > 0) {
         await preferencesUtil.markAsLaunched();
         return;
       }
 
       const collectionLocation = getDefaultCollectionLocation();
-      await importSampleCollection(collectionLocation, mainWindow, lastOpenedCollections);
+      await importSampleCollection(collectionLocation, mainWindow);
     }
 
     await preferencesUtil.markAsLaunched();
diff --git a/packages/bruno-electron/src/app/system-monitor.js b/packages/bruno-electron/src/app/system-monitor.js
index c161638ce..a66e04078 100644
--- a/packages/bruno-electron/src/app/system-monitor.js
+++ b/packages/bruno-electron/src/app/system-monitor.js
@@ -65,17 +65,25 @@ class SystemMonitor {
 
       for (const metric of metrics) {
         totalCPU += metric.cpu.percentCPUUsage;
-        totalMemory += metric.memory.workingSetSize;
+        totalMemory += metric.memory.workingSetSize * 1024;
       }
 
       const uptime = (currentTime - this.startTime) / 1000;
-
+      var processes = metrics.map((metric) => ({
+        pid: metric.pid,
+        title: metric.title,
+        memory: metric.memory.workingSetSize * 1024,
+        cpu: metric.cpu.percentCPUUsage,
+        type: metric.type || 'unknown',
+        creationTime: metric.creationTime
+      }));
       const systemResources = {
         cpu: totalCPU,
         memory: totalMemory,
         pid: process.pid,
         uptime: uptime,
-        timestamp: currentTime.toISOString()
+        timestamp: currentTime.toISOString(),
+        processes: processes
       };
 
       if (win && !win.isDestroyed()) {
@@ -95,7 +103,8 @@ class SystemMonitor {
         memory: memory.rss,
         pid: process.pid,
         uptime: uptime,
-        timestamp: currentTime.toISOString()
+        timestamp: currentTime.toISOString(),
+        processes: []
       };
 
       if (win && !win.isDestroyed()) {
diff --git a/packages/bruno-electron/src/app/workspace-watcher.js b/packages/bruno-electron/src/app/workspace-watcher.js
new file mode 100644
index 000000000..de42adec7
--- /dev/null
+++ b/packages/bruno-electron/src/app/workspace-watcher.js
@@ -0,0 +1,235 @@
+const _ = require('lodash');
+const fs = require('fs');
+const path = require('path');
+const chokidar = require('chokidar');
+const yaml = require('js-yaml');
+const { generateUidBasedOnHash, uuid } = require('../utils/common');
+const { parseEnvironment } = require('@usebruno/filestore');
+const EnvironmentSecretsStore = require('../store/env-secrets');
+const { decryptStringSafe } = require('../utils/encryption');
+
+const environmentSecretsStore = new EnvironmentSecretsStore();
+
+/**
+ * Check if environment has secret variables
+ */
+const envHasSecrets = (environment) => {
+  const secrets = _.filter(environment.variables, (v) => v.secret === true);
+  return secrets && secrets.length > 0;
+};
+
+/**
+ * Handle workspace.yml file changes
+ */
+const handleWorkspaceFileChange = (win, workspacePath) => {
+  try {
+    const workspaceFilePath = path.join(workspacePath, 'workspace.yml');
+
+    if (!fs.existsSync(workspaceFilePath)) {
+      return;
+    }
+
+    const yamlContent = fs.readFileSync(workspaceFilePath, 'utf8');
+    const workspaceConfig = yaml.load(yamlContent);
+
+    if (workspaceConfig.type !== 'workspace') {
+      return;
+    }
+
+    const workspaceUid = generateUidBasedOnHash(workspacePath);
+
+    win.webContents.send('main:workspace-config-updated', workspacePath, workspaceUid, workspaceConfig);
+  } catch (error) {
+    console.error('Error handling workspace file change:', error);
+  }
+};
+
+/**
+ * Parse global environment file and handle secrets
+ */
+const parseGlobalEnvironmentFile = async (pathname, workspacePath, workspaceUid) => {
+  const basename = path.basename(pathname);
+  const environmentName = basename.slice(0, -'.yml'.length);
+
+  const file = {
+    meta: {
+      workspaceUid,
+      pathname,
+      name: basename
+    }
+  };
+
+  const content = fs.readFileSync(pathname, 'utf8');
+  file.data = await parseEnvironment(content, { format: 'yml' });
+  file.data.name = environmentName;
+  file.data.uid = generateUidBasedOnHash(pathname);
+
+  // Ensure all variables have UIDs
+  _.each(_.get(file, 'data.variables', []), (variable) => {
+    if (!variable.uid) {
+      variable.uid = uuid();
+    }
+  });
+
+  // Decrypt secrets if present
+  if (envHasSecrets(file.data)) {
+    const envSecrets = environmentSecretsStore.getEnvSecrets(workspacePath, file.data);
+    _.each(envSecrets, (secret) => {
+      const variable = _.find(file.data.variables, (v) => v.name === secret.name);
+      if (variable && secret.value) {
+        const decryptionResult = decryptStringSafe(secret.value);
+        variable.value = decryptionResult.value;
+      }
+    });
+  }
+
+  return file;
+};
+
+/**
+ * Handle global environment file add
+ */
+const handleGlobalEnvironmentFileAdd = async (win, pathname, workspacePath, workspaceUid) => {
+  try {
+    const file = await parseGlobalEnvironmentFile(pathname, workspacePath, workspaceUid);
+    win.webContents.send('main:global-environment-added', workspaceUid, file);
+  } catch (error) {
+    console.error('Error handling global environment file add:', error);
+  }
+};
+
+/**
+ * Handle global environment file change
+ */
+const handleGlobalEnvironmentFileChange = async (win, pathname, workspacePath, workspaceUid) => {
+  try {
+    const file = await parseGlobalEnvironmentFile(pathname, workspacePath, workspaceUid);
+    win.webContents.send('main:global-environment-changed', workspaceUid, file);
+  } catch (error) {
+    console.error('Error handling global environment file change:', error);
+  }
+};
+
+/**
+ * Handle global environment file unlink
+ */
+const handleGlobalEnvironmentFileUnlink = async (win, pathname, workspaceUid) => {
+  try {
+    const environmentUid = generateUidBasedOnHash(pathname);
+    win.webContents.send('main:global-environment-deleted', workspaceUid, environmentUid);
+  } catch (error) {
+    console.error('Error handling global environment file unlink:', error);
+  }
+};
+
+/**
+ * Workspace Watcher
+ * Watches workspace files for changes and notifies the renderer
+ */
+class WorkspaceWatcher {
+  constructor() {
+    this.watchers = {};
+    this.environmentWatchers = {};
+  }
+
+  addWatcher(win, workspacePath) {
+    const workspaceFilePath = path.join(workspacePath, 'workspace.yml');
+    const environmentsDir = path.join(workspacePath, 'environments');
+    const workspaceUid = generateUidBasedOnHash(workspacePath);
+
+    // Close existing watchers if any
+    if (this.watchers[workspacePath]) {
+      this.watchers[workspacePath].close();
+    }
+    if (this.environmentWatchers[workspacePath]) {
+      this.environmentWatchers[workspacePath].close();
+    }
+
+    const self = this;
+    setTimeout(() => {
+      // Guard against window being destroyed during delay
+      if (win.isDestroyed()) {
+        return;
+      }
+
+      // Watch workspace.yml file
+      const watcher = chokidar.watch(workspaceFilePath, {
+        ignoreInitial: false,
+        persistent: true,
+        ignorePermissionErrors: true,
+        awaitWriteFinish: {
+          stabilityThreshold: 80,
+          pollInterval: 10
+        }
+      });
+
+      watcher.on('change', () => handleWorkspaceFileChange(win, workspacePath));
+      watcher.on('add', () => handleWorkspaceFileChange(win, workspacePath));
+
+      self.watchers[workspacePath] = watcher;
+
+      // Watch global environment files (.yml)
+      if (fs.existsSync(environmentsDir)) {
+        const envWatcher = chokidar.watch(path.join(environmentsDir, `*.yml`), {
+          ignoreInitial: true,
+          persistent: true,
+          ignorePermissionErrors: true,
+          awaitWriteFinish: {
+            stabilityThreshold: 100,
+            pollInterval: 10
+          }
+        });
+
+        envWatcher.on('add', (pathname) => {
+          handleGlobalEnvironmentFileAdd(win, pathname, workspacePath, workspaceUid);
+        });
+
+        envWatcher.on('change', (pathname) => {
+          handleGlobalEnvironmentFileChange(win, pathname, workspacePath, workspaceUid);
+        });
+
+        envWatcher.on('unlink', (pathname) => {
+          handleGlobalEnvironmentFileUnlink(win, pathname, workspaceUid);
+        });
+
+        self.environmentWatchers[workspacePath] = envWatcher;
+      } else {
+        // Watch for environments directory creation
+        const dirWatcher = chokidar.watch(environmentsDir, {
+          ignoreInitial: false,
+          persistent: true,
+          ignorePermissionErrors: true,
+          depth: 0
+        });
+
+        dirWatcher.on('addDir', () => {
+          dirWatcher.close();
+          self.addWatcher(win, workspacePath);
+        });
+
+        self.environmentWatchers[workspacePath] = dirWatcher;
+      }
+    }, 100);
+  }
+
+  removeWatcher(workspacePath) {
+    try {
+      if (this.watchers[workspacePath]) {
+        this.watchers[workspacePath].close();
+        delete this.watchers[workspacePath];
+      }
+      if (this.environmentWatchers[workspacePath]) {
+        this.environmentWatchers[workspacePath].close();
+        delete this.environmentWatchers[workspacePath];
+      }
+    } catch (error) {
+      console.error('Error removing workspace watcher:', error);
+    }
+  }
+
+  hasWatcher(workspacePath) {
+    return Boolean(this.watchers[workspacePath]);
+  }
+}
+
+module.exports = WorkspaceWatcher;
diff --git a/packages/bruno-electron/src/index.js b/packages/bruno-electron/src/index.js
index ea20963eb..8288edf9b 100644
--- a/packages/bruno-electron/src/index.js
+++ b/packages/bruno-electron/src/index.js
@@ -4,7 +4,7 @@ const isDev = require('electron-is-dev');
 const os = require('os');
 
 if (isDev) {
-  if(!fs.existsSync(path.join(__dirname, '../../bruno-js/src/sandbox/bundle-browser-rollup.js'))) {
+  if (!fs.existsSync(path.join(__dirname, '../../bruno-js/src/sandbox/bundle-browser-rollup.js'))) {
     console.log('JS Sandbox libraries have not been bundled yet');
     console.log('Please run the below command \nnpm run sandbox:bundle-libraries --workspace=packages/bruno-js');
     throw new Error('JS Sandbox libraries have not been bundled yet');
@@ -16,8 +16,8 @@ const { BrowserWindow, app, session, Menu, globalShortcut, ipcMain } = require('
 const { setContentSecurityPolicy } = require('electron-util');
 
 if (isDev && process.env.ELECTRON_USER_DATA_PATH) {
-  console.debug("`ELECTRON_USER_DATA_PATH` found, modifying `userData` path: \n"
-    + `\t${app.getPath("userData")} -> ${process.env.ELECTRON_USER_DATA_PATH}`);
+  console.debug('`ELECTRON_USER_DATA_PATH` found, modifying `userData` path: \n'
+    + `\t${app.getPath('userData')} -> ${process.env.ELECTRON_USER_DATA_PATH}`);
 
   app.setPath('userData', process.env.ELECTRON_USER_DATA_PATH);
 }
@@ -38,10 +38,14 @@ const registerCollectionsIpc = require('./ipc/collection');
 const registerFilesystemIpc = require('./ipc/filesystem');
 const registerPreferencesIpc = require('./ipc/preferences');
 const registerSystemMonitorIpc = require('./ipc/system-monitor');
+const registerWorkspaceIpc = require('./ipc/workspace');
 const collectionWatcher = require('./app/collection-watcher');
+const WorkspaceWatcher = require('./app/workspace-watcher');
 const { loadWindowState, saveBounds, saveMaximized } = require('./utils/window');
+const { globalEnvironmentsManager } = require('./store/workspace-environments');
 const registerNotificationsIpc = require('./ipc/notifications');
 const registerGlobalEnvironmentsIpc = require('./ipc/global-environments');
+const TerminalManager = require('./ipc/terminal');
 const { safeParseJSON, safeStringifyJSON } = require('./utils/common');
 const { getDomainsWithCookies } = require('./utils/cookies');
 const { cookiesStore } = require('./store/cookies');
@@ -51,20 +55,24 @@ const { getIsRunningInRosetta } = require('./utils/arch');
 
 const lastOpenedCollections = new LastOpenedCollections();
 const systemMonitor = new SystemMonitor();
+const terminalManager = new TerminalManager();
+
+const workspaceWatcher = new WorkspaceWatcher();
 
 // Reference: https://content-security-policy.com/
 const contentSecurityPolicy = [
-  "default-src 'self'",
-  "connect-src 'self' https://*.posthog.com",
-  "font-src 'self' https: data:;",
-  "frame-src data:",
+  'default-src \'self\'',
+  'connect-src \'self\' https://*.posthog.com',
+  'font-src \'self\' https: data:;',
+  'frame-src data:',
+  'script-src \'self\' \'unsafe-inline\' data:',
   // this has been commented out to make oauth2 work
   // "form-action 'none'",
   // we make an exception and allow http for images so that
   // they can be used as link in the embedded markdown editors
-  "img-src 'self' blob: data: http: https:",
-  "media-src 'self' blob: data: https:",
-  "style-src 'self' 'unsafe-inline' https:"
+  'img-src \'self\' blob: data: http: https:',
+  'media-src \'self\' blob: data: https:',
+  'style-src \'self\' \'unsafe-inline\' https:'
 ];
 
 setContentSecurityPolicy(contentSecurityPolicy.join(';') + ';');
@@ -75,18 +83,17 @@ let mainWindow;
 
 // Prepare the renderer once the app is ready
 app.on('ready', async () => {
-
   if (isDev) {
     const { installExtension, REDUX_DEVTOOLS, REACT_DEVELOPER_TOOLS } = require('electron-devtools-installer');
     try {
       const extensions = await installExtension([REDUX_DEVTOOLS, REACT_DEVELOPER_TOOLS], {
-        loadExtensionOptions: {allowFileAccess: true},
-      })
-      console.log(`Added Extensions:  ${extensions.map(ext => ext.name).join(", ")}`)
-      await require("node:timers/promises").setTimeout(1000);
+        loadExtensionOptions: { allowFileAccess: true }
+      });
+      console.log(`Added Extensions:  ${extensions.map((ext) => ext.name).join(', ')}`);
+      await require('node:timers/promises').setTimeout(1000);
       session.defaultSession.getAllExtensions().map((ext) => {
         console.log(`Loading Extension: ${ext.name}`);
-        session.defaultSession.loadExtension(ext.path)
+        session.defaultSession.loadExtension(ext.path);
       });
     } catch (err) {
       console.error('An error occurred while loading extensions: ', err);
@@ -101,8 +108,8 @@ app.on('ready', async () => {
     y,
     width,
     height,
-    minWidth: 1000,
-    minHeight: 640,
+    minWidth: 700,
+    minHeight: 400,
     show: false,
     webPreferences: {
       nodeIntegration: true,
@@ -137,13 +144,13 @@ app.on('ready', async () => {
     console.error('Original message:', reason);
     if (isDev) {
       console.error(
-        'Could not connect to Next.Js dev server, is it running?' +
-          ' Start the dev server using "npm run dev:web" and restart electron'
+        'Could not connect to Next.Js dev server, is it running?'
+        + ' Start the dev server using "npm run dev:web" and restart electron'
       );
     } else {
       console.error(
-        'If you are using an official production build: the above error is most likely a bug! ' +
-          ' Please report this under: https://github.com/usebruno/bruno/issues'
+        'If you are using an official production build: the above error is most likely a bug! '
+        + ' Please report this under: https://github.com/usebruno/bruno/issues'
       );
     }
   });
@@ -161,6 +168,7 @@ app.on('ready', async () => {
   mainWindow.on('unmaximize', () => saveMaximized(false));
   mainWindow.on('close', (e) => {
     e.preventDefault();
+    terminalManager.cleanup(mainWindow.webContents);
     ipcMain.emit('main:start-quit-flow');
   });
 
@@ -182,20 +190,19 @@ app.on('ready', async () => {
     }
     return { action: 'deny' };
   });
-  
 
   mainWindow.webContents.on('did-finish-load', async () => {
     let ogSend = mainWindow.webContents.send;
-    mainWindow.webContents.send = function(channel, ...args) {
-      return ogSend.apply(this, [channel, ...args?.map(_ => {
+    mainWindow.webContents.send = function (channel, ...args) {
+      return ogSend.apply(this, [channel, ...args?.map((_) => {
         // todo: replace this with @msgpack/msgpack encode/decode
         return safeParseJSON(safeStringifyJSON(_));
       })]);
-    }
-    
+    };
+
     // Handle onboarding
     await onboardUser(mainWindow, lastOpenedCollections);
-    
+
     // Send cookies list after renderer is ready
     try {
       cookiesStore.initializeCookies();
@@ -212,9 +219,10 @@ app.on('ready', async () => {
 
   // register all ipc handlers
   registerNetworkIpc(mainWindow);
-  registerGlobalEnvironmentsIpc(mainWindow);
-  registerCollectionsIpc(mainWindow, collectionWatcher, lastOpenedCollections);
-  registerPreferencesIpc(mainWindow, collectionWatcher, lastOpenedCollections);
+  registerGlobalEnvironmentsIpc(mainWindow, globalEnvironmentsManager);
+  registerCollectionsIpc(mainWindow, collectionWatcher);
+  registerPreferencesIpc(mainWindow, collectionWatcher);
+  registerWorkspaceIpc(mainWindow, workspaceWatcher);
   registerNotificationsIpc(mainWindow, collectionWatcher);
   registerFilesystemIpc(mainWindow);
   registerSystemMonitorIpc(mainWindow, systemMonitor);
@@ -230,6 +238,12 @@ app.on('before-quit', () => {
 
   // Stop system monitoring
   systemMonitor.stop();
+
+  try {
+    terminalManager.killAll();
+  } catch (err) {
+    console.error('Failed to kill all terminals on quit', err);
+  }
 });
 
 app.on('window-all-closed', app.quit);
@@ -239,16 +253,15 @@ app.on('open-file', (event, path) => {
   openCollection(mainWindow, collectionWatcher, path);
 });
 
-
 // Register the global shortcuts
 app.on('browser-window-focus', () => {
   // Quick fix for Electron issue #29996: https://github.com/electron/electron/issues/29996
   globalShortcut.register('Ctrl+=', () => {
     mainWindow.webContents.setZoomLevel(mainWindow.webContents.getZoomLevel() + 1);
   });
-})
+});
 
 // Disable global shortcuts when not focused
 app.on('browser-window-blur', () => {
-  globalShortcut.unregisterAll()
-})
\ No newline at end of file
+  globalShortcut.unregisterAll();
+});
diff --git a/packages/bruno-electron/src/ipc/collection.js b/packages/bruno-electron/src/ipc/collection.js
index d38a02f03..b6605ca9f 100644
--- a/packages/bruno-electron/src/ipc/collection.js
+++ b/packages/bruno-electron/src/ipc/collection.js
@@ -4,7 +4,7 @@ const fsExtra = require('fs-extra');
 const os = require('os');
 const path = require('path');
 const { ipcMain, shell, dialog, app } = require('electron');
-const { 
+const {
   parseRequest,
   stringifyRequest,
   parseRequestViaWorker,
@@ -20,19 +20,21 @@ const { postmanToBruno } = brunoConverters;
 const { cookiesStore } = require('../store/cookies');
 const { parseLargeRequestWithRedaction } = require('../utils/parse');
 const { wsClient } = require('../ipc/network/ws-event-handlers');
+const { hasSubDirectories } = require('../utils/filesystem');
 
 const {
   writeFile,
   hasBruExtension,
   isDirectory,
   createDirectory,
-  searchForBruFiles,
   sanitizeName,
   isWSLPath,
   safeToRename,
   isWindowsOS,
+  hasRequestExtension,
+  getCollectionFormat,
+  searchForRequestFiles,
   validateName,
-  hasSubDirectories,
   getCollectionStats,
   sizeInMB,
   safeWriteFileSync,
@@ -41,8 +43,8 @@ const {
   getPaths,
   generateUniqueName
 } = require('../utils/filesystem');
-const { openCollectionDialog } = require('../app/collections');
-const { generateUidBasedOnHash, stringifyJson, safeParseJSON, safeStringifyJSON } = require('../utils/common');
+const { openCollectionDialog, openCollectionsByPathname } = require('../app/collections');
+const { generateUidBasedOnHash, stringifyJson, safeStringifyJSON, safeParseJSON } = require('../utils/common');
 const { moveRequestUid, deleteRequestUid } = require('../cache/requestUids');
 const { deleteCookiesForDomain, getDomainsWithCookies, addCookieForDomain, modifyCookieForDomain, parseCookieString, createCookieString, deleteCookie } = require('../utils/cookies');
 const EnvironmentSecretsStore = require('../store/env-secrets');
@@ -55,6 +57,7 @@ const { getOAuth2TokenUsingAuthorizationCode, getOAuth2TokenUsingClientCredentia
 const { getCertsAndProxyConfig } = require('./network/cert-utils');
 const collectionWatcher = require('../app/collection-watcher');
 const { transformBrunoConfigBeforeSave } = require('../utils/transfomBrunoConfig');
+const { REQUEST_TYPES } = require('../utils/constants');
 
 const environmentSecretsStore = new EnvironmentSecretsStore();
 const collectionSecurityStore = new CollectionSecurityStore();
@@ -71,30 +74,37 @@ const envHasSecrets = (environment = {}) => {
   return secrets && secrets.length > 0;
 };
 
-const validatePathIsInsideCollection = (filePath, lastOpenedCollections) => {
-  const openCollectionPaths = collectionWatcher.getAllWatcherPaths();
-  const lastOpenedPaths = lastOpenedCollections ? lastOpenedCollections.getAll() : [];
+const findCollectionPathByItemPath = (filePath) => {
+  const allCollectionPaths = collectionWatcher.getAllWatcherPaths();
 
-  // Combine both currently watched collections and last opened collections
-  // todo: remove the lastOpenedPaths from the list
-  // todo: have a proper way to validate the path without the active watcher logic
-  const allCollectionPaths = [...new Set([...openCollectionPaths, ...lastOpenedPaths])];
+  // Find the collection path that contains this file
+  // Sort by length descending to find the most specific (deepest) match first
+  const sortedPaths = allCollectionPaths.sort((a, b) => b.length - a.length);
 
-  const isValid = allCollectionPaths.some((collectionPath) => {
-    return filePath.startsWith(collectionPath + path.sep) || filePath === collectionPath;
-  });
+  for (const collectionPath of sortedPaths) {
+    if (filePath.startsWith(collectionPath + path.sep) || filePath === collectionPath) {
+      return collectionPath;
+    }
+  }
 
-  if (!isValid) {
+  return null;
+};
+
+const validatePathIsInsideCollection = (filePath) => {
+  const collectionPath = findCollectionPathByItemPath(filePath);
+
+  if (!collectionPath) {
     throw new Error(`Path: ${filePath} should be inside a collection`);
   }
-}
+};
 
-const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollections) => {
+const registerRendererEventHandlers = (mainWindow, watcher) => {
   // create collection
   ipcMain.handle(
     'renderer:create-collection',
-    async (event, collectionName, collectionFolderName, collectionLocation) => {
+    async (event, collectionName, collectionFolderName, collectionLocation, options = {}) => {
       try {
+        const format = options.format || 'bru';
         collectionFolderName = sanitizeName(collectionFolderName);
         const dirPath = path.join(collectionLocation, collectionFolderName);
         if (fs.existsSync(dirPath)) {
@@ -114,14 +124,34 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         }
 
         const uid = generateUidBasedOnHash(dirPath);
-        const brunoConfig = {
+        let brunoConfig = {
           version: '1',
           name: collectionName,
           type: 'collection',
           ignore: ['node_modules', '.git']
         };
-        const content = await stringifyJson(brunoConfig);
-        await writeFile(path.join(dirPath, 'bruno.json'), content);
+
+        if (format === 'yml') {
+          const collectionRoot = {
+            meta: {
+              name: collectionName
+            }
+          };
+          // For YAML collections, set opencollection instead of version
+          brunoConfig = {
+            opencollection: '1.0.0',
+            name: collectionName,
+            type: 'collection',
+            ignore: ['node_modules', '.git']
+          };
+          const content = stringifyCollection(collectionRoot, brunoConfig, { format });
+          await writeFile(path.join(dirPath, 'opencollection.yml'), content);
+        } else if (format === 'bru') {
+          const content = await stringifyJson(brunoConfig);
+          await writeFile(path.join(dirPath, 'bruno.json'), content);
+        } else {
+          throw new Error(`Invalid format: ${format}`);
+        }
 
         const { size, filesCount } = await getCollectionStats(dirPath);
         brunoConfig.size = size;
@@ -151,26 +181,43 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       // create dir
       await createDirectory(dirPath);
       const uid = generateUidBasedOnHash(dirPath);
+      const format = getCollectionFormat(previousPath);
+      let brunoConfig;
 
-      // open the bruno.json of previousPath
-      const brunoJsonFilePath = path.join(previousPath, 'bruno.json');
-      const content = fs.readFileSync(brunoJsonFilePath, 'utf8');
+      if (format === 'yml') {
+        const content = fs.readFileSync('opencollection.yml', 'utf8');
+        const {
+          brunoConfig: parsedBrunoConfig,
+          collectionRoot
+        } = parseCollection(content);
 
-      // Change new name of collection
-      let brunoConfig = JSON.parse(content);
-      brunoConfig.name = collectionName;
-      const cont = await stringifyJson(brunoConfig);
+        brunoConfig = parsedBrunoConfig;
+        brunoConfig.name = collectionName;
 
-      // write the bruno.json to new dir
-      await writeFile(path.join(dirPath, 'bruno.json'), cont);
+        const newContent = stringifyCollection(collectionRoot, brunoConfig, { format });
+        await writeFile(path.join(dirPath, 'opencollection.yml'), newContent);
+      } else if (format === 'bru') {
+        const content = fs.readFileSync('bruno.json', 'utf8');
+        brunoConfig = JSON.parse(content);
+        brunoConfig.name = collectionName;
+        const newContent = await stringifyJson(brunoConfig);
+        await writeFile(path.join(dirPath, 'bruno.json'), newContent);
+      } else {
+        throw new Error(`Invalid collectionformat: ${format}`);
+      }
 
-      // Now copy all the files with extension name .bru along with the dir
-      const files = searchForBruFiles(previousPath);
+      // Now copy all the files matching the collection's filetype along with the dir
+      const files = searchForRequestFiles(previousPath);
 
       for (const sourceFilePath of files) {
         const relativePath = path.relative(previousPath, sourceFilePath);
         const newFilePath = path.join(dirPath, relativePath);
 
+        // skip if the file is opencollection.yml at the root of the collection
+        if (path.basename(sourceFilePath) === 'opencollection.yml' && path.dirname(sourceFilePath) === previousPath) {
+          continue;
+        }
+
         // handle dir of files
         fs.mkdirSync(path.dirname(newFilePath), { recursive: true });
         // copy each files
@@ -188,17 +235,29 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   // rename collection
   ipcMain.handle('renderer:rename-collection', async (event, newName, collectionPathname) => {
     try {
-      const brunoJsonFilePath = path.join(collectionPathname, 'bruno.json');
-      const content = fs.readFileSync(brunoJsonFilePath, 'utf8');
-      const json = JSON.parse(content);
+      const format = getCollectionFormat(collectionPathname);
 
-      json.name = newName;
+      if (format === 'yml') {
+        const content = fs.readFileSync('opencollection.yml', 'utf8');
+        const {
+          brunoConfig,
+          collectionRoot
+        } = parseCollection(content);
 
-      const newContent = await stringifyJson(json);
-      await writeFile(brunoJsonFilePath, newContent);
+        brunoConfig.name = newName;
+
+        const newContent = stringifyCollection(collectionRoot, brunoConfig, { format });
+        await writeFile(path.join(collectionPathname, 'opencollection.yml'), newContent);
+      } else if (format === 'bru') {
+        const content = fs.readFileSync('bruno.json', 'utf8');
+        const brunoConfig = JSON.parse(content);
+        brunoConfig.name = newName;
+        const newContent = await stringifyJson(brunoConfig);
+        await writeFile(path.join(collectionPathname, 'bruno.json'), newContent);
+      } else {
+        throw new Error(`Invalid format: ${format}`);
+      }
 
-      // todo: listen for bruno.json changes and handle it in watcher
-      // the app will change the name of the collection after parsing the bruno.json file contents
       mainWindow.webContents.send('main:collection-renamed', {
         collectionPathname,
         newName
@@ -210,8 +269,10 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
   ipcMain.handle('renderer:save-folder-root', async (event, folder) => {
     try {
-      const { name: folderName, root: folderRoot = {}, pathname: folderPathname } = folder;
-      const folderBruFilePath = path.join(folderPathname, 'folder.bru');
+      const { name: folderName, root: folderRoot = {}, folderPathname, collectionPathname } = folder;
+
+      const format = getCollectionFormat(collectionPathname);
+      const folderFilePath = path.join(folderPathname, `folder.${format}`);
 
       if (!folderRoot.meta) {
         folderRoot.meta = {
@@ -219,19 +280,23 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         };
       }
 
-      const content = await stringifyFolder(folderRoot);
-      await writeFile(folderBruFilePath, content);
+      const content = await stringifyFolder(folderRoot, { format });
+      await writeFile(folderFilePath, content);
     } catch (error) {
       return Promise.reject(error);
     }
   });
-  ipcMain.handle('renderer:save-collection-root', async (event, collectionPathname, collectionRoot) => {
-    try {
-      const collectionBruFilePath = path.join(collectionPathname, 'collection.bru');
 
-      const content = await stringifyCollection(collectionRoot);
-      await writeFile(collectionBruFilePath, content);
+  // save collection root
+  ipcMain.handle('renderer:save-collection-root', async (event, collectionPathname, collectionRoot, brunoConfig) => {
+    try {
+      const format = getCollectionFormat(collectionPathname);
+      const filename = format === 'yml' ? 'opencollection.yml' : 'collection.bru';
+      const content = await stringifyCollection(collectionRoot, brunoConfig, { format });
+
+      await writeFile(path.join(collectionPathname, filename), content);
     } catch (error) {
+      console.error('Error in save-collection-root:', error);
       return Promise.reject(error);
     }
   });
@@ -242,12 +307,21 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       if (fs.existsSync(pathname)) {
         throw new Error(`path: ${pathname} already exists`);
       }
-      // For the actual filename part, we want to be strict
-      if (!validateName(request?.filename)) {
-        throw new Error(`${request.filename}.bru is not a valid filename`);
+
+      const collectionPath = findCollectionPathByItemPath(pathname);
+      if (!collectionPath) {
+        throw new Error('Collection not found for the given pathname');
       }
-      validatePathIsInsideCollection(pathname, lastOpenedCollections);
-      const content = await stringifyRequestViaWorker(request);
+      const format = getCollectionFormat(collectionPath);
+
+      // For the actual filename part, we want to be strict
+      const baseFilename = request?.filename?.replace(`.${format}`, '');
+      if (!validateName(baseFilename)) {
+        throw new Error(`${request.filename} is not a valid filename`);
+      }
+      validatePathIsInsideCollection(pathname);
+
+      const content = await stringifyRequestViaWorker(request, { format });
       await writeFile(pathname, content);
     } catch (error) {
       return Promise.reject(error);
@@ -255,12 +329,13 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // save request
-  ipcMain.handle('renderer:save-request', async (event, pathname, request) => {
+  ipcMain.handle('renderer:save-request', async (event, pathname, request, format) => {
     try {
       if (!fs.existsSync(pathname)) {
         throw new Error(`path: ${pathname} does not exist`);
       }
-      const content = await stringifyRequestViaWorker(request);
+
+      const content = await stringifyRequestViaWorker(request, { format });
       await writeFile(pathname, content);
     } catch (error) {
       return Promise.reject(error);
@@ -278,7 +353,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
           throw new Error(`path: ${pathname} does not exist`);
         }
 
-        const content = await stringifyRequestViaWorker(request);
+        const content = await stringifyRequestViaWorker(request, { format: r.format });
         await writeFile(pathname, content);
       }
     } catch (error) {
@@ -286,6 +361,71 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
+  // Helper: Parse file content based on scope type
+  const parseFileByType = async (fileContent, scopeType) => {
+    switch (scopeType) {
+      case 'request':
+        return await parseRequestViaWorker(fileContent);
+      case 'folder':
+        return parseFolder(fileContent);
+      case 'collection':
+        return parseCollection(fileContent);
+      default:
+        throw new Error(`Invalid scope type: ${scopeType}`);
+    }
+  };
+
+  const stringifyByType = async (data, scopeType, collectionRoot, format) => {
+    switch (scopeType) {
+      case 'request':
+        return await stringifyRequestViaWorker(data, { format });
+      case 'folder':
+        return stringifyFolder(data, { format });
+      case 'collection':
+        return stringifyCollection(collectionRoot, data, { format });
+      default:
+        throw new Error(`Invalid scope type: ${scopeType}`);
+    }
+  };
+
+  // Helper: Update or create variable in array
+  const updateOrCreateVariable = (variables, variable) => {
+    const existingVar = variables.find((v) => v.name === variable.name);
+
+    if (existingVar) {
+      // Update existing variable
+      return variables.map((v) => (v.name === variable.name ? variable : v));
+    }
+
+    // Create new variable
+    return [...variables, variable];
+  };
+
+  // update variable in request/folder/collection file
+  ipcMain.handle('renderer:update-variable-in-file', async (event, pathname, variable, scopeType, collectionRoot, format) => {
+    try {
+      if (!fs.existsSync(pathname)) {
+        throw new Error(`path: ${pathname} does not exist`);
+      }
+
+      // Read and parse the file
+      const fileContent = fs.readFileSync(pathname, 'utf8');
+      const parsedData = await parseFileByType(fileContent, scopeType);
+
+      // Update the specific variable or create it if it doesn't exist
+      const varsPath = 'request.vars.req';
+      const variables = _.get(parsedData, varsPath, []);
+      const updatedVariables = updateOrCreateVariable(variables, variable);
+
+      _.set(parsedData, varsPath, updatedVariables);
+
+      const content = await stringifyByType(parsedData, scopeType, collectionRoot, format);
+      await writeFile(pathname, content);
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  });
+
   // create environment
   ipcMain.handle('renderer:create-environment', async (event, collectionPathname, name, variables) => {
     try {
@@ -294,17 +434,19 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         await createDirectory(envDirPath);
       }
 
+      const format = getCollectionFormat(collectionPathname);
+
       // Get existing environment files to generate unique name
       const existingFiles = fs.existsSync(envDirPath) ? fs.readdirSync(envDirPath) : [];
       const existingEnvNames = existingFiles
-        .filter((file) => file.endsWith('.bru'))
-        .map((file) => path.basename(file, '.bru'));
+        .filter((file) => file.endsWith(`.${format}`))
+        .map((file) => path.basename(file, `.${format}`));
 
       // Generate unique name based on existing environment files
       const sanitizedName = sanitizeName(name);
       const uniqueName = generateUniqueName(sanitizedName, (name) => existingEnvNames.includes(name));
 
-      const envFilePath = path.join(envDirPath, `${uniqueName}.bru`);
+      const envFilePath = path.join(envDirPath, `${uniqueName}.${format}`);
 
       const environment = {
         name: uniqueName,
@@ -315,7 +457,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         environmentSecretsStore.storeEnvSecrets(collectionPathname, environment);
       }
 
-      const content = await stringifyEnvironment(environment);
+      const content = await stringifyEnvironment(environment, { format });
 
       await writeFile(envFilePath, content);
     } catch (error) {
@@ -331,7 +473,10 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         await createDirectory(envDirPath);
       }
 
-      const envFilePath = path.join(envDirPath, `${environment.name}.bru`);
+      const format = getCollectionFormat(collectionPathname);
+      // Determine filetype from collection
+      const envFilePath = path.join(envDirPath, `${environment.name}.${format}`);
+
       if (!fs.existsSync(envFilePath)) {
         throw new Error(`environment: ${envFilePath} does not exist`);
       }
@@ -340,7 +485,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         environmentSecretsStore.storeEnvSecrets(collectionPathname, environment);
       }
 
-      const content = await stringifyEnvironment(environment);
+      const content = await stringifyEnvironment(environment, { format });
       await writeFile(envFilePath, content);
     } catch (error) {
       return Promise.reject(error);
@@ -350,13 +495,15 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   // rename environment
   ipcMain.handle('renderer:rename-environment', async (event, collectionPathname, environmentName, newName) => {
     try {
+      const format = getCollectionFormat(collectionPathname);
       const envDirPath = path.join(collectionPathname, 'environments');
-      const envFilePath = path.join(envDirPath, `${environmentName}.bru`);
+      const envFilePath = path.join(envDirPath, `${environmentName}.${format}`);
+
       if (!fs.existsSync(envFilePath)) {
         throw new Error(`environment: ${envFilePath} does not exist`);
       }
 
-      const newEnvFilePath = path.join(envDirPath, `${newName}.bru`);
+      const newEnvFilePath = path.join(envDirPath, `${newName}.${format}`);
       if (!safeToRename(envFilePath, newEnvFilePath)) {
         throw new Error(`environment: ${newEnvFilePath} already exists`);
       }
@@ -372,8 +519,9 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   // delete environment
   ipcMain.handle('renderer:delete-environment', async (event, collectionPathname, environmentName) => {
     try {
+      const format = getCollectionFormat(collectionPathname);
       const envDirPath = path.join(collectionPathname, 'environments');
-      const envFilePath = path.join(envDirPath, `${environmentName}.bru`);
+      const envFilePath = path.join(envDirPath, `${environmentName}.${format}`);
       if (!fs.existsSync(envFilePath)) {
         throw new Error(`environment: ${envFilePath} does not exist`);
       }
@@ -458,43 +606,43 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // rename item
-  ipcMain.handle('renderer:rename-item-name', async (event, { itemPath, newName }) => {
+  ipcMain.handle('renderer:rename-item-name', async (event, { itemPath, newName, collectionPathname }) => {
     try {
-
       if (!fs.existsSync(itemPath)) {
         throw new Error(`path: ${itemPath} does not exist`);
       }
 
       if (isDirectory(itemPath)) {
-        const folderBruFilePath = path.join(itemPath, 'folder.bru');
-        let folderBruFileJsonContent;
-        if (fs.existsSync(folderBruFilePath)) {
-          const oldFolderBruFileContent = await fs.promises.readFile(folderBruFilePath, 'utf8');
-          folderBruFileJsonContent = await parseFolder(oldFolderBruFileContent);
-          folderBruFileJsonContent.meta.name = newName;
+        const format = getCollectionFormat(collectionPathname);
+        const folderFilePath = path.join(itemPath, `folder.${format}`);
+        let folderFileJsonContent;
+        if (fs.existsSync(folderFilePath)) {
+          const oldFolderFileContent = await fs.promises.readFile(folderFilePath, 'utf8');
+          folderFileJsonContent = await parseFolder(oldFolderFileContent, { format });
+          folderFileJsonContent.meta.name = newName;
         } else {
-          folderBruFileJsonContent = {
+          folderFileJsonContent = {
             meta: {
               name: newName
             }
           };
         }
-        
-        const folderBruFileContent = await stringifyFolder(folderBruFileJsonContent);
-        await writeFile(folderBruFilePath, folderBruFileContent);
+
+        const folderFileContent = await stringifyFolder(folderFileJsonContent, { format });
+        await writeFile(folderFilePath, folderFileContent);
 
         return;
       }
 
-      const isBru = hasBruExtension(itemPath);
-      if (!isBru) {
-        throw new Error(`path: ${itemPath} is not a bru file`);
+      const format = getCollectionFormat(collectionPathname);
+      if (!hasRequestExtension(itemPath, format)) {
+        throw new Error(`path: ${itemPath} is not a valid request file`);
       }
 
       const data = fs.readFileSync(itemPath, 'utf8');
-      const jsonData = parseRequest(data);
+      const jsonData = parseRequest(data, { format });
       jsonData.name = newName;
-      const content = stringifyRequest(jsonData);
+      const content = stringifyRequest(jsonData, { format });
       await writeFile(itemPath, content);
     } catch (error) {
       return Promise.reject(error);
@@ -502,7 +650,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // rename item
-  ipcMain.handle('renderer:rename-item-filename', async (event, { oldPath, newPath, newName, newFilename }) => {
+  ipcMain.handle('renderer:rename-item-filename', async (event, { oldPath, newPath, newName, newFilename, collectionPathname }) => {
     const tempDir = path.join(os.tmpdir(), `temp-folder-${Date.now()}`);
     const isWindowsOSAndNotWSLPathAndItemHasSubDirectories = isDirectory(oldPath) && isWindowsOS() && !isWSLPath(oldPath) && hasSubDirectories(oldPath);
     try {
@@ -515,29 +663,31 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         throw new Error(`path: ${newPath} already exists`);
       }
 
+      const format = getCollectionFormat(collectionPathname);
+
       if (isDirectory(oldPath)) {
-        const folderBruFilePath = path.join(oldPath, 'folder.bru');
-        let folderBruFileJsonContent;
-        if (fs.existsSync(folderBruFilePath)) {
-          const oldFolderBruFileContent = await fs.promises.readFile(folderBruFilePath, 'utf8');
-          folderBruFileJsonContent = await parseFolder(oldFolderBruFileContent);
-          folderBruFileJsonContent.meta.name = newName;
+        const folderFilePath = path.join(oldPath, `folder.${format}`);
+        let folderFileJsonContent;
+        if (fs.existsSync(folderFilePath)) {
+          const oldFolderFileContent = await fs.promises.readFile(folderFilePath, 'utf8');
+          folderFileJsonContent = await parseFolder(oldFolderFileContent, { format });
+          folderFileJsonContent.meta.name = newName;
         } else {
-          folderBruFileJsonContent = {
+          folderFileJsonContent = {
             meta: {
               name: newName
             }
           };
         }
 
-        const folderBruFileContent = await stringifyFolder(folderBruFileJsonContent);
-        await writeFile(folderBruFilePath, folderBruFileContent);
-        
-        const bruFilesAtSource = await searchForBruFiles(oldPath);
+        const folderFileContent = await stringifyFolder(folderFileJsonContent, { format });
+        await writeFile(folderFilePath, folderFileContent);
 
-        for (let bruFile of bruFilesAtSource) {
-          const newBruFilePath = bruFile.replace(oldPath, newPath);
-          moveRequestUid(bruFile, newBruFilePath);
+        const requestFilesAtSource = await searchForRequestFiles(oldPath, collectionPathname);
+
+        for (let requestFile of requestFilesAtSource) {
+          const newRequestFilePath = requestFile.replace(oldPath, newPath);
+          moveRequestUid(requestFile, newRequestFilePath);
         }
 
         /**
@@ -561,8 +711,8 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         return newPath;
       }
 
-      if (!hasBruExtension(oldPath)) {
-        throw new Error(`path: ${oldPath} is not a bru file`);
+      if (!hasRequestExtension(oldPath, format)) {
+        throw new Error(`path: ${oldPath} is not a valid request file`);
       }
 
       if (!validateName(newFilename)) {
@@ -571,11 +721,11 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
       // update name in file and save new copy, then delete old copy
       const data = await fs.promises.readFile(oldPath, 'utf8'); // Use async read
-      const jsonData = parseRequest(data);
+      const jsonData = parseRequest(data, { format });
       jsonData.name = newName;
       moveRequestUid(oldPath, newPath);
 
-      const content = stringifyRequest(jsonData);
+      const content = stringifyRequest(jsonData, { format });
       await fs.promises.unlink(oldPath);
       await writeFile(newPath, content);
 
@@ -589,7 +739,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
             await fsExtra.copy(tempDir, oldPath);
             await fsExtra.remove(tempDir);
           } catch (err) {
-            console.error("Failed to restore data to the old path:", err);
+            console.error('Failed to restore data to the old path:', err);
           }
         }
       }
@@ -599,15 +749,15 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // new folder
-  ipcMain.handle('renderer:new-folder', async (event, { pathname, folderBruJsonData }) => {
+  ipcMain.handle('renderer:new-folder', async (event, { pathname, folderData, format }) => {
     const resolvedFolderName = sanitizeName(path.basename(pathname));
     pathname = path.join(path.dirname(pathname), resolvedFolderName);
     try {
       if (!fs.existsSync(pathname)) {
         fs.mkdirSync(pathname);
-        const folderBruFilePath = path.join(pathname, 'folder.bru');
-        const content = await stringifyFolder(folderBruJsonData);
-        await writeFile(folderBruFilePath, content);
+        const folderFilePath = path.join(pathname, `folder.${format}`);
+        const content = await stringifyFolder(folderData, { format });
+        await writeFile(folderFilePath, content);
       } else {
         return Promise.reject(new Error('The directory already exists'));
       }
@@ -617,7 +767,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // delete file/folder
-  ipcMain.handle('renderer:delete-item', async (event, pathname, type) => {
+  ipcMain.handle('renderer:delete-item', async (event, pathname, type, collectionPathname) => {
     try {
       if (type === 'folder') {
         if (!fs.existsSync(pathname)) {
@@ -625,9 +775,9 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         }
 
         // delete the request uid mappings
-        const bruFilesAtSource = await searchForBruFiles(pathname);
-        for (let bruFile of bruFilesAtSource) {
-          deleteRequestUid(bruFile);
+        const requestFilesAtSource = await searchForRequestFiles(pathname, collectionPathname);
+        for (let requestFile of requestFilesAtSource) {
+          deleteRequestUid(requestFile);
         }
 
         fs.rmSync(pathname, { recursive: true, force: true });
@@ -647,31 +797,38 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
-  ipcMain.handle('renderer:open-collection', () => {
+  ipcMain.handle('renderer:open-collection', async () => {
     if (watcher && mainWindow) {
-      openCollectionDialog(mainWindow, watcher);
+      await openCollectionDialog(mainWindow, watcher);
     }
   });
 
-  ipcMain.handle('renderer:remove-collection', async (event, collectionPath, collectionUid) => {
+  ipcMain.handle('renderer:open-multiple-collections', async (e, collectionPaths) => {
     if (watcher && mainWindow) {
-      console.log(`watcher stopWatching: ${collectionPath}`);
-      watcher.removeWatcher(collectionPath, mainWindow, collectionUid);
-      lastOpenedCollections.remove(collectionPath);
+      await openCollectionsByPathname(mainWindow, watcher, collectionPaths);
+    }
+  });
+
+  ipcMain.handle('renderer:remove-collection', async (event, collectionPath, collectionUid, workspacePath) => {
+    if (watcher && mainWindow) {
+      watcher.removeWatcher(collectionPath, mainWindow, collectionUid);
 
-      // If wsclient was initialised for any collections that are opened
-      // then close for the current collection
       if (wsClient) {
         wsClient.closeForCollection(collectionUid);
       }
     }
+
+    if (workspacePath && workspacePath !== 'default') {
+      try {
+        const { removeCollectionFromWorkspace } = require('../utils/workspace-config');
+        await removeCollectionFromWorkspace(workspacePath, collectionPath);
+      } catch (error) {
+        console.error('Error removing collection from workspace.yml:', error);
+      }
+    }
   });
 
-  ipcMain.handle('renderer:update-collection-paths', async (_, collectionPaths) => {
-    lastOpenedCollections.update(collectionPaths);
-  })
-
-  ipcMain.handle('renderer:import-collection', async (event, collection, collectionLocation) => {
+  ipcMain.handle('renderer:import-collection', async (_, collection, collectionLocation, format = 'bru') => {
     try {
       let collectionName = sanitizeName(collection.name);
       let collectionPath = path.join(collectionLocation, collectionName);
@@ -681,11 +838,11 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       }
 
       // Recursive function to parse the collection items and create files/folders
-      const parseCollectionItems = (items = [], currentPath) => {
-        items.forEach(async (item) => {
+      const parseCollectionItems = async (items = [], currentPath) => {
+        await Promise.all(items.map(async (item) => {
           if (['http-request', 'graphql-request', 'grpc-request', 'ws-request'].includes(item.type)) {
-            let sanitizedFilename = sanitizeName(item?.filename || `${item.name}.bru`);
-            const content = await stringifyRequestViaWorker(item);
+            let sanitizedFilename = sanitizeName(item?.filename || `${item.name}.${format}`);
+            const content = await stringifyRequestViaWorker(item, { format });
             const filePath = path.join(currentPath, sanitizedFilename);
             safeWriteFileSync(filePath, content);
           }
@@ -695,14 +852,14 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
             fs.mkdirSync(folderPath);
 
             if (item?.root?.meta?.name) {
-              const folderBruFilePath = path.join(folderPath, 'folder.bru');
+              const folderFilePath = path.join(folderPath, `folder.${format}`);
               item.root.meta.seq = item.seq;
-              const folderContent = await stringifyFolder(item.root);
-              safeWriteFileSync(folderBruFilePath, folderContent);
+              const folderContent = await stringifyFolder(item.root, { format });
+              safeWriteFileSync(folderFilePath, folderContent);
             }
 
             if (item.items && item.items.length) {
-              parseCollectionItems(item.items, folderPath);
+              await parseCollectionItems(item.items, folderPath);
             }
           }
           // Handle items of type 'js'
@@ -711,21 +868,21 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
             const filePath = path.join(currentPath, sanitizedFilename);
             safeWriteFileSync(filePath, item.fileContent);
           }
-        });
+        }));
       };
 
-      const parseEnvironments = (environments = [], collectionPath) => {
+      const parseEnvironments = async (environments = [], collectionPath) => {
         const envDirPath = path.join(collectionPath, 'environments');
         if (!fs.existsSync(envDirPath)) {
           fs.mkdirSync(envDirPath);
         }
 
-        environments.forEach(async (env) => {
-          const content = await stringifyEnvironment(env);
-          let sanitizedEnvFilename = sanitizeName(`${env.name}.bru`);
+        await Promise.all(environments.map(async (env) => {
+          const content = await stringifyEnvironment(env, { format });
+          let sanitizedEnvFilename = sanitizeName(`${env.name}.${format}`);
           const filePath = path.join(envDirPath, sanitizedEnvFilename);
           safeWriteFileSync(filePath, content);
-        });
+        }));
       };
 
       const getBrunoJsonConfig = (collection) => {
@@ -747,13 +904,19 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
       const uid = generateUidBasedOnHash(collectionPath);
       let brunoConfig = getBrunoJsonConfig(collection);
-      const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
 
-      // Write the Bruno configuration to a file
-      await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
+      if (format === 'yml') {
+        const collectionContent = await stringifyCollection(collection.root, brunoConfig, { format });
+        await writeFile(path.join(collectionPath, 'opencollection.yml'), collectionContent);
+      } else if (format === 'bru') {
+        const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
+        await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
 
-      const collectionContent = await stringifyCollection(collection.root);
-      await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
+        const collectionContent = await stringifyCollection(collection.root, brunoConfig, { format });
+        await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
+      } else {
+        throw new Error(`Invalid format: ${format}`);
+      }
 
       const { size, filesCount } = await getCollectionStats(collectionPath);
       brunoConfig.size = size;
@@ -762,41 +925,48 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       mainWindow.webContents.send('main:collection-opened', collectionPath, uid, brunoConfig);
       ipcMain.emit('main:collection-opened', mainWindow, collectionPath, uid, brunoConfig);
 
-      lastOpenedCollections.add(collectionPath);
-
       // create folder and files based on collection
       await parseCollectionItems(collection.items, collectionPath);
       await parseEnvironments(collection.environments, collectionPath);
+
+      return collectionPath;
     } catch (error) {
       return Promise.reject(error);
     }
   });
 
-  ipcMain.handle('renderer:clone-folder', async (event, itemFolder, collectionPath) => {
+  ipcMain.handle('renderer:clone-folder', async (event, itemFolder, collectionPath, collectionPathname) => {
     try {
       if (fs.existsSync(collectionPath)) {
         throw new Error(`folder: ${collectionPath} already exists`);
       }
 
+      const format = getCollectionFormat(collectionPathname);
+
       // Recursive function to parse the folder and create files/folders
       const parseCollectionItems = (items = [], currentPath) => {
         items.forEach(async (item) => {
           if (['http-request', 'graphql-request', 'grpc-request'].includes(item.type)) {
-            const content = await stringifyRequestViaWorker(item);            
-            const filePath = path.join(currentPath, item.filename);
+            const content = await stringifyRequestViaWorker(item, { format });
+
+            // Use the correct file extension based on target format
+            const baseName = path.parse(item.filename).name;
+            const newFilename = format === 'yml' ? `${baseName}.yml` : `${baseName}.bru`;
+            const filePath = path.join(currentPath, newFilename);
+
             safeWriteFileSync(filePath, content);
           }
           if (item.type === 'folder') {
             const folderPath = path.join(currentPath, item.filename);
             fs.mkdirSync(folderPath);
 
-            // If folder has a root element, then I should write its folder.bru file
+            // If folder has a root element, then I should write its folder file
             if (item.root) {
-              const folderContent = await stringifyFolder(item.root);
+              const folderContent = await stringifyFolder(item.root, { format });
               folderContent.name = item.name;
               if (folderContent) {
-                const bruFolderPath = path.join(folderPath, `folder.bru`);
-                safeWriteFileSync(bruFolderPath, folderContent);
+                const folderFilePath = path.join(folderPath, `folder.${format}`);
+                safeWriteFileSync(folderFilePath, folderContent);
               }
             }
 
@@ -809,12 +979,12 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
       await createDirectory(collectionPath);
 
-      // If initial folder has a root element, then I should write its folder.bru file
+      // If initial folder has a root element, then I should write its folder file
       if (itemFolder.root) {
-        const folderContent = await stringifyFolder(itemFolder.root);
+        const folderContent = await stringifyFolder(itemFolder.root, { format });
         if (folderContent) {
-          const bruFolderPath = path.join(collectionPath, `folder.bru`);
-          safeWriteFileSync(bruFolderPath, folderContent);
+          const folderFilePath = path.join(collectionPath, `folder.${format}`);
+          safeWriteFileSync(folderFilePath, folderContent);
         }
       }
 
@@ -825,37 +995,39 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
-  ipcMain.handle('renderer:resequence-items', async (event, itemsToResequence) => {
+  ipcMain.handle('renderer:resequence-items', async (event, itemsToResequence, collectionPathname) => {
     try {
+      const format = getCollectionFormat(collectionPathname);
+
       for (let item of itemsToResequence) {
         if (item?.type === 'folder') {
-          const folderRootPath = path.join(item.pathname, 'folder.bru');
-          let folderBruJsonData = {
+          const folderRootPath = path.join(item.pathname, `folder.${format}`);
+          let folderJsonData = {
             meta: {
               name: path.basename(item.pathname),
               seq: item.seq
             }
           };
           if (fs.existsSync(folderRootPath)) {
-            const bru = fs.readFileSync(folderRootPath, 'utf8');
-            folderBruJsonData = await parseCollection(bru);
-            if (!folderBruJsonData?.meta) {
-              folderBruJsonData.meta = {
+            const folderContent = fs.readFileSync(folderRootPath, 'utf8');
+            folderJsonData = await parseFolder(folderContent, { format });
+            if (!folderJsonData?.meta) {
+              folderJsonData.meta = {
                 name: path.basename(item.pathname),
                 seq: item.seq
               };
             }
-            if (folderBruJsonData?.meta?.seq === item.seq) {
+            if (folderJsonData?.meta?.seq === item.seq) {
               continue;
             }
-            folderBruJsonData.meta.seq = item.seq;
+            folderJsonData.meta.seq = item.seq;
           }
-          const content = await stringifyFolder(folderBruJsonData);
+          const content = await stringifyFolder(folderJsonData, { format });
           await writeFile(folderRootPath, content);
-        } else {
+        } else if (REQUEST_TYPES.includes(item?.type)) {
           if (fs.existsSync(item.pathname)) {
             const itemToSave = transformRequestToSaveToFilesystem(item);
-            const content = await stringifyRequestViaWorker(itemToSave);
+            const content = await stringifyRequestViaWorker(itemToSave, { format });
             await writeFile(item.pathname, content);
           }
         }
@@ -886,7 +1058,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       if (fs.existsSync(targetDirname)) {
         const sourceDirname = path.dirname(sourcePathname);
         const pathnamesBefore = await getPaths(sourcePathname);
-        const pathnamesAfter = pathnamesBefore?.map(p => p?.replace(sourceDirname, targetDirname));
+        const pathnamesAfter = pathnamesBefore?.map((p) => p?.replace(sourceDirname, targetDirname));
         await copyPath(sourcePathname, targetDirname);
         await removePath(sourcePathname);
         // move the request uids of the previous file/folders to the new file/folder items
@@ -912,11 +1084,11 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         throw new Error(`folder: ${newFolderPath} already exists`);
       }
 
-      const bruFilesAtSource = await searchForBruFiles(folderPath);
+      const requestFilesAtSource = await searchForRequestFiles(folderPath);
 
-      for (let bruFile of bruFilesAtSource) {
-        const newBruFilePath = bruFile.replace(folderPath, newFolderPath);
-        moveRequestUid(bruFile, newBruFilePath);
+      for (let requestFile of requestFilesAtSource) {
+        const newRequestFilePath = requestFile.replace(folderPath, newFolderPath);
+        moveRequestUid(requestFile, newRequestFilePath);
       }
 
       fs.renameSync(folderPath, newFolderPath);
@@ -925,12 +1097,21 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
-  ipcMain.handle('renderer:update-bruno-config', async (event, brunoConfig, collectionPath, collectionUid) => {
+  ipcMain.handle('renderer:update-bruno-config', async (event, brunoConfig, collectionPath, collectionRoot) => {
     try {
       const transformedBrunoConfig = transformBrunoConfigBeforeSave(brunoConfig);
-      const brunoConfigPath = path.join(collectionPath, 'bruno.json');
-      const content = await stringifyJson(transformedBrunoConfig);
-      await writeFile(brunoConfigPath, content);
+      const format = getCollectionFormat(collectionPath);
+
+      if (format === 'bru') {
+        const brunoConfigPath = path.join(collectionPath, 'bruno.json');
+        const content = await stringifyJson(transformedBrunoConfig);
+        await writeFile(brunoConfigPath, content);
+      } else if (format === 'yml') {
+        const content = await stringifyCollection(collectionRoot, transformedBrunoConfig, { format });
+        await writeFile(path.join(collectionPath, 'opencollection.yml'), content);
+      } else {
+        throw new Error(`Invalid collection format: ${format}`);
+      }
     } catch (error) {
       return Promise.reject(error);
     }
@@ -1004,7 +1185,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
-    ipcMain.handle('renderer:get-parsed-cookie', async (event, cookieStr) => {
+  ipcMain.handle('renderer:get-parsed-cookie', async (event, cookieStr) => {
     try {
       return parseCookieString(cookieStr);
     } catch (error) {
@@ -1212,13 +1393,13 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       return Promise.reject(error);
     }
   });
-  
+
   // todo: could be removed
   ipcMain.handle('renderer:load-request', async (event, { collectionUid, pathname }) => {
     let fileStats;
     try {
       fileStats = fs.statSync(pathname);
-      if (hasBruExtension(pathname)) {
+      if (hasRequestExtension(pathname)) {
         const file = {
           meta: {
             collectionUid,
@@ -1242,7 +1423,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         mainWindow.webContents.send('main:collection-tree-updated', 'addFile', file);
       }
     } catch (error) {
-      if (hasBruExtension(pathname)) {
+      if (hasRequestExtension(pathname)) {
         const file = {
           meta: {
             collectionUid,
@@ -1320,10 +1501,10 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       maxFileSize
     } = await getCollectionStats(collectionPathname);
 
-    const shouldLoadCollectionAsync =
-      (size > MAX_COLLECTION_SIZE_IN_MB) ||
-      (filesCount > MAX_COLLECTION_FILES_COUNT) ||
-      (maxFileSize > MAX_SINGLE_FILE_SIZE_IN_COLLECTION_IN_MB);
+    const shouldLoadCollectionAsync
+      = (size > MAX_COLLECTION_SIZE_IN_MB)
+        || (filesCount > MAX_COLLECTION_FILES_COUNT)
+        || (maxFileSize > MAX_SINGLE_FILE_SIZE_IN_COLLECTION_IN_MB);
 
     watcher.addWatcher(mainWindow, collectionPathname, collectionUid, brunoConfig, false, shouldLoadCollectionAsync);
   });
@@ -1354,7 +1535,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 };
 
-const registerMainEventHandlers = (mainWindow, watcher, lastOpenedCollections) => {
+const registerMainEventHandlers = (mainWindow, watcher) => {
   ipcMain.on('main:open-collection', () => {
     if (watcher && mainWindow) {
       openCollectionDialog(mainWindow, watcher);
@@ -1367,7 +1548,6 @@ const registerMainEventHandlers = (mainWindow, watcher, lastOpenedCollections) =
   });
 
   ipcMain.on('main:collection-opened', async (win, pathname, uid, brunoConfig) => {
-    lastOpenedCollections.add(pathname);
     app.addRecentDocument(pathname);
   });
 
@@ -1385,9 +1565,9 @@ const registerMainEventHandlers = (mainWindow, watcher, lastOpenedCollections) =
   });
 };
 
-const registerCollectionsIpc = (mainWindow, watcher, lastOpenedCollections) => {
-  registerRendererEventHandlers(mainWindow, watcher, lastOpenedCollections);
-  registerMainEventHandlers(mainWindow, watcher, lastOpenedCollections);
+const registerCollectionsIpc = (mainWindow, watcher) => {
+  registerRendererEventHandlers(mainWindow, watcher);
+  registerMainEventHandlers(mainWindow, watcher);
 };
 
 module.exports = registerCollectionsIpc;
diff --git a/packages/bruno-electron/src/ipc/filesystem.js b/packages/bruno-electron/src/ipc/filesystem.js
index ecdae948f..b28b56d73 100644
--- a/packages/bruno-electron/src/ipc/filesystem.js
+++ b/packages/bruno-electron/src/ipc/filesystem.js
@@ -10,7 +10,6 @@ const {
 } = require('../utils/filesystem');
 
 const registerFilesystemIpc = (mainWindow) => {
-
   ipcMain.handle('renderer:browse-directory', async (event, pathname, request) => {
     try {
       return await browseDirectory(mainWindow);
diff --git a/packages/bruno-electron/src/ipc/global-environments.js b/packages/bruno-electron/src/ipc/global-environments.js
index 40e6ccb7e..2432e283e 100644
--- a/packages/bruno-electron/src/ipc/global-environments.js
+++ b/packages/bruno-electron/src/ipc/global-environments.js
@@ -3,60 +3,102 @@ const { ipcMain } = require('electron');
 const { globalEnvironmentsStore } = require('../store/global-environments');
 const { generateUniqueName, sanitizeName } = require('../utils/filesystem');
 
-const registerGlobalEnvironmentsIpc = (mainWindow) => {
-
-  // GLOBAL ENVIRONMENTS
-
-  ipcMain.handle('renderer:create-global-environment', async (event, { uid, name, variables }) => {
+const registerGlobalEnvironmentsIpc = (mainWindow, workspaceEnvironmentsManager) => {
+  ipcMain.handle('renderer:create-global-environment', async (event, { uid, name, variables, workspaceUid, workspacePath }) => {
     try {
-      // Get existing global environment names to generate unique name
+      // If workspace path provided, use workspace environments manager
+      if (workspacePath && workspaceEnvironmentsManager) {
+        const { globalEnvironments } = await workspaceEnvironmentsManager.getGlobalEnvironmentsByPath(workspacePath);
+        const existingNames = globalEnvironments?.map((env) => env.name) || [];
+
+        const sanitizedName = sanitizeName(name);
+        const uniqueName = generateUniqueName(sanitizedName, (name) => existingNames.includes(name));
+
+        return await workspaceEnvironmentsManager.addGlobalEnvironmentByPath(workspacePath, { uid, name: uniqueName, variables });
+      }
+
       const existingGlobalEnvironments = globalEnvironmentsStore.getGlobalEnvironments();
       const existingNames = existingGlobalEnvironments?.map((env) => env.name) || [];
 
-      // Generate unique name based on existing global environment names
       const sanitizedName = sanitizeName(name);
       const uniqueName = generateUniqueName(sanitizedName, (name) => existingNames.includes(name));
 
       globalEnvironmentsStore.addGlobalEnvironment({ uid, name: uniqueName, variables });
 
-      // Return the unique name that was actually used
       return { name: uniqueName };
     } catch (error) {
+      console.error('Error in renderer:create-global-environment:', error);
       return Promise.reject(error);
     }
   });
 
-  ipcMain.handle('renderer:save-global-environment', async (event, { environmentUid, variables }) => {
+  ipcMain.handle('renderer:save-global-environment', async (event, { environmentUid, variables, workspaceUid, workspacePath }) => {
     try {
-      globalEnvironmentsStore.saveGlobalEnvironment({ environmentUid, variables })
+      if (workspacePath && workspaceEnvironmentsManager) {
+        return await workspaceEnvironmentsManager.saveGlobalEnvironmentByPath(workspacePath, { environmentUid, variables });
+      }
+
+      globalEnvironmentsStore.saveGlobalEnvironment({ environmentUid, variables });
     } catch (error) {
+      console.error('Error in renderer:save-global-environment:', error);
       return Promise.reject(error);
     }
   });
 
-  ipcMain.handle('renderer:rename-global-environment', async (event, { environmentUid, name }) => {
+  ipcMain.handle('renderer:rename-global-environment', async (event, { environmentUid, name, workspaceUid, workspacePath }) => {
     try {
+      if (workspacePath && workspaceEnvironmentsManager) {
+        return await workspaceEnvironmentsManager.renameGlobalEnvironmentByPath(workspacePath, { environmentUid, name });
+      }
+
       globalEnvironmentsStore.renameGlobalEnvironment({ environmentUid, name });
     } catch (error) {
+      console.error('Error in renderer:rename-global-environment:', error);
       return Promise.reject(error);
     }
   });
 
-  ipcMain.handle('renderer:delete-global-environment', async (event, { environmentUid }) => {
+  ipcMain.handle('renderer:delete-global-environment', async (event, { environmentUid, workspaceUid, workspacePath }) => {
     try {
+      if (workspacePath && workspaceEnvironmentsManager) {
+        return await workspaceEnvironmentsManager.deleteGlobalEnvironmentByPath(workspacePath, { environmentUid });
+      }
+
       globalEnvironmentsStore.deleteGlobalEnvironment({ environmentUid });
     } catch (error) {
+      console.error('Error in renderer:delete-global-environment:', error);
       return Promise.reject(error);
     }
   });
 
-  ipcMain.handle('renderer:select-global-environment', async (event, { environmentUid }) => {
+  ipcMain.handle('renderer:select-global-environment', async (event, { environmentUid, workspaceUid, workspacePath }) => {
     try {
+      if (workspacePath && workspaceEnvironmentsManager) {
+        return await workspaceEnvironmentsManager.selectGlobalEnvironmentByPath(workspacePath, { environmentUid });
+      }
+
       globalEnvironmentsStore.selectGlobalEnvironment({ environmentUid });
     } catch (error) {
+      console.error('Error in renderer:select-global-environment:', error);
+      return Promise.reject(error);
+    }
+  });
+
+  ipcMain.handle('renderer:get-global-environments', async (event, { workspaceUid, workspacePath }) => {
+    try {
+      if (workspacePath && workspaceEnvironmentsManager) {
+        return await workspaceEnvironmentsManager.getGlobalEnvironmentsByPath(workspacePath);
+      }
+
+      return {
+        globalEnvironments: globalEnvironmentsStore.getGlobalEnvironments() || [],
+        activeGlobalEnvironmentUid: globalEnvironmentsStore.getActiveGlobalEnvironmentUid()
+      };
+    } catch (error) {
+      console.error('Error in renderer:get-global-environments:', error);
       return Promise.reject(error);
     }
   });
 };
 
-module.exports = registerGlobalEnvironmentsIpc;
\ No newline at end of file
+module.exports = registerGlobalEnvironmentsIpc;
diff --git a/packages/bruno-electron/src/ipc/network/authorize-user-in-window.js b/packages/bruno-electron/src/ipc/network/authorize-user-in-window.js
index 26e6960d7..c5580edaf 100644
--- a/packages/bruno-electron/src/ipc/network/authorize-user-in-window.js
+++ b/packages/bruno-electron/src/ipc/network/authorize-user-in-window.js
@@ -66,7 +66,7 @@ const authorizeUserInWindow = ({ authorizeUrl, callbackUrl, session, additionalH
           },
           fromCache: false,
           completed: true,
-          requests: [], // No sub-requests in this context
+          requests: [] // No sub-requests in this context
         };
         // Add to mainRequests
 
@@ -80,14 +80,14 @@ const authorizeUserInWindow = ({ authorizeUrl, callbackUrl, session, additionalH
 
     webSession.webRequest.onBeforeSendHeaders((details, callback) => {
       const { id: requestId, requestHeaders, method, url } = details;
-      
+
       if (details.resourceType === 'mainFrame' && Object.keys(additionalHeaders).length > 0) {
         // Add our custom headers
         for (const [name, value] of Object.entries(additionalHeaders)) {
           requestHeaders[name] = value;
         }
       }
-      
+
       if (currentMainRequest?.requestId === requestId) {
         currentMainRequest.request = {
           url,
@@ -185,7 +185,7 @@ const authorizeUserInWindow = ({ authorizeUrl, callbackUrl, session, additionalH
             const urlWithHash = new URL(finalUrl);
             const hash = urlWithHash.hash.substring(1); // Remove the leading #
             const hashParams = new URLSearchParams(hash);
-            
+
             // Extract tokens from hash fragment
             const implicitTokens = {
               access_token: hashParams.get('access_token'),
@@ -194,7 +194,7 @@ const authorizeUserInWindow = ({ authorizeUrl, callbackUrl, session, additionalH
               state: hashParams.get('state'),
               scope: hashParams.get('scope')
             };
-            
+
             return resolve({ implicitTokens, debugInfo });
           } else {
             // Default case - authorization code flow
diff --git a/packages/bruno-electron/src/ipc/network/axios-instance.js b/packages/bruno-electron/src/ipc/network/axios-instance.js
index 651e891da..7c59622e1 100644
--- a/packages/bruno-electron/src/ipc/network/axios-instance.js
+++ b/packages/bruno-electron/src/ipc/network/axios-instance.js
@@ -2,7 +2,7 @@ const URL = require('url');
 const Socket = require('net').Socket;
 const axios = require('axios');
 const connectionCache = new Map(); // Cache to store checkConnection() results
-const electronApp = require("electron");
+const electronApp = require('electron');
 const { setupProxyAgents } = require('../../utils/proxy-util');
 const { addCookieToJar, getCookieStringForUrl } = require('../../utils/cookies');
 const { preferencesUtil } = require('../../store/preferences');
@@ -12,7 +12,7 @@ const { createFormData } = require('../../utils/form-data');
 const LOCAL_IPV6 = '::1';
 const LOCAL_IPV4 = '127.0.0.1';
 const LOCALHOST = 'localhost';
-const version = electronApp?.app?.getVersion() ?? "";
+const version = electronApp?.app?.getVersion() ?? '';
 const redirectResponseCodes = [301, 302, 303, 307, 308];
 
 const saveCookies = (url, headers) => {
@@ -29,7 +29,7 @@ const saveCookies = (url, headers) => {
       }
     }
   }
-}
+};
 
 const getTld = (hostname) => {
   if (!hostname) {
@@ -71,11 +71,11 @@ const checkConnection = (host, port) =>
  * @see https://github.com/axios/axios/issues/695
  * @returns {axios.AxiosInstance}
  */
-function makeAxiosInstance({ 
-  proxyMode = 'off', 
-  proxyConfig = {}, 
-  requestMaxRedirects = 5, 
-  httpsAgentRequestFields = {}, 
+function makeAxiosInstance({
+  proxyMode = 'off',
+  proxyConfig = {},
+  requestMaxRedirects = 5,
+  httpsAgentRequestFields = {},
   interpolationOptions = {}
 } = {}) {
   /** @type {axios.AxiosInstance} */
@@ -95,7 +95,7 @@ function makeAxiosInstance({
     proxy: false,
     maxRedirects: 0,
     headers: {
-      "User-Agent": `bruno-runtime/${version}`
+      'User-Agent': `bruno-runtime/${version}`
     }
   });
 
@@ -112,19 +112,19 @@ function makeAxiosInstance({
     timeline.push({
       timestamp: new Date(),
       type: 'info',
-      message: `Preparing request to ${config.url}`,
+      message: `Preparing request to ${config.url}`
     });
     timeline.push({
       timestamp: new Date(),
       type: 'info',
-      message: `Current time is ${new Date().toISOString()}`,
+      message: `Current time is ${new Date().toISOString()}`
     });
-  
+
     // Add request method and headers
     timeline.push({
       timestamp: new Date(),
       type: 'request',
-      message: `${config.method.toUpperCase()} ${config.url}`,
+      message: `${config.method.toUpperCase()} ${config.url}`
     });
 
     Object.entries(config.headers).forEach(([key, value]) => {
@@ -139,17 +139,17 @@ function makeAxiosInstance({
       timeline.push({
         timestamp: new Date(),
         type: 'requestHeader',
-        message: `${key}: ${value}`,
+        message: `${key}: ${value}`
       });
     });
-  
+
     // Add request data if available
     if (config.data) {
       let requestData = typeof config.data === 'string' ? config.data : JSON.stringify(config.data, null, 2);
       timeline.push({
         timestamp: new Date(),
         type: 'requestData',
-        message: requestData,
+        message: requestData
       });
     }
 
@@ -171,7 +171,7 @@ function makeAxiosInstance({
 
     const agentOptions = {
       ...httpsAgentRequestFields,
-      keepAlive: true,
+      keepAlive: true
     };
 
     try {
@@ -182,24 +182,23 @@ function makeAxiosInstance({
         proxyConfig: proxyConfig,
         httpsAgentRequestFields: agentOptions,
         interpolationOptions: interpolationOptions, // Provide your interpolation options
-        timeline,
+        timeline
       });
-    }
-    catch(err) {
+    } catch (err) {
       if (err.timeline) {
         timeline = err.timeline;
       }
       timeline.push({
         timestamp: new Date(),
         type: 'error',
-        message: `Error setting up proxy agents: ${err?.message}`,
+        message: `Error setting up proxy agents: ${err?.message}`
       });
     }
     config.metadata.timeline = timeline;
     return config;
   });
 
-  let redirectCount = 0
+  let redirectCount = 0;
 
   instance.interceptors.response.use(
     (response) => {
@@ -210,7 +209,7 @@ function makeAxiosInstance({
       redirectCount = 0;
 
       const config = response.config;
-      timeline = config?.metadata?.timeline || []
+      timeline = config?.metadata?.timeline || [];
       const duration = end - config?.metadata.startTime;
 
       const httpVersion = response?.request?.res?.httpVersion || response?.httpVersion;
@@ -218,27 +217,27 @@ function makeAxiosInstance({
         timeline.push({
           timestamp: new Date(),
           type: 'info',
-          message: `Using HTTP/2, server supports multiplexing`,
+          message: `Using HTTP/2, server supports multiplexing`
         });
       }
       timeline.push({
         timestamp: new Date(),
         type: 'response',
-        message: `HTTP/${httpVersion || '1.1'} ${response.status} ${response.statusText}`,
+        message: `HTTP/${httpVersion || '1.1'} ${response.status} ${response.statusText}`
       });
 
       Object.entries(response.headers).forEach(([key, value]) => {
         timeline.push({
           timestamp: new Date(),
           type: 'responseHeader',
-          message: `${key}: ${value}`,
+          message: `${key}: ${value}`
         });
       });
 
       timeline.push({
         timestamp: new Date(),
         type: 'info',
-        message: `Request completed in ${duration} ms`,
+        message: `Request completed in ${duration} ms`
       });
       response.timeline = timeline;
       return response;
@@ -260,19 +259,19 @@ function makeAxiosInstance({
           timeline.push({
             timestamp: new Date(),
             type: 'response',
-            message: `HTTP/${error.response.httpVersion || '1.1'} ${error.response.status} ${error.response.statusText}`,
+            message: `HTTP/${error.response.httpVersion || '1.1'} ${error.response.status} ${error.response.statusText}`
           });
           Object.entries(error.response.headers).forEach(([key, value]) => {
             timeline.push({
               timestamp: new Date(),
               type: 'responseHeader',
-              message: `${key}: ${value}`,
+              message: `${key}: ${value}`
             });
           });
           timeline.push({
             timestamp: new Date(),
             type: 'info',
-            message: `Request completed in ${duration} ms`,
+            message: `Request completed in ${duration} ms`
           });
 
           // Attach the timeline to the response
@@ -298,11 +297,11 @@ function makeAxiosInstance({
           if (locationHeader && !locationHeader.match(/^https?:\/\//i)) {
             // It's a relative URL, resolve it against the original URL
             redirectUrl = URL.resolve(error.config.url, locationHeader);
-            
+
             timeline.push({
               timestamp: new Date(),
               type: 'info',
-              message: `Resolving relative redirect URL: ${locationHeader} → ${redirectUrl}`,
+              message: `Resolving relative redirect URL: ${locationHeader} → ${redirectUrl}`
             });
           }
 
@@ -315,8 +314,8 @@ function makeAxiosInstance({
             ...error.config,
             url: redirectUrl,
             headers: {
-              ...error.config.headers,
-            },
+              ...error.config.headers
+            }
           };
 
           // Apply proper HTTP redirect behavior based on status code
@@ -325,39 +324,38 @@ function makeAxiosInstance({
 
           // For 301, 302, 303: change method to GET unless it was HEAD
           if ([301, 302, 303].includes(statusCode) && originalMethod !== 'head') {
-              requestConfig.method = 'get';
-              requestConfig.data = undefined;
-              delete requestConfig.headers['content-length'];
-              delete requestConfig.headers['Content-Length'];
-              
-              delete requestConfig.headers['content-type']; 
-              delete requestConfig.headers['Content-Type'];
-              
-              timeline.push({
-                timestamp: new Date(),
-                type: 'info',
-                message: `Changed method from ${originalMethod.toUpperCase()} to GET for ${statusCode} redirect and removed request body`,
-              });
+            requestConfig.method = 'get';
+            requestConfig.data = undefined;
+            delete requestConfig.headers['content-length'];
+            delete requestConfig.headers['Content-Length'];
+
+            delete requestConfig.headers['content-type'];
+            delete requestConfig.headers['Content-Type'];
+
+            timeline.push({
+              timestamp: new Date(),
+              type: 'info',
+              message: `Changed method from ${originalMethod.toUpperCase()} to GET for ${statusCode} redirect and removed request body`
+            });
           } else {
             // For 307, 308 and other status codes: preserve method and body
-            if (requestConfig.data && typeof requestConfig.data === 'object' && 
-                requestConfig.data.constructor && requestConfig.data.constructor.name === 'FormData') {
-              
+            if (requestConfig.data && typeof requestConfig.data === 'object'
+              && requestConfig.data.constructor && requestConfig.data.constructor.name === 'FormData') {
               const formData = requestConfig.data;
               if (formData._released || (formData._streams && formData._streams.length === 0)) {
                 if (error.config._originalMultipartData && error.config.collectionPath) {
                   timeline.push({
                     timestamp: new Date(),
                     type: 'info',
-                    message: `Recreating consumed FormData for ${statusCode} redirect`,
+                    message: `Recreating consumed FormData for ${statusCode} redirect`
                   });
 
                   const recreatedForm = createFormData(error.config._originalMultipartData, error.config.collectionPath);
                   requestConfig.data = recreatedForm;
-                  
+
                   const formHeaders = recreatedForm.getHeaders();
                   Object.assign(requestConfig.headers, formHeaders);
-                  
+
                   // preserve the original data for potential future redirects
                   requestConfig._originalMultipartData = error.config._originalMultipartData;
                   requestConfig.collectionPath = error.config.collectionPath;
@@ -365,7 +363,7 @@ function makeAxiosInstance({
                   timeline.push({
                     timestamp: new Date(),
                     type: 'info',
-                    message: `FormData consumed but no original data available for ${statusCode} redirect`,
+                    message: `FormData consumed but no original data available for ${statusCode} redirect`
                   });
                 }
               } else {
@@ -382,7 +380,7 @@ function makeAxiosInstance({
             }
           }
 
-          try { 
+          try {
             setupProxyAgents({
               requestConfig,
               proxyMode,
@@ -391,34 +389,32 @@ function makeAxiosInstance({
               interpolationOptions,
               timeline
             });
-          }
-          catch(err) {
+          } catch (err) {
             if (err.timeline) {
               timeline = err.timeline;
             }
             timeline.push({
               timestamp: new Date(),
               type: 'error',
-              message: `Error setting up proxy agents: ${err?.message}`,
+              message: `Error setting up proxy agents: ${err?.message}`
             });
           }
 
           requestConfig.metadata.timeline = timeline;
           // Make the redirected request
           return instance(requestConfig);
-        }
-        else {
+        } else {
           const errorResponseData = error.response.data;
           timeline.push({
             timestamp: new Date(),
             type: 'response',
-            message: `HTTP/${error.response.httpVersion || '1.1'} ${error.response.status} ${error.response.statusText}`,
+            message: `HTTP/${error.response.httpVersion || '1.1'} ${error.response.status} ${error.response.statusText}`
           });
           Object.entries(error?.response?.headers || {}).forEach(([key, value]) => {
             timeline.push({
               timestamp: new Date(),
               type: 'responseHeader',
-              message: `${key}: ${value}`,
+              message: `${key}: ${value}`
             });
           });
           timeline?.push({
@@ -439,13 +435,12 @@ function makeAxiosInstance({
           error.response.timeline = timeline;
           return Promise.reject(error);
         }
-      }
-      else if (error?.code) {
+      } else if (error?.code) {
         Object.entries(error?.response?.headers || {}).forEach(([key, value]) => {
           timeline.push({
             timestamp: new Date(),
             type: 'responseHeader',
-            message: `${key}: ${value}`,
+            message: `${key}: ${value}`
           });
         });
         timeline?.push({
diff --git a/packages/bruno-electron/src/ipc/network/cert-utils.js b/packages/bruno-electron/src/ipc/network/cert-utils.js
index b55754b7b..61038334c 100644
--- a/packages/bruno-electron/src/ipc/network/cert-utils.js
+++ b/packages/bruno-electron/src/ipc/network/cert-utils.js
@@ -30,8 +30,8 @@ const getCertsAndProxyConfig = async ({
 
   let caCertFilePath = preferencesUtil.shouldUseCustomCaCertificate() && preferencesUtil.getCustomCaCertificateFilePath();
   let caCertificatesData = getCACertificates({
-    caCertFilePath, 
-    shouldKeepDefaultCerts: preferencesUtil.shouldKeepDefaultCaCertificates() 
+    caCertFilePath,
+    shouldKeepDefaultCerts: preferencesUtil.shouldKeepDefaultCaCertificates()
   });
 
   let caCertificates = caCertificatesData.caCertificates;
@@ -41,11 +41,13 @@ const getCertsAndProxyConfig = async ({
   httpsAgentRequestFields['caCertificatesCount'] = caCertificatesCount;
   httpsAgentRequestFields['ca'] = caCertificates || [];
 
+  const { promptVariables } = collection;
   const brunoConfig = getBrunoConfig(collectionUid, collection);
   const interpolationOptions = {
     globalEnvironmentVariables,
     envVars,
     runtimeVariables,
+    promptVariables,
     processEnvVars
   };
 
@@ -90,14 +92,14 @@ const getCertsAndProxyConfig = async ({
 
   /**
    * Proxy configuration
-   * 
+   *
    * Preferences proxyMode has three possible values: on, off, system
    * Collection proxyMode has three possible values: true, false, global
-   * 
+   *
    * When collection proxyMode is true, it overrides the app-level proxy settings
    * When collection proxyMode is false, it ignores the app-level proxy settings
    * When collection proxyMode is global, it uses the app-level proxy settings
-   * 
+   *
    * Below logic calculates the proxyMode and proxyConfig to be used for the request
    */
   let proxyMode = 'off';
@@ -112,8 +114,8 @@ const getCertsAndProxyConfig = async ({
     proxyConfig = preferencesUtil.getGlobalProxyConfig();
     proxyMode = get(proxyConfig, 'mode', 'off');
   }
-  
-  return { proxyMode, proxyConfig, httpsAgentRequestFields, interpolationOptions };
-}
 
-module.exports = { getCertsAndProxyConfig }; 
\ No newline at end of file
+  return { proxyMode, proxyConfig, httpsAgentRequestFields, interpolationOptions };
+};
+
+module.exports = { getCertsAndProxyConfig };
diff --git a/packages/bruno-electron/src/ipc/network/grpc-event-handlers.js b/packages/bruno-electron/src/ipc/network/grpc-event-handlers.js
index 26ee77c47..5fc21ed0c 100644
--- a/packages/bruno-electron/src/ipc/network/grpc-event-handlers.js
+++ b/packages/bruno-electron/src/ipc/network/grpc-event-handlers.js
@@ -1,6 +1,6 @@
 // To implement grpc event handlers
 const { ipcMain, app } = require('electron');
-const { GrpcClient } = require("@usebruno/requests") 
+const { GrpcClient } = require('@usebruno/requests');
 const { safeParseJSON, safeStringifyJSON } = require('../../utils/common');
 const { cloneDeep, get } = require('lodash');
 const { preferencesUtil } = require('../../store/preferences');
@@ -16,7 +16,7 @@ let grpcClient;
  * Register IPC handlers for gRPC
  */
 const registerGrpcEventHandlers = (window) => {
-   const sendEvent = (eventName, ...args) => {
+  const sendEvent = (eventName, ...args) => {
     if (window && window.webContents) {
       window.webContents.send(eventName, ...args);
     } else {
@@ -25,17 +25,15 @@ const registerGrpcEventHandlers = (window) => {
   };
 
   grpcClient = new GrpcClient(sendEvent);
- 
+
   ipcMain.handle('connections-changed', (event) => {
     sendEvent('grpc:connections-changed', event);
   });
 
   // Start a new gRPC connection
   ipcMain.handle('grpc:start-connection', async (event, { request, collection, environment, runtimeVariables }) => {
-    
     try {
       const requestCopy = cloneDeep(request);
-    
 
       const preparedRequest = await prepareGrpcRequest(requestCopy, collection, environment, runtimeVariables, {});
 
@@ -50,11 +48,10 @@ const registerGrpcEventHandlers = (window) => {
         collectionPath: collection.pathname,
         globalEnvironmentVariables: collection.globalEnvironmentVariables
       });
-   
 
       // Extract certificate information from the config
       const { httpsAgentRequestFields } = certsAndProxyConfig;
-      
+
       // Configure verify options
       const verifyOptions = {
         rejectUnauthorized: preferencesUtil.shouldVerifyTls()
@@ -68,17 +65,17 @@ const registerGrpcEventHandlers = (window) => {
       const pfx = httpsAgentRequestFields.pfx;
 
       const requestSent = {
-        type: "request",
+        type: 'request',
         url: preparedRequest.url,
         method: preparedRequest.method,
         methodType: preparedRequest.methodType,
         headers: preparedRequest.headers,
         body: preparedRequest.body,
         timestamp: Date.now()
-      }
+      };
       // Start gRPC connection with the processed request and certificates
       await grpcClient.startConnection({
-        request: preparedRequest, 
+        request: preparedRequest,
         collection,
         rootCertificate,
         privateKey,
@@ -89,7 +86,7 @@ const registerGrpcEventHandlers = (window) => {
       });
 
       sendEvent('grpc:request', preparedRequest.uid, collection.uid, requestSent);
-      
+
       // Send OAuth credentials update if available
       if (preparedRequest?.oauth2Credentials) {
         window.webContents.send('main:credentials-update', {
@@ -98,7 +95,7 @@ const registerGrpcEventHandlers = (window) => {
           collectionUid: collection.uid,
           credentialsId: preparedRequest.oauth2Credentials?.credentialsId,
           ...(preparedRequest.oauth2Credentials?.folderUid ? { folderUid: preparedRequest.oauth2Credentials.folderUid } : { itemUid: preparedRequest.uid }),
-          debugInfo: preparedRequest.oauth2Credentials.debugInfo,
+          debugInfo: preparedRequest.oauth2Credentials.debugInfo
         });
       }
 
@@ -171,7 +168,7 @@ const registerGrpcEventHandlers = (window) => {
     try {
       const requestCopy = cloneDeep(request);
       const preparedRequest = await prepareGrpcRequest(requestCopy, collection, environment, runtimeVariables);
-      
+
       // Get certificates and proxy configuration
       const certsAndProxyConfig = await getCertsAndProxyConfig({
         collectionUid: collection.uid,
@@ -186,7 +183,7 @@ const registerGrpcEventHandlers = (window) => {
 
       // Extract certificate information from the config
       const { httpsAgentRequestFields } = certsAndProxyConfig;
-      
+
       // Configure verify options
       const verifyOptions = {
         rejectUnauthorized: preferencesUtil.shouldVerifyTls()
@@ -199,7 +196,6 @@ const registerGrpcEventHandlers = (window) => {
       const passphrase = httpsAgentRequestFields.passphrase;
       const pfx = httpsAgentRequestFields.pfx;
 
-
       // Send OAuth credentials update if available
       if (preparedRequest?.oauth2Credentials) {
         window.webContents.send('main:credentials-update', {
@@ -208,24 +204,23 @@ const registerGrpcEventHandlers = (window) => {
           collectionUid: collection.uid,
           credentialsId: preparedRequest.oauth2Credentials?.credentialsId,
           ...(preparedRequest.oauth2Credentials?.folderUid ? { folderUid: preparedRequest.oauth2Credentials.folderUid } : { itemUid: preparedRequest.uid }),
-          debugInfo: preparedRequest.oauth2Credentials.debugInfo,
+          debugInfo: preparedRequest.oauth2Credentials.debugInfo
         });
       }
 
-
-      const methods = await grpcClient.loadMethodsFromReflection({ 
+      const methods = await grpcClient.loadMethodsFromReflection({
         request: preparedRequest,
         collectionUid: collection.uid,
-        rootCertificate, 
-        privateKey, 
-        certificateChain, 
+        rootCertificate,
+        privateKey,
+        certificateChain,
         passphrase,
         pfx,
         verifyOptions,
         sendEvent
       });
-      
-      return { success: true, methods: safeParseJSON(safeStringifyJSON(methods))};
+
+      return { success: true, methods: safeParseJSON(safeStringifyJSON(methods)) };
     } catch (error) {
       console.error('Error loading gRPC methods from reflection:', error);
       return { success: false, error: error.message };
@@ -236,7 +231,7 @@ const registerGrpcEventHandlers = (window) => {
   ipcMain.handle('grpc:load-methods-proto', async (event, { filePath, includeDirs }) => {
     try {
       const methods = await grpcClient.loadMethodsFromProtoFile(filePath, includeDirs);
-      return { success: true, methods: safeParseJSON(safeStringifyJSON(methods))};
+      return { success: true, methods: safeParseJSON(safeStringifyJSON(methods)) };
     } catch (error) {
       console.error('Error loading gRPC methods from proto file:', error);
       return { success: false, error: error.message };
@@ -252,24 +247,24 @@ const registerGrpcEventHandlers = (window) => {
         // Parse existing message if provided
         existingMessage: existingMessage ? safeParseJSON(existingMessage) : null
       });
-      
+
       if (!result.success) {
-        return { 
-          success: false, 
-          error: result.error || 'Failed to generate sample message' 
+        return {
+          success: false,
+          error: result.error || 'Failed to generate sample message'
         };
       }
-      
+
       // Convert the message to a JSON string for safe transfer through IPC
-      return { 
-        success: true, 
-        message: JSON.stringify(result.message, null, 2) 
+      return {
+        success: true,
+        message: JSON.stringify(result.message, null, 2)
       };
     } catch (error) {
       console.error('Error generating gRPC sample message:', error);
-      return { 
-        success: false, 
-        error: error.message || 'Failed to generate sample message' 
+      return {
+        success: false,
+        error: error.message || 'Failed to generate sample message'
       };
     }
   });
@@ -286,7 +281,7 @@ const registerGrpcEventHandlers = (window) => {
       };
       let caCertFilePath, certFilePath, keyFilePath;
 
-      if(preferencesUtil.shouldUseCustomCaCertificate()) {
+      if (preferencesUtil.shouldUseCustomCaCertificate()) {
         caCertFilePath = preferencesUtil.getCustomCaCertificateFilePath();
       }
 
@@ -333,11 +328,11 @@ if (app && typeof app.on === 'function') {
     if (grpcClient && typeof grpcClient.clearAllConnections === 'function') {
       try {
         grpcClient.clearAllConnections();
-    } catch (error) {
-      console.error('Error clearing gRPC connections:', error);
+      } catch (error) {
+        console.error('Error clearing gRPC connections:', error);
+      }
     }
-  }
-});
+  });
 }
 
-module.exports = registerGrpcEventHandlers
+module.exports = registerGrpcEventHandlers;
diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js
index 611182a27..030937b96 100644
--- a/packages/bruno-electron/src/ipc/network/index.js
+++ b/packages/bruno-electron/src/ipc/network/index.js
@@ -11,6 +11,7 @@ const { each, get, extend, cloneDeep, merge } = require('lodash');
 const { NtlmClient } = require('axios-ntlm');
 const { VarsRuntime, AssertRuntime, ScriptRuntime, TestRuntime } = require('@usebruno/js');
 const { encodeUrl } = require('@usebruno/common').utils;
+const { extractPromptVariables } = require('@usebruno/common').utils;
 const { interpolateString } = require('./interpolate-string');
 const { resolveAwsV4Credentials, addAwsV4Interceptor } = require('./awsv4auth-helper');
 const { addDigestInterceptor } = require('@usebruno/requests');
@@ -21,7 +22,7 @@ const { makeAxiosInstance } = require('./axios-instance');
 const { resolveInheritedSettings } = require('../../utils/collection');
 const { cancelTokens, saveCancelToken, deleteCancelToken } = require('../../utils/cancel-token');
 const { uuid, safeStringifyJSON, safeParseJSON, parseDataFromResponse, parseDataFromRequest } = require('../../utils/common');
-const { chooseFileToSave, writeBinaryFile, writeFile } = require('../../utils/filesystem');
+const { chooseFileToSave, writeFile, getCollectionFormat, hasRequestExtension } = require('../../utils/filesystem');
 const { addCookieToJar, getDomainsWithCookies, getCookieStringForUrl } = require('../../utils/cookies');
 const { createFormData } = require('../../utils/form-data');
 const { findItemInCollectionByPathname, sortFolder, getAllRequestsInFolderRecursively, getEnvVars, getTreePathFromCollectionToItem, mergeVars, sortByNameThenSequence } = require('../../utils/collection');
@@ -53,20 +54,48 @@ const saveCookies = (url, headers) => {
       }
     }
   }
-}
+};
 
 const getJsSandboxRuntime = (collection) => {
   const securityConfig = get(collection, 'securityConfig', {});
 
-  if (securityConfig.jsSandboxMode === 'safe') {
-    return 'quickjs';
-  }
-
-  if (preferencesUtil.isBetaFeatureEnabled('nodevm')) {
+  if (securityConfig.jsSandboxMode === 'developer') {
     return 'nodevm';
   }
 
-  return 'vm2';
+  // default runtime is `quickjs`
+  return 'quickjs';
+};
+
+const hasStreamHeaders = (headers) => {
+  const headerSplit = (headers.get('content-type') ?? '').split(';').map((d) => d.trim());
+  return headerSplit.indexOf('text/event-stream') > -1;
+};
+
+const promisifyStream = async (stream, abortController, closeOnFirst) => {
+  const chunks = [];
+
+  return new Promise((resolve, reject) => {
+    const doResolve = () => {
+      const fullBuffer = Buffer.concat(chunks);
+      resolve(fullBuffer.buffer.slice(fullBuffer.byteOffset, fullBuffer.byteOffset + fullBuffer.byteLength));
+    };
+
+    stream.on('data', (chunk) => {
+      chunks.push(chunk);
+
+      if (closeOnFirst) {
+        doResolve();
+
+        if (abortController) {
+          abortController.abort();
+        }
+      }
+    });
+
+    stream.on('close', doResolve);
+    stream.on('error', (err) => reject(err));
+  });
 };
 
 const configureRequest = async (
@@ -97,7 +126,7 @@ const configureRequest = async (
 
   // Get followRedirects setting, default to true for backward compatibility
   const followRedirects = request.settings?.followRedirects ?? true;
-  
+
   // Get maxRedirects from request settings, fallback to request.maxRedirects, then default to 5
   let requestMaxRedirects = request.settings?.maxRedirects ?? request.maxRedirects ?? 5;
 
@@ -113,6 +142,7 @@ const configureRequest = async (
 
   request.maxRedirects = 0;
 
+  const { promptVariables = {} } = collection;
   let { proxyMode, proxyConfig, httpsAgentRequestFields, interpolationOptions } = certsAndProxyConfig;
   let axiosInstance = makeAxiosInstance({
     proxyMode,
@@ -123,7 +153,7 @@ const configureRequest = async (
   });
 
   if (request.ntlmConfig) {
-    axiosInstance=NtlmClient(request.ntlmConfig,axiosInstance.defaults)
+    axiosInstance = NtlmClient(request.ntlmConfig, axiosInstance.defaults);
     delete request.ntlmConfig;
   }
 
@@ -133,67 +163,59 @@ const configureRequest = async (
     let credentials, credentialsId, oauth2Url, debugInfo;
     switch (grantType) {
       case 'authorization_code':
-        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars);
+        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars, promptVariables);
         ({ credentials, url: oauth2Url, credentialsId, debugInfo } = await getOAuth2TokenUsingAuthorizationCode({ request: requestCopy, collectionUid, certsAndProxyConfig }));
         request.oauth2Credentials = { credentials, url: oauth2Url, collectionUid, credentialsId, debugInfo, folderUid: request.oauth2Credentials?.folderUid };
         if (tokenPlacement == 'header' && credentials?.access_token) {
           request.headers['Authorization'] = `${tokenHeaderPrefix} ${credentials.access_token}`.trim();
-        }
-        else {
+        } else {
           try {
             const url = new URL(request.url);
             url?.searchParams?.set(tokenQueryKey, credentials?.access_token);
             request.url = url?.toString();
-          }
-          catch(error) {}
+          } catch (error) {}
         }
         break;
       case 'implicit':
-        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars);
+        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars, promptVariables);
         ({ credentials, url: oauth2Url, credentialsId, debugInfo } = await getOAuth2TokenUsingImplicitGrant({ request: requestCopy, collectionUid }));
         request.oauth2Credentials = { credentials, url: oauth2Url, collectionUid, credentialsId, debugInfo, folderUid: request.oauth2Credentials?.folderUid };
         if (tokenPlacement == 'header') {
           request.headers['Authorization'] = `${tokenHeaderPrefix} ${credentials?.access_token}`;
-        }
-        else {
+        } else {
           try {
             const url = new URL(request.url);
             url?.searchParams?.set(tokenQueryKey, credentials?.access_token);
             request.url = url?.toString();
-          }
-          catch(error) {}
+          } catch (error) {}
         }
         break;
       case 'client_credentials':
-        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars);
+        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars, promptVariables);
         ({ credentials, url: oauth2Url, credentialsId, debugInfo } = await getOAuth2TokenUsingClientCredentials({ request: requestCopy, collectionUid, certsAndProxyConfig }));
         request.oauth2Credentials = { credentials, url: oauth2Url, collectionUid, credentialsId, debugInfo, folderUid: request.oauth2Credentials?.folderUid };
         if (tokenPlacement == 'header' && credentials?.access_token) {
           request.headers['Authorization'] = `${tokenHeaderPrefix} ${credentials.access_token}`.trim();
-        }
-        else {
+        } else {
           try {
             const url = new URL(request.url);
             url?.searchParams?.set(tokenQueryKey, credentials?.access_token);
             request.url = url?.toString();
-          }
-          catch(error) {}
+          } catch (error) {}
         }
         break;
       case 'password':
-        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars);
+        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars, promptVariables);
         ({ credentials, url: oauth2Url, credentialsId, debugInfo } = await getOAuth2TokenUsingPasswordCredentials({ request: requestCopy, collectionUid, certsAndProxyConfig }));
         request.oauth2Credentials = { credentials, url: oauth2Url, collectionUid, credentialsId, debugInfo, folderUid: request.oauth2Credentials?.folderUid };
         if (tokenPlacement == 'header' && credentials?.access_token) {
           request.headers['Authorization'] = `${tokenHeaderPrefix} ${credentials.access_token}`.trim();
-        }
-        else {
+        } else {
           try {
             const url = new URL(request.url);
             url?.searchParams?.set(tokenQueryKey, credentials?.access_token);
             request.url = url?.toString();
-          }
-          catch(error) {}
+          } catch (error) {}
         }
         break;
     }
@@ -218,28 +240,28 @@ const configureRequest = async (
     const cookieString = getCookieStringForUrl(request.url);
     if (cookieString && typeof cookieString === 'string' && cookieString.length) {
       const existingCookieHeaderName = Object.keys(request.headers).find(
-          name => name.toLowerCase() === 'cookie'
+        (name) => name.toLowerCase() === 'cookie'
       );
       const existingCookieString = existingCookieHeaderName ? request.headers[existingCookieHeaderName] : '';
-  
+
       // Helper function to parse cookies into an object
       const parseCookies = (str) => str.split(';').reduce((cookies, cookie) => {
-          const [name, ...rest] = cookie.split('=');
-          if (name && name.trim()) {
-              cookies[name.trim()] = rest.join('=').trim();
-          }
-          return cookies;
+        const [name, ...rest] = cookie.split('=');
+        if (name && name.trim()) {
+          cookies[name.trim()] = rest.join('=').trim();
+        }
+        return cookies;
       }, {});
-  
+
       const mergedCookies = {
-          ...parseCookies(existingCookieString),
-          ...parseCookies(cookieString),
+        ...parseCookies(existingCookieString),
+        ...parseCookies(cookieString)
       };
-  
+
       const combinedCookieString = Object.entries(mergedCookies)
-          .map(([name, value]) => `${name}=${value}`)
-          .join('; ');
-  
+        .map(([name, value]) => `${name}=${value}`)
+        .join('; ');
+
       request.headers[existingCookieHeaderName || 'Cookie'] = combinedCookieString;
     }
   }
@@ -358,10 +380,10 @@ const registerNetworkIpc = (mainWindow) => {
   };
 
   const notifyScriptExecution = ({
-    channel,           // 'main:run-request-event' | 'main:run-folder-event'
-    basePayload,       // request-level or runner-level identifiers
-    scriptType,        // 'pre-request' | 'post-response' | 'test'
-    error              // optional Error
+    channel, // 'main:run-request-event' | 'main:run-folder-event'
+    basePayload, // request-level or runner-level identifiers
+    scriptType, // 'pre-request' | 'post-response' | 'test'
+    error // optional Error
   }) => {
     mainWindow.webContents.send(channel, {
       type: `${scriptType}-script-execution`,
@@ -384,7 +406,8 @@ const registerNetworkIpc = (mainWindow) => {
   ) => {
     // run pre-request script
     let scriptResult;
-    const collectionName = collection?.name
+    const { promptVariables = {}, name: collectionName } = collection;
+
     const requestScript = get(request, 'script.req');
     if (requestScript?.length) {
       const scriptRuntime = new ScriptRuntime({ runtime: scriptingConfig?.runtime });
@@ -425,7 +448,7 @@ const registerNetworkIpc = (mainWindow) => {
     }
 
     // interpolate variables inside request
-    interpolateVars(request, envVars, runtimeVariables, processEnvVars);
+    interpolateVars(request, envVars, runtimeVariables, processEnvVars, promptVariables);
 
     if (request.settings?.encodeUrl) {
       request.url = encodeUrl(request.url);
@@ -475,52 +498,10 @@ const registerNetworkIpc = (mainWindow) => {
     scriptingConfig,
     runRequestByItemPathname
   ) => {
-    // run post-response vars
-    const postResponseVars = get(request, 'vars.res', []);
-    if (postResponseVars?.length) {
-      const varsRuntime = new VarsRuntime({ runtime: scriptingConfig?.runtime });
-      const result = varsRuntime.runPostResponseVars(
-        postResponseVars,
-        request,
-        response,
-        envVars,
-        runtimeVariables,
-        collectionPath,
-        processEnvVars
-      );
-
-      if (result) {
-        mainWindow.webContents.send('main:script-environment-update', {
-          envVariables: result.envVariables,
-          runtimeVariables: result.runtimeVariables,
-          persistentEnvVariables: result.persistentEnvVariables,
-          requestUid,
-          collectionUid
-        });
-
-        mainWindow.webContents.send('main:persistent-env-variables-update', {
-          persistentEnvVariables: result.persistentEnvVariables,
-          collectionUid
-        });
-
-        mainWindow.webContents.send('main:global-environment-variables-update', {
-          globalEnvironmentVariables: result.globalEnvironmentVariables
-        });
-
-        collection.globalEnvironmentVariables = result.globalEnvironmentVariables;
-      }
-
-      if (result?.error) {
-        mainWindow.webContents.send('main:display-error', result.error);
-      }
-
-      collection.globalEnvironmentVariables = result.globalEnvironmentVariables;
-    }
-
     // run post-response script
     const responseScript = get(request, 'script.res');
     let scriptResult;
-    const collectionName = collection?.name
+    const collectionName = collection?.name;
     if (responseScript?.length) {
       const scriptRuntime = new ScriptRuntime({ runtime: scriptingConfig?.runtime });
       scriptResult = await scriptRuntime.runResponseScript(
@@ -571,18 +552,19 @@ const registerNetworkIpc = (mainWindow) => {
 
     const runRequestByItemPathname = async (relativeItemPathname) => {
       return new Promise(async (resolve, reject) => {
-        let itemPathname = path.join(collection?.pathname, relativeItemPathname);
-        if (itemPathname && !itemPathname?.endsWith('.bru')) {
-          itemPathname = `${itemPathname}.bru`;
+        const format = getCollectionFormat(collection.pathname);
+        let itemPathname = path.join(collection.pathname, relativeItemPathname);
+        if (itemPathname && !hasRequestExtension(itemPathname, format)) {
+          itemPathname = `${itemPathname}.${format}`;
         }
         const _item = cloneDeep(findItemInCollectionByPathname(collection, itemPathname));
-        if(_item) {
+        if (_item) {
           const res = await runRequest({ item: _item, collection, envVars, processEnvVars, runtimeVariables, runInBackground: true });
           resolve(res);
         }
         reject(`bru.runRequest: invalid request path - ${itemPathname}`);
       });
-    }
+    };
 
     !runInBackground && mainWindow.webContents.send('main:run-request-event', {
       type: 'request-queued',
@@ -595,6 +577,10 @@ const registerNetworkIpc = (mainWindow) => {
     const abortController = new AbortController();
     const request = await prepareRequest(item, collection, abortController);
     request.__bruno__executionMode = 'standalone';
+    request.responseType = 'stream';
+    // flag to see if the stream needs to be handled as an actual stream or
+    // is it just a data stream from axios
+    let isResponseStream = false;
     const brunoConfig = getBrunoConfig(collectionUid, collection);
     const scriptingConfig = get(brunoConfig, 'scripts', {});
     scriptingConfig.runtime = getJsSandboxRuntime(collection);
@@ -668,8 +654,9 @@ const registerNetworkIpc = (mainWindow) => {
         method: request.method,
         headers: headersSent,
         data: requestData,
-        dataBuffer: requestDataBuffer
-      }
+        dataBuffer: requestDataBuffer,
+        timestamp: Date.now()
+      };
 
       !runInBackground && mainWindow.webContents.send('main:run-request-event', {
         type: 'request-sent',
@@ -687,14 +674,19 @@ const registerNetworkIpc = (mainWindow) => {
           collectionUid,
           credentialsId: request?.oauth2Credentials?.credentialsId,
           ...(request?.oauth2Credentials?.folderUid ? { folderUid: request.oauth2Credentials.folderUid } : { itemUid: item.uid }),
-          debugInfo: request?.oauth2Credentials?.debugInfo,
+          debugInfo: request?.oauth2Credentials?.debugInfo
         });
       }
 
-      let response, responseTime;
+      let response, responseTime, axiosDataStream;
       try {
         /** @type {import('axios').AxiosResponse} */
         response = await axiosInstance(request);
+        isResponseStream = hasStreamHeaders(response.headers);
+
+        if (!isResponseStream) {
+          response.data = await promisifyStream(response.data);
+        }
 
         // Prevents the duration on leaking to the actual result
         responseTime = response.headers.get('request-duration');
@@ -719,6 +711,10 @@ const registerNetworkIpc = (mainWindow) => {
           // Prevents the duration on leaking to the actual result
           responseTime = response.headers.get('request-duration');
           response.headers.delete('request-duration');
+          isResponseStream = hasStreamHeaders(response.headers);
+          if (!isResponseStream) {
+            response.data = await promisifyStream(response.data);
+          }
         } else {
           await executeRequestOnFailHandler(request, error);
 
@@ -729,13 +725,18 @@ const registerNetworkIpc = (mainWindow) => {
             statusText: error.statusText,
             error: error.message || ERROR_OCCURRED_WHILE_EXECUTING_REQUEST,
             timeline: error.timeline
-          }
+          };
         }
       }
 
       // Continue with the rest of the request lifecycle - post response vars, script, assertions, tests
+      if (isResponseStream) {
+        axiosDataStream = response.data;
+      }
 
-      const { data, dataBuffer } = parseDataFromResponse(response, request.__brunoDisableParsingResponseJson);
+      const { data, dataBuffer } = isResponseStream
+        ? { data: '', dataBuffer: Buffer.alloc(0) }
+        : parseDataFromResponse(response, request.__brunoDisableParsingResponseJson);
       response.data = data;
       response.dataBuffer = dataBuffer;
 
@@ -752,140 +753,141 @@ const registerNetworkIpc = (mainWindow) => {
       mainWindow.webContents.send('main:cookies-update', safeParseJSON(safeStringifyJSON(domainsWithCookies)));
       cookiesStore.saveCookieJar();
 
-      let postResponseScriptResult = null;
-      let postResponseError = null;
-      try {
-        postResponseScriptResult = await runPostResponse(
-          request,
-          response,
-          requestUid,
-          envVars,
-          collectionPath,
-          collection,
-          collectionUid,
-          runtimeVariables,
-          processEnvVars,
-          scriptingConfig,
-          runRequestByItemPathname
-        );
-      } catch (error) {
-        console.error('Post-response script error:', error);
-        postResponseError = error;
-      }
-      
-      if (postResponseScriptResult?.results) {
-        mainWindow.webContents.send('main:run-request-event', {
-          type: 'test-results-post-response',
-          results: postResponseScriptResult.results,
-          itemUid: item.uid,
-          requestUid,
-          collectionUid
-        });
-      }
-
-      !runInBackground && notifyScriptExecution({
-        channel: 'main:run-request-event',
-        basePayload: { requestUid, collectionUid, itemUid: item.uid },
-        scriptType: 'post-response',
-        error: postResponseError
-      });
-
-      // run assertions
-      const assertions = get(request, 'assertions');
-      if (assertions) {
-        const assertRuntime = new AssertRuntime({ runtime: scriptingConfig?.runtime });
-        const results = assertRuntime.runAssertions(
-          assertions,
-          request,
-          response,
-          envVars,
-          runtimeVariables,
-          processEnvVars
-        );
-
-        !runInBackground && mainWindow.webContents.send('main:run-request-event', {
-          type: 'assertion-results',
-          results: results,
-          itemUid: item.uid,
-          requestUid,
-          collectionUid
-        });
-      }
-
-      const testFile = get(request, 'tests');
-      const collectionName = collection?.name
-      if (typeof testFile === 'string') {
-        const testRuntime = new TestRuntime({ runtime: scriptingConfig?.runtime });
-        let testResults = null;
-        let testError = null;
-
+      const runPostScripts = async () => {
+        let postResponseScriptResult = null;
+        let postResponseError = null;
         try {
-          testResults = await testRuntime.runTests(
-            decomment(testFile),
-            request,
+          postResponseScriptResult = await runPostResponse(request,
             response,
+            requestUid,
             envVars,
-            runtimeVariables,
             collectionPath,
-            onConsoleLog,
+            collection,
+            collectionUid,
+            runtimeVariables,
             processEnvVars,
             scriptingConfig,
-            runRequestByItemPathname,
-            collectionName
-          );
+            runRequestByItemPathname);
         } catch (error) {
-          testError = error;
-          
-          if (error.partialResults) {
-            testResults = error.partialResults;
-          } else {
-            testResults = {
-              request,
-              envVariables: envVars,
-              runtimeVariables,
-              globalEnvironmentVariables: request?.globalEnvironmentVariables || {},
-              results: [],
-              nextRequestName: null
-            };
-          }
+          console.error('Post-response script error:', error);
+          postResponseError = error;
         }
 
-        !runInBackground && mainWindow.webContents.send('main:run-request-event', {
-          type: 'test-results',
-          results: testResults.results,
-          itemUid: item.uid,
-          requestUid,
-          collectionUid
-        });
-
-        mainWindow.webContents.send('main:script-environment-update', {
-          envVariables: testResults.envVariables,
-          runtimeVariables: testResults.runtimeVariables,
-          requestUid,
-          collectionUid
-        });
-
-        mainWindow.webContents.send('main:persistent-env-variables-update', {
-          persistentEnvVariables: testResults.persistentEnvVariables,
-          collectionUid
-        });
-
-        mainWindow.webContents.send('main:global-environment-variables-update', {
-          globalEnvironmentVariables: testResults.globalEnvironmentVariables
-        });
-
-        collection.globalEnvironmentVariables = testResults.globalEnvironmentVariables;
+        if (postResponseScriptResult?.results) {
+          mainWindow.webContents.send('main:run-request-event', {
+            type: 'test-results-post-response',
+            results: postResponseScriptResult.results,
+            itemUid: item.uid,
+            requestUid,
+            collectionUid
+          });
+        }
 
         !runInBackground && notifyScriptExecution({
           channel: 'main:run-request-event',
           basePayload: { requestUid, collectionUid, itemUid: item.uid },
-          scriptType: 'test',
-          error: testError
+          scriptType: 'post-response',
+          error: postResponseError
         });
 
-        const domainsWithCookiesTest = await getDomainsWithCookies();
-        mainWindow.webContents.send('main:cookies-update', safeParseJSON(safeStringifyJSON(domainsWithCookiesTest)));
-        cookiesStore.saveCookieJar();
+        // run assertions
+        const assertions = get(request, 'assertions');
+        if (assertions) {
+          const assertRuntime = new AssertRuntime({ runtime: scriptingConfig?.runtime });
+          const results = assertRuntime.runAssertions(assertions,
+            request,
+            response,
+            envVars,
+            runtimeVariables,
+            processEnvVars);
+
+          !runInBackground && mainWindow.webContents.send('main:run-request-event', {
+            type: 'assertion-results',
+            results: results,
+            itemUid: item.uid,
+            requestUid,
+            collectionUid
+          });
+        }
+
+        const testFile = get(request, 'tests');
+        const collectionName = collection?.name;
+        if (typeof testFile === 'string') {
+          const testRuntime = new TestRuntime({ runtime: scriptingConfig?.runtime });
+          let testResults = null;
+          let testError = null;
+
+          try {
+            testResults = await testRuntime.runTests(decomment(testFile),
+              request,
+              response,
+              envVars,
+              runtimeVariables,
+              collectionPath,
+              onConsoleLog,
+              processEnvVars,
+              scriptingConfig,
+              runRequestByItemPathname,
+              collectionName);
+          } catch (error) {
+            testError = error;
+
+            if (error.partialResults) {
+              testResults = error.partialResults;
+            } else {
+              testResults = {
+                request,
+                envVariables: envVars,
+                runtimeVariables,
+                globalEnvironmentVariables: request?.globalEnvironmentVariables || {},
+                results: [],
+                nextRequestName: null
+              };
+            }
+          }
+
+          !runInBackground && mainWindow.webContents.send('main:run-request-event', {
+            type: 'test-results',
+            results: testResults.results,
+            itemUid: item.uid,
+            requestUid,
+            collectionUid
+          });
+
+          mainWindow.webContents.send('main:script-environment-update', {
+            envVariables: testResults.envVariables,
+            runtimeVariables: testResults.runtimeVariables,
+            requestUid,
+            collectionUid
+          });
+
+          mainWindow.webContents.send('main:persistent-env-variables-update', {
+            persistentEnvVariables: testResults.persistentEnvVariables,
+            collectionUid
+          });
+
+          mainWindow.webContents.send('main:global-environment-variables-update', {
+            globalEnvironmentVariables: testResults.globalEnvironmentVariables
+          });
+
+          collection.globalEnvironmentVariables = testResults.globalEnvironmentVariables;
+
+          !runInBackground && notifyScriptExecution({
+            channel: 'main:run-request-event',
+            basePayload: { requestUid, collectionUid, itemUid: item.uid },
+            scriptType: 'test',
+            error: testError
+          });
+
+          const domainsWithCookiesTest = await getDomainsWithCookies();
+          mainWindow.webContents.send('main:cookies-update', safeParseJSON(safeStringifyJSON(domainsWithCookiesTest)));
+          cookiesStore.saveCookieJar();
+        }
+      };
+      if (isResponseStream) {
+        axiosDataStream.on('close', () => runPostScripts().then());
+      } else {
+        await runPostScripts();
       }
 
       return {
@@ -894,6 +896,8 @@ const registerNetworkIpc = (mainWindow) => {
         headers: response.headers,
         data: response.data,
         dataBuffer: response.dataBuffer.toString('base64'),
+        stream: isResponseStream ? axiosDataStream : null,
+        cancelTokenUid: cancelTokenUid,
         size: Buffer.byteLength(response.dataBuffer),
         duration: responseTime ?? 0,
         url: response.request ? response.request.protocol + '//' + response.request.host + response.request.path : null,
@@ -910,14 +914,77 @@ const registerNetworkIpc = (mainWindow) => {
         timeline: error?.timeline
       };
     }
-  }
+  };
+
+  /**
+   * Extract prompt variables from a request
+   * Tries to respect the hierarchy of the variables and avoid unnecessary prompts as much as possible
+   * Note: TO BE CALLED ONLY AFTER THE PREPARE REQUEST
+   *
+   * @param {*} request - request object built by prepareRequest
+   * @returns {string[]} An array of extracted prompt variables
+   */
+  const extractPromptVariablesForRequest = async ({ request, collection, envVars: collectionEnvironmentVars, runtimeVariables, processEnvVars }) => {
+    const { globalEnvironmentVariables, collectionVariables, folderVariables, requestVariables, ...requestObj } = request;
+
+    const allVariables = {
+      ...globalEnvironmentVariables,
+      ...collectionEnvironmentVars,
+      ...collectionVariables,
+      ...folderVariables,
+      ...requestVariables,
+      ...runtimeVariables,
+      process: {
+        env: {
+          ...processEnvVars
+        }
+      }
+    };
+
+    const { interpolationOptions, ...certsAndProxyConfig } = await getCertsAndProxyConfig({
+      collectionUid: collection.uid,
+      collection,
+      request,
+      envVars: collectionEnvironmentVars,
+      runtimeVariables,
+      processEnvVars,
+      collectionPath: collection.pathname,
+      globalEnvironmentVariables
+    });
+
+    const prompts = extractPromptVariables(requestObj);
+    prompts.push(...extractPromptVariables(allVariables));
+    prompts.push(...extractPromptVariables(certsAndProxyConfig));
+
+    // return unique prompt variables
+    return Array.from(new Set(prompts));
+  };
 
   // handler for sending http request
   ipcMain.handle('send-http-request', async (event, item, collection, environment, runtimeVariables) => {
     const collectionUid = collection.uid;
     const envVars = getEnvVars(environment);
     const processEnvVars = getProcessEnvVars(collectionUid);
-    return await runRequest({ item, collection, envVars, processEnvVars, runtimeVariables, runInBackground: false });
+    const response = await runRequest({ item, collection, envVars, processEnvVars, runtimeVariables, runInBackground: false });
+    if (response.stream) {
+      const stream = response.stream;
+      response.stream = { running: response.status >= 200 && response.status < 300 };
+
+      stream.on('data', (newData) => {
+        const parsed = parseDataFromResponse({ data: newData, headers: {} });
+        mainWindow.webContents.send('main:http-stream-new-data', { collectionUid, itemUid: item.uid, data: parsed });
+      });
+
+      stream.on('close', () => {
+        if (!cancelTokens[response.cancelTokenUid]) {
+          return;
+        }
+
+        mainWindow.webContents.send('main:http-stream-end', { collectionUid, itemUid: item.uid });
+        deleteCancelToken(response.cancelTokenUid);
+      });
+    }
+    return response;
   });
 
   ipcMain.handle('clear-oauth2-cache', async (event, uid, url, credentialsId) => {
@@ -935,8 +1002,9 @@ const registerNetworkIpc = (mainWindow) => {
   ipcMain.handle('cancel-http-request', async (event, cancelTokenUid) => {
     return new Promise((resolve, reject) => {
       if (cancelTokenUid && cancelTokens[cancelTokenUid]) {
-        cancelTokens[cancelTokenUid].abort();
+        const abortController = cancelTokens[cancelTokenUid];
         deleteCancelToken(cancelTokenUid);
+        abortController.abort();
         resolve();
       } else {
         reject(new Error('cancel token not found'));
@@ -945,7 +1013,7 @@ const registerNetworkIpc = (mainWindow) => {
   });
 
   // handler for fetch-gql-schema
-  ipcMain.handle('fetch-gql-schema', fetchGqlSchemaHandler)
+  ipcMain.handle('fetch-gql-schema', fetchGqlSchemaHandler);
 
   ipcMain.handle(
     'renderer:run-collection-folder',
@@ -960,24 +1028,32 @@ const registerNetworkIpc = (mainWindow) => {
       const envVars = getEnvVars(environment);
       const processEnvVars = getProcessEnvVars(collectionUid);
       let stopRunnerExecution = false;
+      let currentAbortController;
 
       const abortController = new AbortController();
       saveCancelToken(cancelTokenUid, abortController);
 
+      abortController.signal.addEventListener('abort', () => {
+        if (currentAbortController) {
+          currentAbortController.abort();
+        }
+      });
+
       const runRequestByItemPathname = async (relativeItemPathname) => {
         return new Promise(async (resolve, reject) => {
-          let itemPathname = path.join(collection?.pathname, relativeItemPathname);
-          if (itemPathname && !itemPathname?.endsWith('.bru')) {
-            itemPathname = `${itemPathname}.bru`;
+          const format = getCollectionFormat(collection.pathname);
+          let itemPathname = path.join(collection.pathname, relativeItemPathname);
+          if (itemPathname && !hasRequestExtension(itemPathname, format)) {
+            itemPathname = `${itemPathname}.${format}`;
           }
           const _item = cloneDeep(findItemInCollectionByPathname(collection, itemPathname));
-          if(_item) {
-            const res = await runRequest({ item: _item, collection, envVars, processEnvVars, runtimeVariables, runInBackground: true });                  
+          if (_item) {
+            const res = await runRequest({ item: _item, collection, envVars, processEnvVars, runtimeVariables, runInBackground: true });
             resolve(res);
           }
           reject(`bru.runRequest: invalid request path - ${itemPathname}`);
         });
-      }
+      };
 
       if (!folder) {
         folder = collection;
@@ -1004,9 +1080,8 @@ const registerNetworkIpc = (mainWindow) => {
             }
           });
 
-          
           // sort requests by seq property
-          folderRequests = sortByNameThenSequence(folderRequests)
+          folderRequests = sortByNameThenSequence(folderRequests);
         }
 
         // Filter requests based on tags
@@ -1015,7 +1090,7 @@ const registerNetworkIpc = (mainWindow) => {
           const excludeTags = tags.exclude ? tags.exclude : [];
           folderRequests = folderRequests.filter(({ tags: requestTags = [], draft }) => {
             requestTags = draft?.tags || requestTags || [];
-            return isRequestTagsIncluded(requestTags, includeTags, excludeTags)
+            return isRequestTagsIncluded(requestTags, includeTags, excludeTags);
           });
         }
 
@@ -1068,9 +1143,30 @@ const registerNetworkIpc = (mainWindow) => {
 
           const request = await prepareRequest(item, collection, abortController);
           request.__bruno__executionMode = 'runner';
-          
+
           const requestUid = uuid();
 
+          const promptVars = await extractPromptVariablesForRequest({ request, collection, envVars, runtimeVariables, processEnvVars });
+
+          if (promptVars.length > 0) {
+            mainWindow.webContents.send('main:run-folder-event', {
+              type: 'runner-request-skipped',
+              error: 'Request has been skipped due to containing prompt variables',
+              responseReceived: {
+                status: 'skipped',
+                statusText: `Prompt variables detected in request. Runner execution is not supported for requests with prompt variables. \n Promps: ${promptVars.join(', ')}`,
+                data: null,
+                responseTime: 0,
+                headers: null
+              },
+              ...eventData
+            });
+
+            currentRequestIndex++;
+
+            continue;
+          }
+
           try {
             let preRequestScriptResult;
             let preRequestError = null;
@@ -1154,8 +1250,9 @@ const registerNetworkIpc = (mainWindow) => {
               method: request.method,
               headers: headersSent,
               data: requestData,
-              dataBuffer: requestDataBuffer
-            }
+              dataBuffer: requestDataBuffer,
+              timestamp: Date.now()
+            };
 
             // todo:
             // i have no clue why electron can't send the request object
@@ -1166,7 +1263,9 @@ const registerNetworkIpc = (mainWindow) => {
               ...eventData
             });
 
-            request.signal = abortController.signal;
+            currentAbortController = new AbortController();
+            request.signal = currentAbortController.signal;
+            request.responseType = 'stream';
             const axiosInstance = await configureRequest(
               collectionUid,
               collection,
@@ -1185,7 +1284,7 @@ const registerNetworkIpc = (mainWindow) => {
                 collectionUid,
                 credentialsId: request?.oauth2Credentials?.credentialsId,
                 ...(request?.oauth2Credentials?.folderUid ? { folderUid: request.oauth2Credentials.folderUid } : { itemUid: item.uid }),
-                debugInfo: request?.oauth2Credentials?.debugInfo,
+                debugInfo: request?.oauth2Credentials?.debugInfo
               });
 
               collection.oauth2Credentials = updateCollectionOauth2Credentials({
@@ -1213,6 +1312,7 @@ const registerNetworkIpc = (mainWindow) => {
 
               /** @type {import('axios').AxiosResponse} */
               response = await axiosInstance(request);
+              response.data = await promisifyStream(response.data, currentAbortController, false);
               timeEnd = Date.now();
 
               const { data, dataBuffer } = parseDataFromResponse(response, request.__brunoDisableParsingResponseJson);
@@ -1254,6 +1354,7 @@ const registerNetworkIpc = (mainWindow) => {
               }
 
               if (error?.response) {
+                error.response.data = await promisifyStream(error.response.data, currentAbortController, true);
                 const { data, dataBuffer } = parseDataFromResponse(error.response);
                 error.response.responseTime = error.response.headers.get('request-duration');
                 error.response.headers.delete('request-duration');
@@ -1270,7 +1371,7 @@ const registerNetworkIpc = (mainWindow) => {
                   size: Buffer.byteLength(dataBuffer),
                   data: error.response.data,
                   responseTime: error.response.responseTime,
-                  timeline: error.response.timeline,
+                  timeline: error.response.timeline
                 };
 
                 // if we get a response from the server, we consider it as a success
@@ -1358,7 +1459,7 @@ const registerNetworkIpc = (mainWindow) => {
             }
 
             const testFile = get(request, 'tests');
-            const collectionName = collection?.name
+            const collectionName = collection?.name;
             if (typeof testFile === 'string') {
               let testResults = null;
               let testError = null;
@@ -1380,7 +1481,7 @@ const registerNetworkIpc = (mainWindow) => {
                 );
               } catch (error) {
                 testError = error;
-                
+
                 if (error.partialResults) {
                   testResults = error.partialResults;
                 } else {
@@ -1414,7 +1515,7 @@ const registerNetworkIpc = (mainWindow) => {
               mainWindow.webContents.send('main:global-environment-variables-update', {
                 globalEnvironmentVariables: testResults.globalEnvironmentVariables
               });
-              
+
               collection.globalEnvironmentVariables = testResults.globalEnvironmentVariables;
 
               notifyScriptExecution({
@@ -1443,7 +1544,7 @@ const registerNetworkIpc = (mainWindow) => {
               collectionUid,
               folderUid,
               statusText: 'collection run was terminated!',
-              runCompletionTime: new Date().toISOString(),
+              runCompletionTime: new Date().toISOString()
             });
             break;
           }
@@ -1460,7 +1561,7 @@ const registerNetworkIpc = (mainWindow) => {
             if (nextRequestIdx >= 0) {
               currentRequestIndex = nextRequestIdx;
             } else {
-              console.error("Could not find request with name '" + nextRequestName + "'");
+              console.error('Could not find request with name \'' + nextRequestName + '\'');
               currentRequestIndex++;
             }
           } else {
@@ -1473,10 +1574,10 @@ const registerNetworkIpc = (mainWindow) => {
           type: 'testrun-ended',
           collectionUid,
           folderUid,
-          runCompletionTime: new Date().toISOString(),
+          runCompletionTime: new Date().toISOString()
         });
       } catch (error) {
-        console.log("error", error);
+        console.log('error', error);
         deleteCancelToken(cancelTokenUid);
         mainWindow.webContents.send('main:run-folder-event', {
           type: 'testrun-ended',
@@ -1541,7 +1642,7 @@ const registerNetworkIpc = (mainWindow) => {
       const filePath = await chooseFileToSave(mainWindow, path.join(dirPath, fileName));
       if (filePath) {
         const encoding = getEncodingFormat();
-        const data = Buffer.from(response.dataBuffer, 'base64')
+        const data = Buffer.from(response.dataBuffer, 'base64');
         if (encoding === 'utf-8') {
           await writeFile(filePath, data);
         } else {
@@ -1573,14 +1674,13 @@ const executeRequestOnFailHandler = async (request, error) => {
   }
 };
 
-
 const registerAllNetworkIpc = (mainWindow) => {
   registerNetworkIpc(mainWindow);
   registerGrpcEventHandlers(mainWindow);
   registerWsEventHandlers(mainWindow);
-}
+};
 
-module.exports = registerAllNetworkIpc
+module.exports = registerAllNetworkIpc;
 module.exports.configureRequest = configureRequest;
 module.exports.getCertsAndProxyConfig = getCertsAndProxyConfig;
 module.exports.fetchGqlSchemaHandler = fetchGqlSchemaHandler;
diff --git a/packages/bruno-electron/src/ipc/network/interpolate-string.js b/packages/bruno-electron/src/ipc/network/interpolate-string.js
index 26bba8c42..0b19249ef 100644
--- a/packages/bruno-electron/src/ipc/network/interpolate-string.js
+++ b/packages/bruno-electron/src/ipc/network/interpolate-string.js
@@ -1,7 +1,7 @@
 const { forOwn, cloneDeep } = require('lodash');
 const { interpolate } = require('@usebruno/common');
 
-const interpolateString = (str, { globalEnvironmentVariables, envVars, runtimeVariables, processEnvVars }) => {
+const interpolateString = (str, { globalEnvironmentVariables, envVars, runtimeVariables, processEnvVars, promptVariables }) => {
   if (!str || !str.length || typeof str !== 'string') {
     return str;
   }
@@ -9,6 +9,7 @@ const interpolateString = (str, { globalEnvironmentVariables, envVars, runtimeVa
   processEnvVars = processEnvVars || {};
   runtimeVariables = runtimeVariables || {};
   globalEnvironmentVariables = globalEnvironmentVariables || {};
+  promptVariables = promptVariables || {};
 
   // we clone envVars because we don't want to modify the original object
   envVars = envVars ? cloneDeep(envVars) : {};
@@ -30,6 +31,7 @@ const interpolateString = (str, { globalEnvironmentVariables, envVars, runtimeVa
     ...globalEnvironmentVariables,
     ...envVars,
     ...runtimeVariables,
+    ...promptVariables,
     process: {
       env: {
         ...processEnvVars
diff --git a/packages/bruno-electron/src/ipc/network/interpolate-vars.js b/packages/bruno-electron/src/ipc/network/interpolate-vars.js
index 2437c7482..f071b6194 100644
--- a/packages/bruno-electron/src/ipc/network/interpolate-vars.js
+++ b/packages/bruno-electron/src/ipc/network/interpolate-vars.js
@@ -18,7 +18,7 @@ const getRawQueryString = (url) => {
   return queryIndex !== -1 ? url.slice(queryIndex) : '';
 };
 
-const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, processEnvVars = {}) => {
+const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, processEnvVars = {}, promptVariables = {}) => {
   const globalEnvironmentVariables = request?.globalEnvironmentVariables || {};
   const oauth2CredentialVariables = request?.oauth2CredentialVariables || {};
   const collectionVariables = request?.collectionVariables || {};
@@ -52,6 +52,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
       ...requestVariables,
       ...oauth2CredentialVariables,
       ...runtimeVariables,
+      ...promptVariables,
       process: {
         env: {
           ...processEnvVars
@@ -81,10 +82,30 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
     });
     request.body = JSON.parse(parsed);
   }
+  // Interpolate WebSocket message body
+  const isWsRequest = request.mode === 'ws';
+  if (isWsRequest && request.body && request.body.ws && Array.isArray(request.body.ws)) {
+    request.body.ws.forEach((message) => {
+      if (message && message.content) {
+        // Try to detect if content is JSON for proper escaping
+        let isJson = false;
+        try {
+          JSON.parse(message.content);
+          isJson = true;
+        } catch (e) {
+          // Not JSON, treat as regular string
+        }
+
+        message.content = _interpolate(message.content, {
+          escapeJSONStrings: isJson
+        });
+      }
+    });
+  }
 
   if (typeof contentType === 'string') {
     /*
-      We explicitly avoid interpolating buffer values because the file content is read as a buffer object in raw body mode. 
+      We explicitly avoid interpolating buffer values because the file content is read as a buffer object in raw body mode.
       Even if the selected file's content type is JSON, this prevents the buffer object from being interpolated.
     */
     if (contentType.includes('json') && !Buffer.isBuffer(request.data)) {
@@ -113,7 +134,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
     } else if (contentType === 'multipart/form-data') {
       if (Array.isArray(request?.data) && !(request.data instanceof FormData)) {
         try {
-          request.data = request?.data?.map(d => ({
+          request.data = request?.data?.map((d) => ({
             ...d,
             value: _interpolate(d?.value)
           }));
@@ -130,7 +151,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
 
   if (request?.pathParams?.length) {
     let url = request.url;
-    const urlSearchRaw = getRawQueryString(request.url)
+    const urlSearchRaw = getRawQueryString(request.url);
     if (!url.startsWith('http://') && !url.startsWith('https://')) {
       url = `http://${url}`;
     }
@@ -279,7 +300,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
     if (request.oauth2.additionalParameters) {
       // Interpolate authorization parameters
       if (Array.isArray(request.oauth2.additionalParameters.authorization)) {
-        request.oauth2.additionalParameters.authorization.forEach(param => {
+        request.oauth2.additionalParameters.authorization.forEach((param) => {
           if (param && param.enabled !== false) {
             param.name = _interpolate(param.name) || '';
             param.value = _interpolate(param.value) || '';
@@ -289,7 +310,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
 
       // Interpolate token parameters
       if (Array.isArray(request.oauth2.additionalParameters.token)) {
-        request.oauth2.additionalParameters.token.forEach(param => {
+        request.oauth2.additionalParameters.token.forEach((param) => {
           if (param && param.enabled !== false) {
             param.name = _interpolate(param.name) || '';
             param.value = _interpolate(param.value) || '';
@@ -299,7 +320,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
 
       // Interpolate refresh parameters
       if (Array.isArray(request.oauth2.additionalParameters.refresh)) {
-        request.oauth2.additionalParameters.refresh.forEach(param => {
+        request.oauth2.additionalParameters.refresh.forEach((param) => {
           if (param && param.enabled !== false) {
             param.name = _interpolate(param.name) || '';
             param.value = _interpolate(param.value) || '';
@@ -335,10 +356,10 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
   if (request.ntlmConfig) {
     request.ntlmConfig.username = _interpolate(request.ntlmConfig.username) || '';
     request.ntlmConfig.password = _interpolate(request.ntlmConfig.password) || '';
-    request.ntlmConfig.domain = _interpolate(request.ntlmConfig.domain) || '';    
+    request.ntlmConfig.domain = _interpolate(request.ntlmConfig.domain) || '';
   }
 
-  if(request?.auth) delete request.auth;
+  if (request?.auth) delete request.auth;
 
   return request;
 };
diff --git a/packages/bruno-electron/src/ipc/network/prepare-gql-introspection-request.js b/packages/bruno-electron/src/ipc/network/prepare-gql-introspection-request.js
index 158a71dc6..d4910e4ee 100644
--- a/packages/bruno-electron/src/ipc/network/prepare-gql-introspection-request.js
+++ b/packages/bruno-electron/src/ipc/network/prepare-gql-introspection-request.js
@@ -17,7 +17,7 @@ const prepareGqlIntrospectionRequest = (endpoint, resolvedVars, request, collect
     url: endpoint,
     headers: {
       ...mapHeaders(request.headers, get(collectionRoot, 'request.headers', []), resolvedVars),
-      Accept: 'application/json',
+      'Accept': 'application/json',
       'Content-Type': 'application/json'
     },
     data: JSON.stringify(queryParams)
diff --git a/packages/bruno-electron/src/ipc/network/prepare-grpc-request.js b/packages/bruno-electron/src/ipc/network/prepare-grpc-request.js
index 3471bea39..610a0ba14 100644
--- a/packages/bruno-electron/src/ipc/network/prepare-grpc-request.js
+++ b/packages/bruno-electron/src/ipc/network/prepare-grpc-request.js
@@ -18,6 +18,7 @@ const prepareGrpcRequest = async (item, collection, environment, runtimeVariable
   const collectionRoot = collection?.draft?.root ? get(collection, 'draft.root', {}) : get(collection, 'root', {});
   const headers = {};
   const url = request.url;
+  const { promptVariables = {} } = collection;
 
   const scriptFlow = collection?.brunoConfig?.scripts?.flow ?? 'sandwich';
   const requestTreePath = getTreePathFromCollectionToItem(collection, item);
@@ -28,6 +29,7 @@ const prepareGrpcRequest = async (item, collection, environment, runtimeVariable
     mergeVars(collection, request, requestTreePath);
     request.globalEnvironmentVariables = collection?.globalEnvironmentVariables;
     request.oauth2CredentialVariables = getFormattedCollectionOauth2Credentials({ oauth2Credentials: collection?.oauth2Credentials });
+    request.promptVariables = promptVariables;
   }
 
   each(get(request, 'headers', []), (h) => {
@@ -49,6 +51,7 @@ const prepareGrpcRequest = async (item, collection, environment, runtimeVariable
     processEnvVars,
     envVars,
     runtimeVariables,
+    promptVariables,
     body: request.body,
     protoPath: request.protoPath,
     // Add variable properties for interpolation
@@ -68,7 +71,7 @@ const prepareGrpcRequest = async (item, collection, environment, runtimeVariable
     let credentials, credentialsId, oauth2Url, debugInfo;
     switch (grantType) {
       case 'authorization_code':
-        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars);
+        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars, promptVariables);
         ({ credentials, url: oauth2Url, credentialsId, debugInfo } = await getOAuth2TokenUsingAuthorizationCode({ request: requestCopy, collectionUid: collection.uid, certsAndProxyConfig }));
         grpcRequest.oauth2Credentials = { credentials, url: oauth2Url, collectionUid: collection.uid, credentialsId, debugInfo, folderUid: request.oauth2Credentials?.folderUid };
         if (tokenPlacement == 'header') {
@@ -82,7 +85,7 @@ const prepareGrpcRequest = async (item, collection, environment, runtimeVariable
         }
         break;
       case 'client_credentials':
-        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars);
+        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars, promptVariables);
         ({ credentials, url: oauth2Url, credentialsId, debugInfo } = await getOAuth2TokenUsingClientCredentials({ request: requestCopy, collectionUid: collection.uid, certsAndProxyConfig }));
         grpcRequest.oauth2Credentials = { credentials, url: oauth2Url, collectionUid: collection.uid, credentialsId, debugInfo, folderUid: request.oauth2Credentials?.folderUid };
         if (tokenPlacement == 'header') {
@@ -96,7 +99,7 @@ const prepareGrpcRequest = async (item, collection, environment, runtimeVariable
         }
         break;
       case 'password':
-        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars);
+        interpolateVars(requestCopy, envVars, runtimeVariables, processEnvVars, promptVariables);
         ({ credentials, url: oauth2Url, credentialsId, debugInfo } = await getOAuth2TokenUsingPasswordCredentials({ request: requestCopy, collectionUid: collection.uid, certsAndProxyConfig }));
         grpcRequest.oauth2Credentials = { credentials, url: oauth2Url, collectionUid: collection.uid, credentialsId, debugInfo, folderUid: request.oauth2Credentials?.folderUid };
         if (tokenPlacement == 'header') {
@@ -112,7 +115,7 @@ const prepareGrpcRequest = async (item, collection, environment, runtimeVariable
     }
   }
 
-  interpolateVars(grpcRequest, envVars, runtimeVariables, processEnvVars);
+  interpolateVars(grpcRequest, envVars, runtimeVariables, processEnvVars, promptVariables);
   processHeaders(grpcRequest.headers);
 
   return grpcRequest;
diff --git a/packages/bruno-electron/src/ipc/network/prepare-request.js b/packages/bruno-electron/src/ipc/network/prepare-request.js
index 5e37ac8ed..2990f9530 100644
--- a/packages/bruno-electron/src/ipc/network/prepare-request.js
+++ b/packages/bruno-electron/src/ipc/network/prepare-request.js
@@ -310,14 +310,14 @@ const prepareRequest = async (item, collection = {}, abortController) => {
   const headers = {};
   let contentTypeDefined = false;
   let url = request.url;
-  
+
   each(get(collectionRoot, 'request.headers', []), (h) => {
     if (h.enabled && h.name?.toLowerCase() === 'content-type') {
       contentTypeDefined = true;
       return false;
     }
   });
-  
+
   const scriptFlow = collection?.brunoConfig?.scripts?.flow ?? 'sandwich';
   const requestTreePath = getTreePathFromCollectionToItem(collection, item);
   if (requestTreePath && requestTreePath.length > 0) {
@@ -327,9 +327,9 @@ const prepareRequest = async (item, collection = {}, abortController) => {
     mergeAuth(collection, request, requestTreePath);
     request.globalEnvironmentVariables = collection?.globalEnvironmentVariables;
     request.oauth2CredentialVariables = getFormattedCollectionOauth2Credentials({ oauth2Credentials: collection?.oauth2Credentials });
+    request.promptVariables = collection?.promptVariables || {};
   }
 
-
   each(get(request, 'headers', []), (h) => {
     if (h.enabled && h.name.length > 0) {
       headers[h.name] = h.value;
@@ -389,17 +389,17 @@ const prepareRequest = async (item, collection = {}, abortController) => {
     if (!contentTypeDefined) {
       axiosRequest.headers['content-type'] = 'application/octet-stream'; // Default headers for binary file uploads
     }
-  
+
     const bodyFile = find(request.body.file, (param) => param.selected);
     if (bodyFile) {
       let { filePath, contentType } = bodyFile;
-      
+
       axiosRequest.headers['content-type'] = contentType;
       if (filePath) {
         if (!path.isAbsolute(filePath)) {
           filePath = path.join(collectionPath, filePath);
         }
-  
+
         try {
           // Large files can cause "JavaScript heap out of memory" errors when loaded entirely into memory.
           if (isLargeFile(filePath, STREAMING_FILE_SIZE_THRESHOLD)) {
@@ -446,7 +446,7 @@ const prepareRequest = async (item, collection = {}, abortController) => {
 
   // if the mode is 'none' then set the content-type header to false. #1693
   if (request.body.mode === 'none' && request.auth.mode !== 'awsv4') {
-    if(!contentTypeDefined) {
+    if (!contentTypeDefined) {
       axiosRequest.headers['content-type'] = false;
     }
   }
@@ -463,6 +463,7 @@ const prepareRequest = async (item, collection = {}, abortController) => {
   axiosRequest.collectionVariables = request.collectionVariables;
   axiosRequest.folderVariables = request.folderVariables;
   axiosRequest.requestVariables = request.requestVariables;
+  axiosRequest.promptVariables = request.promptVariables;
   axiosRequest.globalEnvironmentVariables = request.globalEnvironmentVariables;
   axiosRequest.oauth2CredentialVariables = request.oauth2CredentialVariables;
   axiosRequest.assertions = request.assertions;
@@ -474,4 +475,4 @@ const prepareRequest = async (item, collection = {}, abortController) => {
 module.exports = {
   prepareRequest,
   setAuthHeaders
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-electron/src/ipc/network/ws-event-handlers.js b/packages/bruno-electron/src/ipc/network/ws-event-handlers.js
index 9513f9a6c..8fd168c85 100644
--- a/packages/bruno-electron/src/ipc/network/ws-event-handlers.js
+++ b/packages/bruno-electron/src/ipc/network/ws-event-handlers.js
@@ -38,6 +38,8 @@ const prepareWsRequest = async (item, collection, environment, runtimeVariables,
     mergeScripts(collection, request, requestTreePath, scriptFlow);
     mergeVars(collection, request, requestTreePath);
     mergeAuth(collection, request, requestTreePath);
+    request.globalEnvironmentVariables = collection?.globalEnvironmentVariables;
+    request.oauth2CredentialVariables = getFormattedCollectionOauth2Credentials({ oauth2Credentials: collection?.oauth2Credentials });
   }
 
   each(get(collectionRoot, 'request.headers', []), (h) => {
@@ -65,6 +67,7 @@ const prepareWsRequest = async (item, collection, environment, runtimeVariables,
 
   let wsRequest = {
     uid: item.uid,
+    mode: request.body.mode,
     url: request.url,
     headers,
     processEnvVars,
@@ -276,15 +279,43 @@ const registerWsEventHandlers = (window) => {
     }
   });
 
-  ipcMain.handle('renderer:ws:queue-message', (event, requestId, collectionUid, message) => {
-    try {
-      wsClient.queueMessage(requestId, collectionUid, message);
-      return { success: true };
-    } catch (error) {
-      console.error('Error queuing WebSocket message:', error);
-      return { success: false, error: error.message };
-    }
-  });
+  ipcMain.handle('renderer:ws:queue-message',
+    async (event, { item, collection, environment, runtimeVariables, messageContent }) => {
+      try {
+        const itemCopy = cloneDeep(item);
+        const preparedRequest = await prepareWsRequest(itemCopy, collection, environment, runtimeVariables, {});
+
+        // If messageContent is provided, find and queue that specific message (interpolated)
+        // Otherwise, queue all messages
+        if (messageContent !== undefined && messageContent !== null) {
+          // Find the message index in the original request
+          const originalMessages = itemCopy.draft?.request?.body?.ws || itemCopy.request?.body?.ws || [];
+          const messageIndex = originalMessages.findIndex((msg) => msg.content === messageContent);
+
+          if (messageIndex >= 0 && preparedRequest.body?.ws?.[messageIndex]) {
+            // Queue the interpolated version of the specific message
+            wsClient.queueMessage(preparedRequest.uid, collection.uid, preparedRequest.body.ws[messageIndex].content);
+          } else {
+            // Message not found in request body, queue as-is (shouldn't happen in normal flow)
+            wsClient.queueMessage(preparedRequest.uid, collection.uid, messageContent);
+          }
+        } else {
+          // Queue all messages (they are already interpolated by prepareWsRequest -> interpolateVars)
+          if (preparedRequest.body && preparedRequest.body.ws && Array.isArray(preparedRequest.body.ws)) {
+            preparedRequest.body.ws
+              .filter((message) => message && message.content)
+              .forEach((message) => {
+                wsClient.queueMessage(preparedRequest.uid, collection.uid, message.content);
+              });
+          }
+        }
+
+        return { success: true };
+      } catch (error) {
+        console.error('Error queuing WebSocket message:', error);
+        return { success: false, error: error.message };
+      }
+    });
 
   // Send a message to an existing WebSocket connection
   ipcMain.handle('renderer:ws:send-message', (event, requestId, collectionUid, message) => {
@@ -318,6 +349,21 @@ const registerWsEventHandlers = (window) => {
       return { success: false, error: error.message, isActive: false };
     }
   });
+
+  /**
+   * Get the connection status of a connection
+   * @param {string} requestId - The request ID to get the connection status of
+   * @returns {string} - The connection status
+   */
+  ipcMain.handle('renderer:ws:connection-status', (event, requestId) => {
+    try {
+      const status = wsClient.connectionStatus(requestId);
+      return { success: true, status };
+    } catch (error) {
+      console.error('Error getting WebSocket connection status:', error);
+      return { success: false, error: error.message, status: 'disconnected' };
+    }
+  });
 };
 
 module.exports = {
diff --git a/packages/bruno-electron/src/ipc/preferences.js b/packages/bruno-electron/src/ipc/preferences.js
index 3cf95c6f4..69106c84a 100644
--- a/packages/bruno-electron/src/ipc/preferences.js
+++ b/packages/bruno-electron/src/ipc/preferences.js
@@ -1,10 +1,8 @@
 const { ipcMain } = require('electron');
 const { getPreferences, savePreferences, preferencesUtil } = require('../store/preferences');
-const { isDirectory } = require('../utils/filesystem');
-const { openCollection } = require('../app/collections');
 const { globalEnvironmentsStore } = require('../store/global-environments');
-``;
-const registerPreferencesIpc = (mainWindow, watcher, lastOpenedCollections) => {
+
+const registerPreferencesIpc = (mainWindow, watcher) => {
   ipcMain.handle('renderer:ready', async (event) => {
     // load preferences
     const preferences = getPreferences();
@@ -19,26 +17,14 @@ const registerPreferencesIpc = (mainWindow, watcher, lastOpenedCollections) => {
       // load global environments
       const globalEnvironments = globalEnvironmentsStore.getGlobalEnvironments();
       let activeGlobalEnvironmentUid = globalEnvironmentsStore.getActiveGlobalEnvironmentUid();
-      activeGlobalEnvironmentUid = globalEnvironments?.find(env => env?.uid == activeGlobalEnvironmentUid) ? activeGlobalEnvironmentUid : null;
+      activeGlobalEnvironmentUid = globalEnvironments?.find((env) => env?.uid == activeGlobalEnvironmentUid) ? activeGlobalEnvironmentUid : null;
       mainWindow.webContents.send('main:load-global-environments', { globalEnvironments, activeGlobalEnvironmentUid });
-    }
-    catch(error) {
-      console.error("Error occured while fetching global environements!");
+    } catch (error) {
+      console.error('Error occured while fetching global environements!');
       console.error(error);
     }
 
-    // reload last opened collections
-    const lastOpened = lastOpenedCollections.getAll();
-
-    if (lastOpened && lastOpened.length) {
-      for (let collectionPath of lastOpened) {
-        if (isDirectory(collectionPath)) {
-          await openCollection(mainWindow, watcher, collectionPath, {
-            dontSendDisplayErrors: true
-          });
-        }
-      }
-    }
+    ipcMain.emit('main:renderer-ready', mainWindow);
   });
 
   ipcMain.on('main:open-preferences', () => {
diff --git a/packages/bruno-electron/src/ipc/terminal.js b/packages/bruno-electron/src/ipc/terminal.js
new file mode 100644
index 000000000..b6d8cc1ca
--- /dev/null
+++ b/packages/bruno-electron/src/ipc/terminal.js
@@ -0,0 +1,182 @@
+const { ipcMain } = require('electron');
+const pty = require('@lydell/node-pty');
+const os = require('os');
+const path = require('path');
+const isDev = require('electron-is-dev');
+
+class TerminalManager {
+  constructor() {
+    this.terminals = new Map();
+    this.setupIpcHandlers();
+  }
+
+  setupIpcHandlers() {
+    // Create a new terminal session
+    ipcMain.handle('terminal:create', (event, options = {}) => {
+      try {
+        const sessionId = this.generateSessionId();
+        const shell = this.getDefaultShell();
+        // Use provided cwd or default to home directory
+        const cwd = options.cwd || this.getDefaultCwd();
+
+        if (isDev) {
+          console.log(`Creating new terminal session: ${sessionId} at ${cwd}`);
+        }
+
+        const ptyProcess = pty.spawn(shell, [], {
+          name: 'xterm-color',
+          cols: 80,
+          rows: 24,
+          cwd: cwd,
+          env: process.env
+        });
+
+        // Store terminal session
+        this.terminals.set(sessionId, {
+          pty: ptyProcess,
+          webContents: event.sender,
+          cwd: cwd // Store initial cwd
+        });
+
+        // Handle terminal output
+        ptyProcess.onData((data) => {
+          try {
+            if (data && event.sender && !event.sender.isDestroyed()) {
+              event.sender.send(`terminal:data:${sessionId}`, data);
+            }
+          } catch (error) {
+            console.warn('Failed to send terminal data:', error);
+          }
+        });
+
+        // Handle terminal exit
+        ptyProcess.onExit(({ exitCode, signal }) => {
+          try {
+            this.terminals.delete(sessionId);
+            if (event.sender && !event.sender.isDestroyed()) {
+              event.sender.send(`terminal:exit:${sessionId}`, { exitCode, signal });
+            }
+          } catch (error) {
+            console.warn('Failed to handle terminal exit:', error);
+          }
+        });
+
+        return sessionId;
+      } catch (error) {
+        console.error('Failed to create terminal session:', error);
+        return null;
+      }
+    });
+
+    // Send input to terminal
+    ipcMain.on('terminal:input', (event, sessionId, data) => {
+      try {
+        const terminal = this.terminals.get(sessionId);
+        if (terminal && terminal.pty && data) {
+          terminal.pty.write(data);
+        }
+      } catch (error) {
+        console.warn('Failed to send input to terminal:', error);
+      }
+    });
+
+    // Resize terminal
+    ipcMain.on('terminal:resize', (event, sessionId, { cols, rows }) => {
+      try {
+        const terminal = this.terminals.get(sessionId);
+        if (terminal && terminal.pty && cols > 0 && rows > 0) {
+          terminal.pty.resize(cols, rows);
+        }
+      } catch (error) {
+        console.warn('Failed to resize terminal:', error);
+      }
+    });
+
+    // Kill terminal session
+    ipcMain.on('terminal:kill', (event, sessionId) => {
+      const terminal = this.terminals.get(sessionId);
+      if (terminal && terminal.pty) {
+        try {
+          terminal.pty.kill();
+          this.terminals.delete(sessionId);
+        } catch (error) {
+          console.error('Failed to kill terminal:', error);
+        }
+      }
+    });
+
+    // Get list of all active terminal sessions
+    ipcMain.handle('terminal:list-sessions', (event) => {
+      try {
+        const sessions = [];
+        for (const [sessionId, terminal] of this.terminals.entries()) {
+          if (terminal && terminal.pty) {
+            // Check if process is still alive
+            try {
+              const pid = terminal.pty.pid;
+              process.kill(pid, 0); // Signal 0 just checks if process exists
+              sessions.push({
+                sessionId,
+                cwd: terminal.cwd || '', // Use stored cwd
+                pid: pid
+              });
+            } catch (error) {
+              // Process doesn't exist, remove it
+              this.terminals.delete(sessionId);
+            }
+          }
+        }
+        return sessions;
+      } catch (error) {
+        console.error('Failed to list terminal sessions:', error);
+        return [];
+      }
+    });
+  }
+
+  getDefaultShell() {
+    if (process.platform === 'win32') {
+      // Try PowerShell Core first (pwsh.exe), then fall back to Windows PowerShell (powershell.exe)
+      return process.env.PWSH || 'powershell.exe';
+    } else {
+      return process.env.SHELL || '/bin/bash';
+    }
+  }
+
+  getDefaultCwd() {
+    // Try to use user's home directory as default
+    return process.env.HOME || process.env.USERPROFILE || os.homedir();
+  }
+
+  generateSessionId() {
+    return `terminal_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
+  }
+
+  // Clean up terminals when window closes
+  cleanup(webContents) {
+    for (const [sessionId, terminal] of this.terminals.entries()) {
+      if (terminal.webContents === webContents) {
+        try {
+          terminal.pty.kill();
+          this.terminals.delete(sessionId);
+        } catch (error) {
+          console.error('Failed to cleanup terminal:', error);
+        }
+      }
+    }
+  }
+
+  // Kill all terminals
+  killAll() {
+    for (const [sessionId, terminal] of this.terminals.entries()) {
+      try {
+        terminal.pty.kill();
+      } catch (error) {
+        console.error('Failed to kill terminal:', error);
+      }
+    }
+    this.terminals.clear();
+  }
+}
+
+module.exports = TerminalManager;
diff --git a/packages/bruno-electron/src/ipc/workspace.js b/packages/bruno-electron/src/ipc/workspace.js
new file mode 100644
index 000000000..4610516ad
--- /dev/null
+++ b/packages/bruno-electron/src/ipc/workspace.js
@@ -0,0 +1,502 @@
+const fs = require('fs');
+const path = require('path');
+const fsExtra = require('fs-extra');
+const { ipcMain, dialog } = require('electron');
+const { createDirectory, sanitizeName } = require('../utils/filesystem');
+const { generateUidBasedOnHash } = require('../utils/common');
+const yaml = require('js-yaml');
+const LastOpenedWorkspaces = require('../store/last-opened-workspaces');
+const { defaultWorkspaceManager } = require('../store/default-workspace');
+const { globalEnvironmentsManager } = require('../store/workspace-environments');
+
+// Workspace configuration module (includes path and validation utilities)
+const {
+  createWorkspaceConfig,
+  readWorkspaceConfig,
+  writeWorkspaceConfig,
+  validateWorkspaceConfig,
+  updateWorkspaceName,
+  updateWorkspaceDocs,
+  addCollectionToWorkspace,
+  removeCollectionFromWorkspace,
+  getWorkspaceCollections,
+  normalizeCollectionEntry,
+  validateWorkspacePath,
+  validateWorkspaceDirectory
+} = require('../utils/workspace-config');
+
+const registerWorkspaceIpc = (mainWindow, workspaceWatcher) => {
+  const lastOpenedWorkspaces = new LastOpenedWorkspaces();
+
+  ipcMain.handle('renderer:create-workspace',
+    async (event, workspaceName, workspaceFolderName, workspaceLocation) => {
+      try {
+        workspaceFolderName = sanitizeName(workspaceFolderName);
+        const dirPath = path.join(workspaceLocation, workspaceFolderName);
+
+        if (fs.existsSync(dirPath)) {
+          const files = fs.readdirSync(dirPath);
+          if (files.length > 0) {
+            throw new Error(`workspace: ${dirPath} already exists and is not empty`);
+          }
+        }
+
+        validateWorkspaceDirectory(dirPath);
+
+        if (!fs.existsSync(dirPath)) {
+          await createDirectory(dirPath);
+        }
+
+        await createDirectory(path.join(dirPath, 'collections'));
+
+        const workspaceUid = generateUidBasedOnHash(dirPath);
+        const workspaceConfig = createWorkspaceConfig(workspaceName);
+
+        await writeWorkspaceConfig(dirPath, workspaceConfig);
+
+        lastOpenedWorkspaces.add(dirPath, workspaceConfig);
+
+        mainWindow.webContents.send('main:workspace-opened', dirPath, workspaceUid, workspaceConfig);
+
+        if (workspaceWatcher) {
+          workspaceWatcher.addWatcher(mainWindow, dirPath);
+        }
+
+        return {
+          workspaceConfig,
+          workspaceUid,
+          workspacePath: dirPath
+        };
+      } catch (error) {
+        throw error;
+      }
+    });
+
+  ipcMain.handle('renderer:open-workspace', async (event, workspacePath) => {
+    try {
+      validateWorkspacePath(workspacePath);
+
+      const workspaceConfig = readWorkspaceConfig(workspacePath);
+      validateWorkspaceConfig(workspaceConfig);
+
+      const workspaceUid = generateUidBasedOnHash(workspacePath);
+
+      lastOpenedWorkspaces.add(workspacePath, workspaceConfig);
+
+      mainWindow.webContents.send('main:workspace-opened', workspacePath, workspaceUid, workspaceConfig);
+
+      if (workspaceWatcher) {
+        workspaceWatcher.addWatcher(mainWindow, workspacePath);
+      }
+
+      return {
+        workspaceConfig,
+        workspaceUid,
+        workspacePath
+      };
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:open-workspace-dialog', async (event) => {
+    try {
+      const { canceled, filePaths } = await dialog.showOpenDialog(mainWindow, {
+        properties: ['openDirectory'],
+        title: 'Open Workspace',
+        buttonLabel: 'Open Workspace'
+      });
+
+      if (canceled || filePaths.length === 0) {
+        return null;
+      }
+
+      const workspacePath = filePaths[0];
+      validateWorkspacePath(workspacePath);
+
+      const workspaceConfig = readWorkspaceConfig(workspacePath);
+      validateWorkspaceConfig(workspaceConfig);
+
+      const workspaceUid = generateUidBasedOnHash(workspacePath);
+
+      lastOpenedWorkspaces.add(workspacePath, workspaceConfig);
+
+      mainWindow.webContents.send('main:workspace-opened', workspacePath, workspaceUid, workspaceConfig);
+
+      if (workspaceWatcher) {
+        workspaceWatcher.addWatcher(mainWindow, workspacePath);
+      }
+
+      return {
+        workspaceConfig,
+        workspaceUid,
+        workspacePath
+      };
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:load-workspace-collections', async (event, workspacePath) => {
+    try {
+      if (!workspacePath) {
+        throw new Error('Workspace path is undefined');
+      }
+
+      validateWorkspacePath(workspacePath);
+      return getWorkspaceCollections(workspacePath);
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:get-last-opened-workspaces', async () => {
+    try {
+      const workspaces = lastOpenedWorkspaces.getAll();
+      const validWorkspaces = [];
+      const invalidWorkspaceUids = [];
+
+      // Check each workspace to see if workspace.yml still exists
+      for (const workspace of workspaces) {
+        if (workspace.pathname) {
+          const workspaceYmlPath = path.join(workspace.pathname, 'workspace.yml');
+
+          if (fs.existsSync(workspaceYmlPath)) {
+            validWorkspaces.push(workspace);
+          } else {
+            invalidWorkspaceUids.push(workspace.uid);
+          }
+        } else {
+          invalidWorkspaceUids.push(workspace.uid);
+        }
+      }
+
+      // Remove invalid workspaces from preferences
+      if (invalidWorkspaceUids.length > 0) {
+        for (const uid of invalidWorkspaceUids) {
+          lastOpenedWorkspaces.remove(uid);
+        }
+      }
+
+      return validWorkspaces;
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:rename-workspace', async (event, workspacePath, newName) => {
+    try {
+      await updateWorkspaceName(workspacePath, newName);
+
+      // Update in last opened workspaces
+      const workspaces = lastOpenedWorkspaces.getAll();
+      const workspaceIndex = workspaces.findIndex((w) => w.pathname === workspacePath);
+      if (workspaceIndex !== -1) {
+        workspaces[workspaceIndex].name = newName;
+        lastOpenedWorkspaces.store.set('workspaces.lastOpenedWorkspaces', workspaces);
+      }
+
+      return { success: true };
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:close-workspace', async (event, workspacePath) => {
+    try {
+      const workspaces = lastOpenedWorkspaces.getAll();
+      const filteredWorkspaces = workspaces.filter((w) => w.pathname !== workspacePath);
+
+      lastOpenedWorkspaces.store.set('workspaces.lastOpenedWorkspaces', filteredWorkspaces);
+
+      if (workspaceWatcher) {
+        workspaceWatcher.removeWatcher(workspacePath);
+      }
+
+      return { success: true };
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:save-workspace-docs', async (event, workspacePath, docs) => {
+    try {
+      return await updateWorkspaceDocs(workspacePath, docs);
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:load-workspace-environments', async (event, workspacePath) => {
+    try {
+      const result = await globalEnvironmentsManager.getGlobalEnvironments(workspacePath);
+      return result.globalEnvironments;
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:create-workspace-environment', async (event, workspacePath, environmentName) => {
+    try {
+      return await globalEnvironmentsManager.createGlobalEnvironment(workspacePath, {
+        name: environmentName,
+        variables: []
+      });
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:delete-workspace-environment', async (event, workspacePath, environmentUid) => {
+    try {
+      return await globalEnvironmentsManager.deleteGlobalEnvironment(workspacePath, { environmentUid });
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:select-workspace-environment', async (event, workspacePath, environmentUid) => {
+    try {
+      return await globalEnvironmentsManager.selectGlobalEnvironment(workspacePath, { environmentUid });
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:import-workspace-environment', async (event, workspacePath, environmentData) => {
+    try {
+      return await globalEnvironmentsManager.createGlobalEnvironment(workspacePath, {
+        name: environmentData.name || 'Imported Environment',
+        variables: environmentData.variables || []
+      });
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:update-workspace-environment', async (event, workspacePath, environmentUid, environmentData) => {
+    try {
+      return await globalEnvironmentsManager.saveGlobalEnvironment(workspacePath, {
+        environmentUid,
+        variables: environmentData.variables || []
+      });
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:rename-workspace-environment', async (event, workspacePath, environmentUid, newName) => {
+    try {
+      return await globalEnvironmentsManager.renameGlobalEnvironment(workspacePath, {
+        environmentUid,
+        name: newName
+      });
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:copy-workspace-environment', async (event, workspacePath, environmentUid, newName) => {
+    try {
+      const result = await globalEnvironmentsManager.getGlobalEnvironments(workspacePath);
+      const sourceEnv = result.globalEnvironments.find((env) => env.uid === environmentUid);
+
+      if (!sourceEnv) {
+        throw new Error('Source environment not found');
+      }
+
+      // Create new environment with copied variables
+      return await globalEnvironmentsManager.createGlobalEnvironment(workspacePath, {
+        name: newName,
+        variables: sourceEnv.variables || []
+      });
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:add-collection-to-workspace', async (event, workspacePath, collection) => {
+    try {
+      const normalizedCollection = normalizeCollectionEntry(workspacePath, collection);
+      const updatedCollections = await addCollectionToWorkspace(workspacePath, normalizedCollection);
+
+      const workspaceConfig = readWorkspaceConfig(workspacePath);
+      const workspaceUid = generateUidBasedOnHash(workspacePath);
+      mainWindow.webContents.send('main:workspace-config-updated', workspacePath, workspaceUid, workspaceConfig);
+
+      return updatedCollections;
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:ensure-collections-folder', async (event, workspacePath) => {
+    try {
+      const collectionsPath = path.join(workspacePath, 'collections');
+      if (!fs.existsSync(collectionsPath)) {
+        await createDirectory(collectionsPath);
+      }
+      return collectionsPath;
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:start-workspace-watcher', async (event, workspacePath) => {
+    try {
+      if (workspaceWatcher) {
+        workspaceWatcher.addWatcher(mainWindow, workspacePath);
+      }
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:remove-collection-from-workspace', async (event, workspaceUid, workspacePath, collectionPath) => {
+    try {
+      const result = await removeCollectionFromWorkspace(workspacePath, collectionPath);
+
+      // Delete collection files if it's a workspace collection
+      if (result.shouldDeleteFiles && result.removedCollection && fs.existsSync(collectionPath)) {
+        await fsExtra.remove(collectionPath);
+      }
+
+      const correctWorkspaceUid = generateUidBasedOnHash(workspacePath);
+      mainWindow.webContents.send('main:workspace-config-updated', workspacePath, correctWorkspaceUid, result.updatedConfig);
+
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  });
+
+  ipcMain.handle('renderer:get-collection-workspaces', async (event, collectionPath) => {
+    try {
+      const workspaces = lastOpenedWorkspaces.getAll();
+      const workspacesWithCollection = [];
+
+      for (const workspace of workspaces) {
+        if (workspace.pathname) {
+          try {
+            const workspaceYmlPath = path.join(workspace.pathname, 'workspace.yml');
+            if (fs.existsSync(workspaceYmlPath)) {
+              const workspaceConfig = yaml.load(fs.readFileSync(workspaceYmlPath, 'utf8')) || {};
+              const collections = workspaceConfig.collections || [];
+
+              const hasCollection = collections.some((c) => {
+                const resolvedPath = path.isAbsolute(c.path)
+                  ? c.path
+                  : path.resolve(workspace.pathname, c.path);
+                return resolvedPath === collectionPath;
+              });
+
+              if (hasCollection) {
+                workspacesWithCollection.push(workspace);
+              }
+            }
+          } catch (error) {
+            console.warn('Failed to check workspace collection:', error.message);
+          }
+        }
+      }
+
+      return workspacesWithCollection;
+    } catch (error) {
+      return [];
+    }
+  });
+
+  ipcMain.handle('renderer:get-default-workspace', async (event) => {
+    try {
+      const result = await defaultWorkspaceManager.ensureDefaultWorkspaceExists();
+
+      if (!result) {
+        return null;
+      }
+
+      const { workspacePath, workspaceUid } = result;
+
+      const workspaceFilePath = path.join(workspacePath, 'workspace.yml');
+      if (!fs.existsSync(workspaceFilePath)) {
+        return null;
+      }
+
+      const yamlContent = fs.readFileSync(workspaceFilePath, 'utf8');
+      const workspaceConfig = yaml.load(yamlContent);
+
+      return {
+        workspaceConfig: {
+          ...workspaceConfig,
+          type: 'default'
+        },
+        workspaceUid,
+        workspacePath
+      };
+    } catch (error) {
+      return null;
+    }
+  });
+
+  ipcMain.on('main:renderer-ready', async (win) => {
+    try {
+      const defaultResult = await defaultWorkspaceManager.ensureDefaultWorkspaceExists();
+      if (defaultResult) {
+        const { workspacePath, workspaceUid } = defaultResult;
+        const workspaceFilePath = path.join(workspacePath, 'workspace.yml');
+
+        if (fs.existsSync(workspaceFilePath)) {
+          const yamlContent = fs.readFileSync(workspaceFilePath, 'utf8');
+          const workspaceConfig = yaml.load(yamlContent);
+
+          win.webContents.send('main:workspace-opened', workspacePath, workspaceUid, {
+            ...workspaceConfig,
+            type: 'default'
+          });
+
+          if (workspaceWatcher) {
+            workspaceWatcher.addWatcher(win, workspacePath);
+          }
+        }
+      }
+
+      const workspaces = lastOpenedWorkspaces.getAll();
+      const invalidWorkspaceUids = [];
+
+      for (const workspace of workspaces) {
+        if (workspace.pathname) {
+          const workspaceYmlPath = path.join(workspace.pathname, 'workspace.yml');
+
+          if (fs.existsSync(workspaceYmlPath)) {
+            try {
+              const workspaceConfig = readWorkspaceConfig(workspace.pathname);
+              validateWorkspaceConfig(workspaceConfig);
+              const workspaceUid = generateUidBasedOnHash(workspace.pathname);
+
+              win.webContents.send('main:workspace-opened', workspace.pathname, workspaceUid, workspaceConfig);
+
+              if (workspaceWatcher) {
+                workspaceWatcher.addWatcher(win, workspace.pathname);
+              }
+            } catch (error) {
+              console.error(`Error loading workspace ${workspace.pathname}:`, error);
+              invalidWorkspaceUids.push(workspace.uid);
+            }
+          } else {
+            invalidWorkspaceUids.push(workspace.uid);
+          }
+        } else {
+          invalidWorkspaceUids.push(workspace.uid);
+        }
+      }
+
+      for (const uid of invalidWorkspaceUids) {
+        lastOpenedWorkspaces.remove(uid);
+      }
+    } catch (error) {
+      console.error('Error initializing workspaces:', error);
+    }
+  });
+};
+
+module.exports = registerWorkspaceIpc;
diff --git a/packages/bruno-electron/src/preload.js b/packages/bruno-electron/src/preload.js
index d89a2dab6..6ba81c073 100644
--- a/packages/bruno-electron/src/preload.js
+++ b/packages/bruno-electron/src/preload.js
@@ -1,10 +1,15 @@
-const { ipcRenderer, contextBridge, webUtils } = require('electron');
+const { ipcRenderer, contextBridge, webUtils, shell } = require('electron');
 
 contextBridge.exposeInMainWorld('ipcRenderer', {
   invoke: (channel, ...args) => ipcRenderer.invoke(channel, ...args),
+  send: (channel, ...args) => ipcRenderer.send(channel, ...args),
   on: (channel, handler) => {
     // Deliberately strip event as it includes `sender`
-    const subscription = (event, ...args) => handler(...args);
+    const subscription = (event, ...args) => {
+      // Ensure args is always an array to prevent undefined errors
+      const safeArgs = args && args.length ? args : [];
+      handler(...safeArgs);
+    };
     ipcRenderer.on(channel, subscription);
 
     return () => {
@@ -14,5 +19,6 @@ contextBridge.exposeInMainWorld('ipcRenderer', {
   getFilePath(file) {
     const path = webUtils.getPathForFile(file);
     return path;
-  }
+  },
+  openExternal: (url) => shell.openExternal(url)
 });
diff --git a/packages/bruno-electron/src/store/cookies.js b/packages/bruno-electron/src/store/cookies.js
index 3b6953991..4051cc05d 100644
--- a/packages/bruno-electron/src/store/cookies.js
+++ b/packages/bruno-electron/src/store/cookies.js
@@ -57,12 +57,11 @@ class CookiesStore {
     const decryptedCookies = [];
 
     // Filter and decrypt cookies
-    Object.values(cookieStore).forEach(domainCookies => {
+    Object.values(cookieStore).forEach((domainCookies) => {
       if (!Array.isArray(domainCookies)) return;
 
-      domainCookies.forEach(cookie => {
+      domainCookies.forEach((cookie) => {
         try {
-
           // Create cookie with decrypted value
           const decryptedCookie = {
             ...cookie,
@@ -87,7 +86,7 @@ class CookiesStore {
     try {
       // Organize cookies by domain
       const cookiesByDomain = {};
-      cookies.cookies.forEach(cookie => {
+      cookies.cookies.forEach((cookie) => {
         try {
           if (!cookiesByDomain[cookie.domain]) {
             cookiesByDomain[cookie.domain] = [];
@@ -152,7 +151,6 @@ class CookiesStore {
     try {
       const serialized = cookieJar.serializeSync();
       this.setCookies(serialized);
-
     } catch (err) {
       console.warn('Failed to save cookie jar:', err);
     } finally {
@@ -182,7 +180,6 @@ class CookiesStore {
       this.#saveTimerId = null;
     }, DEBOUNCE_MS);
   }
-
 }
 
 // Create singleton instance
@@ -191,4 +188,4 @@ const cookiesStore = new CookiesStore();
 module.exports = {
   cookiesStore,
   CookiesStore
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-electron/src/store/default-workspace.js b/packages/bruno-electron/src/store/default-workspace.js
new file mode 100644
index 000000000..8f259a9b9
--- /dev/null
+++ b/packages/bruno-electron/src/store/default-workspace.js
@@ -0,0 +1,218 @@
+const fs = require('fs');
+const path = require('path');
+const { app } = require('electron');
+const yaml = require('js-yaml');
+const { generateUidBasedOnHash } = require('../utils/common');
+const { writeFile, createDirectory } = require('../utils/filesystem');
+const { getPreferences, savePreferences } = require('./preferences');
+const { globalEnvironmentsStore } = require('./global-environments');
+
+class DefaultWorkspaceManager {
+  constructor() {
+    this.defaultWorkspacePath = null;
+    this.defaultWorkspaceUid = null;
+    this.initializationPromise = null;
+  }
+
+  getDefaultWorkspacePath() {
+    if (this.defaultWorkspacePath) {
+      return this.defaultWorkspacePath;
+    }
+
+    const preferences = getPreferences();
+    this.defaultWorkspacePath = preferences?.general?.defaultWorkspacePath;
+    return this.defaultWorkspacePath;
+  }
+
+  getDefaultWorkspaceUid() {
+    const workspacePath = this.getDefaultWorkspacePath();
+    if (!workspacePath) {
+      return null;
+    }
+
+    if (!this.defaultWorkspaceUid) {
+      this.defaultWorkspaceUid = generateUidBasedOnHash(workspacePath);
+    }
+
+    return this.defaultWorkspaceUid;
+  }
+
+  async setDefaultWorkspacePath(workspacePath) {
+    const preferences = getPreferences();
+    if (!preferences.general) {
+      preferences.general = {};
+    }
+    preferences.general.defaultWorkspacePath = workspacePath;
+    await savePreferences(preferences);
+
+    this.defaultWorkspacePath = workspacePath;
+    this.defaultWorkspaceUid = generateUidBasedOnHash(workspacePath);
+
+    return workspacePath;
+  }
+
+  async ensureDefaultWorkspaceExists() {
+    if (this.initializationPromise) {
+      return this.initializationPromise;
+    }
+
+    const existingPath = this.getDefaultWorkspacePath();
+
+    if (existingPath && fs.existsSync(existingPath)) {
+      return {
+        workspacePath: existingPath,
+        workspaceUid: this.getDefaultWorkspaceUid()
+      };
+    }
+
+    this.initializationPromise = (async () => {
+      try {
+        const shouldMigrate = this.needsMigration();
+        const newWorkspacePath = await this.initializeDefaultWorkspace(null, { migrateFromPreferences: shouldMigrate });
+        const workspaceYmlPath = path.join(newWorkspacePath, 'workspace.yml');
+        if (!fs.existsSync(workspaceYmlPath)) {
+          this.defaultWorkspacePath = null;
+          return null;
+        } else {
+          return {
+            workspacePath: newWorkspacePath,
+            workspaceUid: this.getDefaultWorkspaceUid()
+          };
+        }
+      } finally {
+        this.initializationPromise = null;
+      }
+    })();
+
+    return this.initializationPromise;
+  }
+
+  async initializeDefaultWorkspace(workspacePath = null, options = {}) {
+    const { migrateFromPreferences = true } = options;
+
+    if (!workspacePath) {
+      const configDir = app.getPath('userData');
+      const baseWorkspacePath = path.join(configDir, 'default-workspace');
+
+      let finalPath = baseWorkspacePath;
+      let counter = 1;
+      while (fs.existsSync(finalPath)) {
+        finalPath = `${baseWorkspacePath}-${counter}`;
+        counter++;
+      }
+
+      workspacePath = finalPath;
+    }
+
+    if (!fs.existsSync(workspacePath)) {
+      await createDirectory(workspacePath);
+    }
+
+    await createDirectory(path.join(workspacePath, 'collections'));
+    await createDirectory(path.join(workspacePath, 'environments'));
+
+    const workspaceConfig = {
+      name: 'My Workspace',
+      type: 'default',
+      version: '1.0.0',
+      docs: '',
+      collections: []
+    };
+
+    if (migrateFromPreferences) {
+      await this.migrateFromPreferences(workspacePath, workspaceConfig);
+    }
+
+    const yamlContent = yaml.dump(workspaceConfig, {
+      indent: 2,
+      lineWidth: -1,
+      noRefs: true
+    });
+    await writeFile(path.join(workspacePath, 'workspace.yml'), yamlContent);
+
+    await this.setDefaultWorkspacePath(workspacePath);
+
+    return workspacePath;
+  }
+
+  async migrateFromPreferences(workspacePath, workspaceConfig) {
+    try {
+      const Store = require('electron-store');
+      const preferencesStore = new Store({ name: 'preferences' });
+
+      const lastOpenedCollections = preferencesStore.get('lastOpenedCollections', []);
+
+      if (lastOpenedCollections && lastOpenedCollections.length > 0) {
+        const collections = lastOpenedCollections.map((collectionPath) => {
+          const absolutePath = path.resolve(collectionPath);
+          const collectionName = path.basename(absolutePath);
+
+          return {
+            type: 'preference',
+            path: absolutePath,
+            name: collectionName
+          };
+        });
+
+        workspaceConfig.collections = collections;
+      }
+
+      const globalEnvironments = globalEnvironmentsStore.getGlobalEnvironments();
+      const activeGlobalEnvironmentUid = globalEnvironmentsStore.getActiveGlobalEnvironmentUid();
+
+      if (globalEnvironments && globalEnvironments.length > 0) {
+        const { stringifyEnvironment } = require('@usebruno/filestore');
+        const environmentsDir = path.join(workspacePath, 'environments');
+
+        for (const env of globalEnvironments) {
+          const envFilePath = path.join(environmentsDir, `${env.name}.yml`);
+
+          const environment = {
+            name: env.name,
+            variables: env.variables || []
+          };
+
+          const content = stringifyEnvironment(environment, { format: 'yml' });
+          await writeFile(envFilePath, content);
+
+          if (env.uid === activeGlobalEnvironmentUid) {
+            const newUid = generateUidBasedOnHash(envFilePath);
+            workspaceConfig.activeEnvironmentUid = newUid;
+          }
+        }
+
+        const globalEnvStore = new Store({ name: 'global-environments' });
+        globalEnvStore.clear();
+      }
+
+      const defaultWorkspaceDocs = preferencesStore.get('preferences.defaultWorkspaceDocs', '');
+      if (defaultWorkspaceDocs) {
+        workspaceConfig.docs = defaultWorkspaceDocs;
+        preferencesStore.delete('preferences.defaultWorkspaceDocs');
+      }
+    } catch (error) {
+      console.error('Failed to migrate from preferences:', error);
+    }
+  }
+
+  needsMigration() {
+    const workspacePath = this.getDefaultWorkspacePath();
+    if (workspacePath && fs.existsSync(workspacePath)) {
+      return false;
+    }
+
+    const Store = require('electron-store');
+    const preferencesStore = new Store({ name: 'preferences' });
+    const lastOpenedCollections = preferencesStore.get('lastOpenedCollections', []);
+    const globalEnvironments = globalEnvironmentsStore.getGlobalEnvironments();
+
+    return lastOpenedCollections.length > 0 || globalEnvironments.length > 0;
+  }
+}
+
+const defaultWorkspaceManager = new DefaultWorkspaceManager();
+
+module.exports = {
+  defaultWorkspaceManager,
+  DefaultWorkspaceManager
+};
diff --git a/packages/bruno-electron/src/store/global-environments.js b/packages/bruno-electron/src/store/global-environments.js
index 981cb8de5..0bdeb6957 100644
--- a/packages/bruno-electron/src/store/global-environments.js
+++ b/packages/bruno-electron/src/store/global-environments.js
@@ -34,12 +34,12 @@ class GlobalEnvironmentsStore {
   }
 
   encryptGlobalEnvironmentVariables({ globalEnvironments }) {
-    return globalEnvironments?.map(env => {
-      const variables = env.variables?.map(v => ({
+    return globalEnvironments?.map((env) => {
+      const variables = env.variables?.map((v) => ({
         ...v,
         value: v?.secret ? encryptStringSafe(v.value).value : v?.value
       })) || [];
-  
+
       return {
         ...env,
         variables
@@ -48,27 +48,27 @@ class GlobalEnvironmentsStore {
   }
 
   decryptGlobalEnvironmentVariables({ globalEnvironments }) {
-    return globalEnvironments?.map(env => {
-      const variables = env.variables?.map(v => ({
+    return globalEnvironments?.map((env) => {
+      const variables = env.variables?.map((v) => ({
         ...v,
         value: v?.secret ? decryptStringSafe(v.value).value : v?.value
       })) || [];
-  
+
       return {
         ...env,
         variables
       };
     });
   }
-  
+
   getGlobalEnvironments() {
     let globalEnvironments = this.store.get('environments', []);
 
     // Previously, a bug caused environment variables to be saved without a type.
     // Since that issue is now fixed, this code ensures that anyone who imported
     // data before the fix will have the missing types added retroactively.
-    globalEnvironments?.forEach(env => {
-      env?.variables?.forEach(v => {
+    globalEnvironments?.forEach((env) => {
+      env?.variables?.forEach((v) => {
         if (!v.type) {
           v.type = 'text';
         }
@@ -99,7 +99,7 @@ class GlobalEnvironmentsStore {
 
   addGlobalEnvironment({ uid, name, variables = [] }) {
     let globalEnvironments = this.getGlobalEnvironments();
-    const existingEnvironment = globalEnvironments.find(env => env?.name == name);
+    const existingEnvironment = globalEnvironments.find((env) => env?.name == name);
     if (existingEnvironment) {
       throw new Error('Environment with the same name already exists');
     }
@@ -113,27 +113,26 @@ class GlobalEnvironmentsStore {
 
   saveGlobalEnvironment({ environmentUid: globalEnvironmentUid, variables }) {
     let globalEnvironments = this.getGlobalEnvironments();
-    const environment = globalEnvironments.find(env => env?.uid == globalEnvironmentUid);
-    globalEnvironments = globalEnvironments.filter(env => env?.uid !== globalEnvironmentUid);
+    const environment = globalEnvironments.find((env) => env?.uid == globalEnvironmentUid);
+    globalEnvironments = globalEnvironments.filter((env) => env?.uid !== globalEnvironmentUid);
     if (environment) {
       environment.variables = variables;
     }
     globalEnvironments.push(environment);
     this.setGlobalEnvironments(globalEnvironments);
-
   }
-  
+
   renameGlobalEnvironment({ environmentUid: globalEnvironmentUid, name }) {
     let globalEnvironments = this.getGlobalEnvironments();
-    const environment = globalEnvironments.find(env => env?.uid == globalEnvironmentUid);
-    globalEnvironments = globalEnvironments.filter(env => env?.uid !== globalEnvironmentUid);
+    const environment = globalEnvironments.find((env) => env?.uid == globalEnvironmentUid);
+    globalEnvironments = globalEnvironments.filter((env) => env?.uid !== globalEnvironmentUid);
     if (environment) {
       environment.name = name;
     }
     globalEnvironments.push(environment);
     this.setGlobalEnvironments(globalEnvironments);
   }
-  
+
   copyGlobalEnvironment({ uid, name, variables }) {
     let globalEnvironments = this.getGlobalEnvironments();
     globalEnvironments.push({
@@ -143,26 +142,26 @@ class GlobalEnvironmentsStore {
     });
     this.setGlobalEnvironments(globalEnvironments);
   }
-  
+
   selectGlobalEnvironment({ environmentUid: globalEnvironmentUid }) {
     let globalEnvironments = this.getGlobalEnvironments();
-    const environment = globalEnvironments.find(env => env?.uid == globalEnvironmentUid);
+    const environment = globalEnvironments.find((env) => env?.uid == globalEnvironmentUid);
     if (environment) {
       this.setActiveGlobalEnvironmentUid(globalEnvironmentUid);
     } else {
       this.setActiveGlobalEnvironmentUid(null);
     }
   }
-  
+
   deleteGlobalEnvironment({ environmentUid }) {
     let globalEnvironments = this.getGlobalEnvironments();
     let activeGlobalEnvironmentUid = this.getActiveGlobalEnvironmentUid();
-    globalEnvironments = globalEnvironments.filter(env => env?.uid !== environmentUid);
+    globalEnvironments = globalEnvironments.filter((env) => env?.uid !== environmentUid);
     if (environmentUid == activeGlobalEnvironmentUid) {
-      this.setActiveGlobalEnvironmentUid(null); 
+      this.setActiveGlobalEnvironmentUid(null);
     }
     this.setGlobalEnvironments(globalEnvironments);
-  }  
+  }
 }
 
 const globalEnvironmentsStore = new GlobalEnvironmentsStore();
diff --git a/packages/bruno-electron/src/store/last-opened-collections.js b/packages/bruno-electron/src/store/last-opened-collections.js
index 8705e9dfd..ca5423605 100644
--- a/packages/bruno-electron/src/store/last-opened-collections.js
+++ b/packages/bruno-electron/src/store/last-opened-collections.js
@@ -14,7 +14,7 @@ class LastOpenedCollections {
 
   getAll() {
     let collections = this.store.get('lastOpenedCollections') || [];
-    collections = collections.map(collection => path.resolve(collection));
+    collections = collections.map((collection) => path.resolve(collection));
     return collections;
   }
 
diff --git a/packages/bruno-electron/src/store/last-opened-workspaces.js b/packages/bruno-electron/src/store/last-opened-workspaces.js
new file mode 100644
index 000000000..4242cda97
--- /dev/null
+++ b/packages/bruno-electron/src/store/last-opened-workspaces.js
@@ -0,0 +1,49 @@
+const Store = require('electron-store');
+const { generateUidBasedOnHash } = require('../utils/common');
+
+const MAX_WORKSPACES = 10;
+
+class LastOpenedWorkspaces {
+  constructor() {
+    this.store = new Store({
+      name: 'preferences',
+      defaults: {}
+    });
+  }
+
+  getAll() {
+    return this.store.get('workspaces.lastOpenedWorkspaces', []);
+  }
+
+  add(workspacePath, workspaceConfig) {
+    const workspaces = this.getAll();
+
+    const workspaceUid = generateUidBasedOnHash(workspacePath);
+
+    const filteredWorkspaces = workspaces.filter((w) => w.uid !== workspaceUid);
+
+    const workspaceEntry = {
+      ...workspaceConfig,
+      uid: workspaceUid,
+      name: workspaceConfig.name,
+      lastOpened: new Date().toISOString(),
+      pathname: workspacePath
+    };
+
+    filteredWorkspaces.unshift(workspaceEntry);
+
+    const limitedWorkspaces = filteredWorkspaces.slice(0, MAX_WORKSPACES);
+
+    this.store.set('workspaces.lastOpenedWorkspaces', limitedWorkspaces);
+    return limitedWorkspaces;
+  }
+
+  remove(workspaceUid) {
+    const workspaces = this.getAll();
+    const filteredWorkspaces = workspaces.filter((w) => w.uid !== workspaceUid);
+    this.store.set('workspaces.lastOpenedWorkspaces', filteredWorkspaces);
+    return filteredWorkspaces;
+  }
+}
+
+module.exports = LastOpenedWorkspaces;
diff --git a/packages/bruno-electron/src/store/oauth2.js b/packages/bruno-electron/src/store/oauth2.js
index d85573bc8..41522e37d 100644
--- a/packages/bruno-electron/src/store/oauth2.js
+++ b/packages/bruno-electron/src/store/oauth2.js
@@ -117,7 +117,7 @@ class Oauth2Store {
   getCredentialsForCollection({ collectionUid, url, credentialsId }) {
     try {
       let oauth2DataForCollection = this.getOauth2DataOfCollection({ collectionUid, url });
-      let credentials = oauth2DataForCollection?.credentials?.find(c => (c?.url == url) && (c?.credentialsId == credentialsId));
+      let credentials = oauth2DataForCollection?.credentials?.find((c) => (c?.url == url) && (c?.credentialsId == credentialsId));
       if (!credentials?.data) return null;
       const decryptionResult = decryptStringSafe(credentials?.data);
       const decryptedCredentialsData = safeParseJSON(decryptionResult.value);
@@ -132,7 +132,7 @@ class Oauth2Store {
       const encryptionResult = encryptStringSafe(safeStringifyJSON(credentials));
       const encryptedCredentialsData = encryptionResult.value;
       let oauth2DataForCollection = this.getOauth2DataOfCollection({ collectionUid, url });
-      let filteredCredentials = oauth2DataForCollection?.credentials?.filter(c => (c?.url !== url) || (c?.credentialsId !== credentialsId));
+      let filteredCredentials = oauth2DataForCollection?.credentials?.filter((c) => (c?.url !== url) || (c?.credentialsId !== credentialsId));
       if (!filteredCredentials) filteredCredentials = [];
       filteredCredentials.push({
         url,
@@ -153,7 +153,7 @@ class Oauth2Store {
   clearCredentialsForCollection({ collectionUid, url, credentialsId }) {
     try {
       let oauth2DataForCollection = this.getOauth2DataOfCollection({ collectionUid, url });
-      let filteredCredentials = oauth2DataForCollection?.credentials?.filter(c => (c?.url !== url) || (c?.credentialsId !== credentialsId));
+      let filteredCredentials = oauth2DataForCollection?.credentials?.filter((c) => (c?.url !== url) || (c?.credentialsId !== credentialsId));
       let newOauth2DataForCollection = {
         ...oauth2DataForCollection,
         credentials: filteredCredentials
diff --git a/packages/bruno-electron/src/store/preferences.js b/packages/bruno-electron/src/store/preferences.js
index f904b957c..36d40fca5 100644
--- a/packages/bruno-electron/src/store/preferences.js
+++ b/packages/bruno-electron/src/store/preferences.js
@@ -24,7 +24,7 @@ const defaultPreferences = {
   },
   font: {
     codeFont: 'default',
-    codeFontSize: 14
+    codeFontSize: 13
   },
   proxy: {
     mode: 'off',
@@ -41,14 +41,16 @@ const defaultPreferences = {
   layout: {
     responsePaneOrientation: 'horizontal'
   },
-  beta: {
-    nodevm: false
-  },
+  beta: {},
   onboarding: {
     hasLaunchedBefore: false
   },
   general: {
     defaultCollectionLocation: ''
+  },
+  autoSave: {
+    enabled: false,
+    interval: 1000
   }
 };
 
@@ -86,13 +88,16 @@ const preferencesSchema = Yup.object().shape({
     responsePaneOrientation: Yup.string().oneOf(['horizontal', 'vertical'])
   }),
   beta: Yup.object({
-    nodevm: Yup.boolean()
   }),
   onboarding: Yup.object({
     hasLaunchedBefore: Yup.boolean()
   }),
   general: Yup.object({
     defaultCollectionLocation: Yup.string().max(1024).nullable()
+  }),
+  autoSave: Yup.object({
+    enabled: Yup.boolean(),
+    interval: Yup.number().min(100)
   })
 });
 
@@ -120,6 +125,28 @@ class PreferencesStore {
       delete preferences.proxy.enabled;
     }
 
+    // Migrate font size from 14px to 13px for existing users
+    // Only migrate once if codeFont is 'default' (or not set) and codeFontSize is 14
+    // This ensures the migration only happens once and doesn't override user's explicit choices
+    // If user explicitly sets it to 14px after migration, it won't be migrated again
+    const fontSizeMigrated = get(preferences, '_migrations.codeFontSize14to13', false);
+    if (!fontSizeMigrated) {
+      const codeFont = get(preferences, 'font.codeFont', 'default');
+      const codeFontSize = get(preferences, 'font.codeFontSize');
+
+      // Only migrate if it's the old default combination (codeFont is default and size is 14)
+      if (codeFont === 'default' && codeFontSize === 14) {
+        preferences.font.codeFontSize = 13;
+        // Mark migration as complete
+        if (!preferences._migrations) {
+          preferences._migrations = {};
+        }
+        preferences._migrations.codeFontSize14to13 = true;
+        // Save the migrated preferences back to the store
+        this.store.set('preferences', preferences);
+      }
+    }
+
     return merge({}, defaultPreferences, preferences);
   }
 
diff --git a/packages/bruno-electron/src/store/ui-state-snapshot.js b/packages/bruno-electron/src/store/ui-state-snapshot.js
index a130c36de..565b952ab 100644
--- a/packages/bruno-electron/src/store/ui-state-snapshot.js
+++ b/packages/bruno-electron/src/store/ui-state-snapshot.js
@@ -19,7 +19,7 @@ class UiStateSnapshotStore {
   getCollectionByPathname({ pathname }) {
     let collections = this.getCollections();
 
-    let collection = collections.find(c => c?.pathname === pathname);
+    let collection = collections.find((c) => c?.pathname === pathname);
     if (!collection) {
       collection = { pathname };
       collections.push(collection);
@@ -32,7 +32,7 @@ class UiStateSnapshotStore {
   setCollectionByPathname({ collection }) {
     let collections = this.getCollections();
 
-    collections = collections.filter(c => c?.pathname !== collection.pathname);
+    collections = collections.filter((c) => c?.pathname !== collection.pathname);
     collections.push({ ...collection });
     this.saveCollections(collections);
 
@@ -46,7 +46,7 @@ class UiStateSnapshotStore {
   }
 
   update({ type, data }) {
-    switch(type) {
+    switch (type) {
       case 'COLLECTION_ENVIRONMENT':
         const { collectionPath, environmentName } = data;
         this.updateCollectionEnvironment({ collectionPath, environmentName });
diff --git a/packages/bruno-electron/src/store/workspace-environments.js b/packages/bruno-electron/src/store/workspace-environments.js
new file mode 100644
index 000000000..0d5c7b74a
--- /dev/null
+++ b/packages/bruno-electron/src/store/workspace-environments.js
@@ -0,0 +1,363 @@
+const fs = require('fs');
+const path = require('path');
+const _ = require('lodash');
+const yaml = require('js-yaml');
+const { parseEnvironment, stringifyEnvironment } = require('@usebruno/filestore');
+const { writeFile, createDirectory } = require('../utils/filesystem');
+const { generateUidBasedOnHash, uuid } = require('../utils/common');
+const { decryptStringSafe } = require('../utils/encryption');
+const EnvironmentSecretsStore = require('./env-secrets');
+
+const environmentSecretsStore = new EnvironmentSecretsStore();
+
+const ENV_FILE_EXTENSION = '.yml';
+
+class GlobalEnvironmentsManager {
+  constructor() {}
+
+  envHasSecrets(environment) {
+    const secrets = _.filter(environment.variables, (v) => v.secret === true);
+    return secrets && secrets.length > 0;
+  }
+
+  getEnvironmentsDir(workspacePath) {
+    return path.join(workspacePath, 'environments');
+  }
+
+  getEnvironmentFilePath(workspacePath, environmentName) {
+    return path.join(this.getEnvironmentsDir(workspacePath), `${environmentName}${ENV_FILE_EXTENSION}`);
+  }
+
+  findEnvironmentFileByUid(workspacePath, environmentUid) {
+    const environmentsDir = this.getEnvironmentsDir(workspacePath);
+
+    if (!fs.existsSync(environmentsDir)) {
+      return null;
+    }
+
+    const files = fs.readdirSync(environmentsDir);
+
+    for (const file of files) {
+      if (file.endsWith(ENV_FILE_EXTENSION)) {
+        const filePath = path.join(environmentsDir, file);
+        const fileUid = generateUidBasedOnHash(filePath);
+        if (fileUid === environmentUid) {
+          return {
+            filePath,
+            fileName: file,
+            name: file.slice(0, -ENV_FILE_EXTENSION.length)
+          };
+        }
+      }
+    }
+
+    return null;
+  }
+
+  async parseEnvironmentFile(filePath, workspacePath) {
+    const content = fs.readFileSync(filePath, 'utf8');
+    const environment = await parseEnvironment(content, { format: 'yml' });
+
+    const fileName = path.basename(filePath);
+    environment.name = fileName.slice(0, -ENV_FILE_EXTENSION.length);
+    environment.uid = generateUidBasedOnHash(filePath);
+
+    _.each(environment.variables, (variable) => {
+      if (!variable.uid) {
+        variable.uid = uuid();
+      }
+    });
+
+    if (this.envHasSecrets(environment)) {
+      const envSecrets = environmentSecretsStore.getEnvSecrets(workspacePath, environment);
+      _.each(envSecrets, (secret) => {
+        const variable = _.find(environment.variables, (v) => v.name === secret.name);
+        if (variable && secret.value) {
+          const decryptionResult = decryptStringSafe(secret.value);
+          variable.value = decryptionResult.value;
+        }
+      });
+    }
+
+    return environment;
+  }
+
+  async getGlobalEnvironments(workspacePath) {
+    try {
+      if (!workspacePath) {
+        throw new Error('Workspace path is required');
+      }
+
+      const environmentsDir = this.getEnvironmentsDir(workspacePath);
+
+      if (!fs.existsSync(environmentsDir)) {
+        return {
+          globalEnvironments: [],
+          activeGlobalEnvironmentUid: null
+        };
+      }
+
+      const files = fs.readdirSync(environmentsDir);
+      const environments = [];
+
+      for (const file of files) {
+        if (file.endsWith(ENV_FILE_EXTENSION)) {
+          const filePath = path.join(environmentsDir, file);
+
+          try {
+            const environment = await this.parseEnvironmentFile(filePath, workspacePath);
+            environments.push(environment);
+          } catch (parseError) {
+            console.error(`Failed to parse environment file ${file}:`, parseError);
+          }
+        }
+      }
+
+      const activeGlobalEnvironmentUid = await this.getActiveGlobalEnvironmentUid(workspacePath);
+
+      return {
+        globalEnvironments: environments,
+        activeGlobalEnvironmentUid
+      };
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  async getActiveGlobalEnvironmentUid(workspacePath) {
+    try {
+      if (!workspacePath) {
+        return null;
+      }
+
+      const workspaceFilePath = path.join(workspacePath, 'workspace.yml');
+
+      if (!fs.existsSync(workspaceFilePath)) {
+        return null;
+      }
+
+      const yamlContent = fs.readFileSync(workspaceFilePath, 'utf8');
+      const workspaceConfig = yaml.load(yamlContent);
+
+      return workspaceConfig.activeEnvironmentUid || null;
+    } catch (error) {
+      return null;
+    }
+  }
+
+  async setActiveGlobalEnvironmentUid(workspacePath, environmentUid) {
+    try {
+      if (!workspacePath) {
+        throw new Error('Workspace path is required');
+      }
+
+      const workspaceFilePath = path.join(workspacePath, 'workspace.yml');
+
+      if (!fs.existsSync(workspaceFilePath)) {
+        throw new Error('Invalid workspace: workspace.yml not found');
+      }
+
+      const yamlContent = fs.readFileSync(workspaceFilePath, 'utf8');
+      const workspaceConfig = yaml.load(yamlContent);
+
+      workspaceConfig.activeEnvironmentUid = environmentUid;
+
+      const yamlOutput = yaml.dump(workspaceConfig, {
+        indent: 2,
+        lineWidth: -1,
+        noRefs: true
+      });
+
+      await writeFile(workspaceFilePath, yamlOutput);
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  async createGlobalEnvironment(workspacePath, { uid, name, variables }) {
+    try {
+      if (!workspacePath) {
+        throw new Error('Workspace path is required');
+      }
+
+      const environmentsDir = this.getEnvironmentsDir(workspacePath);
+
+      if (!fs.existsSync(environmentsDir)) {
+        await createDirectory(environmentsDir);
+      }
+
+      const environmentFilePath = this.getEnvironmentFilePath(workspacePath, name);
+
+      if (fs.existsSync(environmentFilePath)) {
+        throw new Error(`Environment "${name}" already exists`);
+      }
+
+      const environment = {
+        name: name,
+        variables: variables || []
+      };
+
+      if (this.envHasSecrets(environment)) {
+        environmentSecretsStore.storeEnvSecrets(workspacePath, environment);
+      }
+
+      const content = await stringifyEnvironment(environment, { format: 'yml' });
+      await writeFile(environmentFilePath, content);
+
+      return {
+        uid: generateUidBasedOnHash(environmentFilePath),
+        name,
+        variables
+      };
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  async saveGlobalEnvironment(workspacePath, { environmentUid, variables }) {
+    try {
+      if (!workspacePath) {
+        throw new Error('Workspace path is required');
+      }
+
+      const envFile = this.findEnvironmentFileByUid(workspacePath, environmentUid);
+
+      if (!envFile) {
+        throw new Error(`Environment file not found for uid: ${environmentUid}`);
+      }
+
+      const environment = {
+        name: envFile.name,
+        variables: variables
+      };
+
+      if (this.envHasSecrets(environment)) {
+        environmentSecretsStore.storeEnvSecrets(workspacePath, environment);
+      }
+
+      const content = await stringifyEnvironment(environment, { format: 'yml' });
+      await writeFile(envFile.filePath, content);
+
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  async renameGlobalEnvironment(workspacePath, { environmentUid, name: newName }) {
+    try {
+      if (!workspacePath) {
+        throw new Error('Workspace path is required');
+      }
+
+      const envFile = this.findEnvironmentFileByUid(workspacePath, environmentUid);
+
+      if (!envFile) {
+        throw new Error(`Environment file not found for uid: ${environmentUid}`);
+      }
+
+      const newFilePath = this.getEnvironmentFilePath(workspacePath, newName);
+
+      if (fs.existsSync(newFilePath) && newFilePath !== envFile.filePath) {
+        throw new Error(`Environment "${newName}" already exists`);
+      }
+
+      const environment = await this.parseEnvironmentFile(envFile.filePath, workspacePath);
+      const oldName = environment.name;
+      environment.name = newName;
+
+      const content = await stringifyEnvironment(environment, { format: 'yml' });
+      await writeFile(newFilePath, content);
+
+      if (this.envHasSecrets(environment)) {
+        const oldEnv = { name: oldName };
+        const secrets = environmentSecretsStore.getEnvSecrets(workspacePath, oldEnv);
+
+        if (secrets && secrets.length > 0) {
+          const newEnv = { name: newName, variables: environment.variables };
+          environmentSecretsStore.storeEnvSecrets(workspacePath, newEnv);
+        }
+      }
+
+      if (envFile.filePath !== newFilePath) {
+        fs.unlinkSync(envFile.filePath);
+      }
+
+      const newUid = generateUidBasedOnHash(newFilePath);
+      return { uid: newUid, name: newName };
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  async deleteGlobalEnvironment(workspacePath, { environmentUid }) {
+    try {
+      if (!workspacePath) {
+        throw new Error('Workspace path is required');
+      }
+
+      const envFile = this.findEnvironmentFileByUid(workspacePath, environmentUid);
+
+      if (!envFile) {
+        throw new Error(`Environment file not found for uid: ${environmentUid}`);
+      }
+
+      fs.unlinkSync(envFile.filePath);
+
+      const activeGlobalEnvironmentUid = await this.getActiveGlobalEnvironmentUid(workspacePath);
+      if (activeGlobalEnvironmentUid === environmentUid) {
+        await this.setActiveGlobalEnvironmentUid(workspacePath, null);
+      }
+
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  async selectGlobalEnvironment(workspacePath, { environmentUid }) {
+    try {
+      if (!workspacePath) {
+        throw new Error('Workspace path is required');
+      }
+
+      await this.setActiveGlobalEnvironmentUid(workspacePath, environmentUid);
+      return true;
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  async getGlobalEnvironmentsByPath(workspacePath) {
+    return this.getGlobalEnvironments(workspacePath);
+  }
+
+  async addGlobalEnvironmentByPath(workspacePath, params) {
+    return this.createGlobalEnvironment(workspacePath, params);
+  }
+
+  async saveGlobalEnvironmentByPath(workspacePath, params) {
+    return this.saveGlobalEnvironment(workspacePath, params);
+  }
+
+  async renameGlobalEnvironmentByPath(workspacePath, params) {
+    return this.renameGlobalEnvironment(workspacePath, params);
+  }
+
+  async deleteGlobalEnvironmentByPath(workspacePath, params) {
+    return this.deleteGlobalEnvironment(workspacePath, params);
+  }
+
+  async selectGlobalEnvironmentByPath(workspacePath, params) {
+    return this.selectGlobalEnvironment(workspacePath, params);
+  }
+}
+
+const globalEnvironmentsManager = new GlobalEnvironmentsManager();
+
+module.exports = {
+  globalEnvironmentsManager,
+  GlobalEnvironmentsManager,
+  ENV_FILE_EXTENSION
+};
diff --git a/packages/bruno-electron/src/utils/collection-import.js b/packages/bruno-electron/src/utils/collection-import.js
index 4207a5d23..9f3b5f11e 100644
--- a/packages/bruno-electron/src/utils/collection-import.js
+++ b/packages/bruno-electron/src/utils/collection-import.js
@@ -11,18 +11,18 @@ const { stringifyRequestViaWorker, stringifyCollection, stringifyEnvironment, st
 async function findUniqueFolderName(baseName, collectionLocation, counter = 0) {
   const folderName = counter === 0 ? baseName : `${baseName} - ${counter}`;
   const collectionPath = path.join(collectionLocation, sanitizeName(folderName));
-  
+
   if (fs.existsSync(collectionPath)) {
     return findUniqueFolderName(baseName, collectionLocation, counter + 1);
   }
-  
+
   return folderName;
 }
 
 /**
  * Import a collection - shared logic used by both IPC handler and onboarding service
  */
-async function importCollection(collection, collectionLocation, mainWindow, lastOpenedCollections, uniqueFolderName = null) {
+async function importCollection(collection, collectionLocation, mainWindow, uniqueFolderName = null, format = 'bru') {
   // Use provided unique folder name or use collection name
   let folderName = uniqueFolderName ? sanitizeName(uniqueFolderName) : sanitizeName(collection.name);
   let collectionPath = path.join(collectionLocation, folderName);
@@ -35,8 +35,8 @@ async function importCollection(collection, collectionLocation, mainWindow, last
   const parseCollectionItems = async (items = [], currentPath) => {
     for (const item of items) {
       if (['http-request', 'graphql-request', 'grpc-request'].includes(item.type)) {
-        let sanitizedFilename = sanitizeName(item.filename || `${item.name}.bru`);
-        const content = await stringifyRequestViaWorker(item);
+        let sanitizedFilename = sanitizeName(item.filename || `${item.name}.${format}`);
+        const content = await stringifyRequestViaWorker(item, { format });
         const filePath = path.join(currentPath, sanitizedFilename);
         safeWriteFileSync(filePath, content);
       }
@@ -46,10 +46,10 @@ async function importCollection(collection, collectionLocation, mainWindow, last
         fs.mkdirSync(folderPath);
 
         if (item.root?.meta?.name) {
-          const folderBruFilePath = path.join(folderPath, 'folder.bru');
+          const folderFilePath = path.join(folderPath, `folder.${format}`);
           item.root.meta.seq = item.seq;
-          const folderContent = await stringifyFolder(item.root);
-          safeWriteFileSync(folderBruFilePath, folderContent);
+          const folderContent = await stringifyFolder(item.root, { format });
+          safeWriteFileSync(folderFilePath, folderContent);
         }
 
         if (item.items && item.items.length) {
@@ -72,8 +72,8 @@ async function importCollection(collection, collectionLocation, mainWindow, last
     }
 
     for (const env of environments) {
-      const content = await stringifyEnvironment(env);
-      let sanitizedEnvFilename = sanitizeName(`${env.name}.bru`);
+      const content = await stringifyEnvironment(env, { format });
+      let sanitizedEnvFilename = sanitizeName(`${env.name}.${format}`);
       const filePath = path.join(envDirPath, sanitizedEnvFilename);
       safeWriteFileSync(filePath, content);
     }
@@ -98,13 +98,19 @@ async function importCollection(collection, collectionLocation, mainWindow, last
 
   const uid = generateUidBasedOnHash(collectionPath);
   let brunoConfig = getBrunoJsonConfig(collection);
-  const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
 
-  // Write the Bruno configuration to a file
-  await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
+  if (format === 'yml') {
+    const collectionContent = await stringifyCollection(collection.root, { format });
+    await writeFile(path.join(collectionPath, 'opencollection.yml'), collectionContent);
+  } else if (format === 'bru') {
+    const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
+    await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
 
-  const collectionContent = await stringifyCollection(collection.root);
-  await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
+    const collectionContent = await stringifyCollection(collection.root, { format });
+    await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
+  } else {
+    throw new Error(`Invalid format: ${format}`);
+  }
 
   const { size, filesCount } = await getCollectionStats(collectionPath);
   brunoConfig.size = size;
@@ -113,8 +119,6 @@ async function importCollection(collection, collectionLocation, mainWindow, last
   mainWindow.webContents.send('main:collection-opened', collectionPath, uid, brunoConfig);
   ipcMain.emit('main:collection-opened', mainWindow, collectionPath, uid, brunoConfig);
 
-  lastOpenedCollections.add(collectionPath);
-
   // create folder and files based on collection
   await parseCollectionItems(collection.items, collectionPath);
   await parseEnvironments(collection.environments, collectionPath);
diff --git a/packages/bruno-electron/src/utils/collection.js b/packages/bruno-electron/src/utils/collection.js
index d60e55bd5..b123736c7 100644
--- a/packages/bruno-electron/src/utils/collection.js
+++ b/packages/bruno-electron/src/utils/collection.js
@@ -87,7 +87,7 @@ const mergeVars = (collection, request, requestTreePath = []) => {
   request.folderVariables = folderVariables;
   request.requestVariables = requestVariables;
 
-  if(request?.vars) {
+  if (request?.vars) {
     request.vars.req = Array.from(reqVars, ([name, value]) => ({
       name,
       value,
@@ -95,41 +95,24 @@ const mergeVars = (collection, request, requestTreePath = []) => {
       type: 'request'
     }));
   }
+};
 
-  let resVars = new Map();
-  let collectionResponseVars = get(collectionRoot, 'request.vars.res', []);
-  collectionResponseVars.forEach((_var) => {
-    if (_var.enabled) {
-      resVars.set(_var.name, _var.value);
-    }
-  });
-  for (let i of requestTreePath) {
-    if (i.type === 'folder') {
-      const folderRoot = i?.draft || i?.root;
-      let vars = get(folderRoot, 'request.vars.res', []);
-      vars.forEach((_var) => {
-        if (_var.enabled) {
-          resVars.set(_var.name, _var.value);
-        }
-      });
-    } else {
-      const vars = i?.draft ? get(i, 'draft.request.vars.res', []) : get(i, 'request.vars.res', []);
-      vars.forEach((_var) => {
-        if (_var.enabled) {
-          resVars.set(_var.name, _var.value);
-        }
-      });
-    }
+/**
+ * Wraps a script in an IIFE closure to isolate its scope
+ * @param {string} script - The script code to wrap
+ * @returns {string} The wrapped script
+ */
+const wrapScriptInClosure = (script) => {
+  if (!script || script.trim() === '') {
+    return '';
   }
 
-  if(request?.vars) {
-    request.vars.res = Array.from(resVars, ([name, value]) => ({
-      name,
-      value,
-      enabled: true,
-      type: 'response'
-    }));
-  }
+  // Wrap script in async IIFE to create isolated scope
+  // This prevents variable re-declaration errors and allows early returns
+  // to only affect the current script segment
+  return `await (async () => {
+${script}
+})();`;
 };
 
 const mergeScripts = (collection, request, requestTreePath, scriptFlow) => {
@@ -161,18 +144,51 @@ const mergeScripts = (collection, request, requestTreePath, scriptFlow) => {
     }
   }
 
-  request.script.req = compact([collectionPreReqScript, ...combinedPreReqScript, request?.script?.req || '']).join(os.EOL);
+  // Wrap each script segment in its own closure and join them
+  // This allows each script to run separately with its own scope,
+  // preventing variable re-declaration errors and allowing early returns
+  // to only affect that specific script segment
+  const preReqScripts = [
+    collectionPreReqScript,
+    ...combinedPreReqScript,
+    request?.script?.req || ''
+  ];
+  request.script.req = compact(preReqScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
 
+  // Handle post-response scripts based on scriptFlow
   if (scriptFlow === 'sequential') {
-    request.script.res = compact([collectionPostResScript, ...combinedPostResScript, request?.script?.res || '']).join(os.EOL);
+    const postResScripts = [
+      collectionPostResScript,
+      ...combinedPostResScript,
+      request?.script?.res || ''
+    ];
+    request.script.res = compact(postResScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
   } else {
-    request.script.res = compact([request?.script?.res || '', ...combinedPostResScript.reverse(), collectionPostResScript]).join(os.EOL);
+    // Reverse order for non-sequential flow
+    const postResScripts = [
+      request?.script?.res || '',
+      ...[...combinedPostResScript].reverse(),
+      collectionPostResScript
+    ];
+    request.script.res = compact(postResScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
   }
 
+  // Handle tests based on scriptFlow
   if (scriptFlow === 'sequential') {
-    request.tests = compact([collectionTests, ...combinedTests, request?.tests || '']).join(os.EOL);
+    const testScripts = [
+      collectionTests,
+      ...combinedTests,
+      request?.tests || ''
+    ];
+    request.tests = compact(testScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
   } else {
-    request.tests = compact([request?.tests || '', ...combinedTests.reverse(), collectionTests]).join(os.EOL);
+    // Reverse order for non-sequential flow
+    const testScripts = [
+      request?.tests || '',
+      ...[...combinedTests].reverse(),
+      collectionTests
+    ];
+    request.tests = compact(testScripts.map(wrapScriptInClosure)).join(os.EOL + os.EOL);
   }
 };
 
@@ -238,8 +254,8 @@ const parseBruFileMeta = (data) => {
       const metaContent = match[1].trim();
       const lines = metaContent.replace(/\r\n/g, '\n').split('\n');
       const metaJson = {};
-      lines.forEach(line => {
-        const [key, value] = line.split(':').map(str => str.trim());
+      lines.forEach((line) => {
+        const [key, value] = line.split(':').map((str) => str.trim());
         if (key && value) {
           metaJson[key] = isNaN(value) ? value : Number(value);
         }
@@ -286,7 +302,68 @@ const parseBruFileMeta = (data) => {
     console.error('Error reading file:', err);
     return null;
   }
-}
+};
+
+// Parse YML file meta information
+const parseYmlFileMeta = (data) => {
+  try {
+    const yaml = require('js-yaml');
+    const parsed = yaml.load(data);
+
+    if (!parsed || !parsed.meta) {
+      console.log('No "meta" section found in YAML file.');
+      return null;
+    }
+
+    const metaJson = parsed.meta;
+
+    // Transform to the format expected by bruno-app
+    let requestType = metaJson.type;
+    const typeMap = {
+      http: 'http-request',
+      graphql: 'graphql-request',
+      grpc: 'grpc-request',
+      ws: 'ws-request'
+    };
+    requestType = typeMap[requestType] || 'http-request';
+
+    const sequence = metaJson.seq;
+    const transformedJson = {
+      type: requestType,
+      name: metaJson.name,
+      seq: !isNaN(sequence) ? Number(sequence) : 1,
+      settings: {},
+      tags: metaJson.tags || [],
+      request: {
+        method: '',
+        url: '',
+        params: [],
+        headers: [],
+        auth: { mode: 'none' },
+        body: { mode: 'none' },
+        script: {},
+        vars: {},
+        assertions: [],
+        tests: '',
+        docs: ''
+      }
+    };
+
+    return transformedJson;
+  } catch (err) {
+    console.error('Error parsing YAML file meta:', err);
+    return null;
+  }
+};
+
+// Format-aware meta parsing function
+const parseFileMeta = (data, format = 'bru') => {
+  if (format === 'yml') {
+    return parseYmlFileMeta(data);
+  } else {
+    return parseBruFileMeta(data);
+  }
+};
 
 const hydrateRequestWithUuid = (request, pathname) => {
   request.uid = getRequestUid(pathname);
@@ -375,7 +452,7 @@ const transformRequestToSaveToFilesystem = (item) => {
   if (_item.type === 'grpc-request') {
     itemToSave.request.methodType = _item.request.methodType;
     itemToSave.request.protoPath = _item.request.protoPath;
-    delete itemToSave.request.params
+    delete itemToSave.request.params;
   }
 
   // Only process params for non-gRPC requests
@@ -412,7 +489,7 @@ const transformRequestToSaveToFilesystem = (item) => {
   if (itemToSave.request.body.mode === 'grpc') {
     itemToSave.request.body = {
       ...itemToSave.request.body,
-      grpc: itemToSave.request.body.grpc.map(({name, content}, index) => ({
+      grpc: itemToSave.request.body.grpc.map(({ name, content }, index) => ({
         name: name ? name : `message ${index + 1}`,
         content: replaceTabsWithSpaces(content)
       }))
@@ -420,7 +497,7 @@ const transformRequestToSaveToFilesystem = (item) => {
   }
 
   return itemToSave;
-}
+};
 
 const sortCollection = (collection) => {
   const items = collection.items || [];
@@ -526,7 +603,7 @@ const mergeAuth = (collection, request, requestTreePath) => {
   // If request is set to inherit, use the effective auth from collection/folders
   if (request.auth.mode === 'inherit') {
     request.auth = effectiveAuth;
-    
+
     // For OAuth2, we need to handle credentials properly
     if (effectiveAuth.mode === 'oauth2') {
       if (lastFolderWithAuth) {
@@ -576,17 +653,17 @@ const resolveInheritedSettings = (settings) => {
   return resolvedSettings;
 };
 
-const sortByNameThenSequence = items => {
-  const isSeqValid = seq => Number.isFinite(seq) && Number.isInteger(seq) && seq > 0;
+const sortByNameThenSequence = (items) => {
+  const isSeqValid = (seq) => Number.isFinite(seq) && Number.isInteger(seq) && seq > 0;
 
   // Sort folders alphabetically by name
   const alphabeticallySorted = [...items].sort((a, b) => a.name && b.name && a.name.localeCompare(b.name));
 
   // Extract folders without 'seq'
-  const withoutSeq = alphabeticallySorted.filter(f => !isSeqValid(f['seq']));
+  const withoutSeq = alphabeticallySorted.filter((f) => !isSeqValid(f['seq']));
 
   // Extract folders with 'seq' and sort them by 'seq'
-  const withSeq = alphabeticallySorted.filter(f => isSeqValid(f['seq'])).sort((a, b) => a.seq - b.seq);
+  const withSeq = alphabeticallySorted.filter((f) => isSeqValid(f['seq'])).sort((a, b) => a.seq - b.seq);
 
   const sortedItems = withoutSeq;
 
@@ -605,7 +682,7 @@ const sortByNameThenSequence = items => {
       const newGroup = Array.isArray(existingItem)
         ? [...existingItem, item]
         : [existingItem, item];
-      
+
       withoutSeq.splice(position, 1, newGroup);
     } else {
       // Insert item at the specified position
@@ -631,6 +708,7 @@ module.exports = {
   findParentItemInCollection,
   findParentItemInCollectionByPathname,
   parseBruFileMeta,
+  parseFileMeta,
   hydrateRequestWithUuid,
   transformRequestToSaveToFilesystem,
   sortCollection,
@@ -640,4 +718,4 @@ module.exports = {
   getFormattedCollectionOauth2Credentials,
   sortByNameThenSequence,
   resolveInheritedSettings
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-electron/src/utils/common.js b/packages/bruno-electron/src/utils/common.js
index a855e5523..bb8c119b4 100644
--- a/packages/bruno-electron/src/utils/common.js
+++ b/packages/bruno-electron/src/utils/common.js
@@ -1,6 +1,8 @@
 const { customAlphabet } = require('nanoid');
 const iconv = require('iconv-lite');
 const { cloneDeep } = require('lodash');
+const FormData = require('form-data');
+const { formatMultipartData } = require('./form-data');
 
 // a customized version of nanoid without using _ and -
 const uuid = () => {
@@ -30,8 +32,8 @@ const parseJson = async (obj) => {
 const getCircularReplacer = () => {
   const seen = new WeakSet();
   return (key, value) => {
-    if (typeof value === "object" && value !== null) {
-      if (seen.has(value)) return "[Circular]";
+    if (typeof value === 'object' && value !== null) {
+      if (seen.has(value)) return '[Circular]';
       seen.add(value);
     }
     return value;
@@ -128,7 +130,18 @@ const parseDataFromResponse = (response, disableParsingResponseJson = false) =>
 };
 
 const parseDataFromRequest = (request) => {
-  const requestDataString = request.mode == 'file'? "<request body redacted>": (typeof request?.data === 'string' ? request?.data : safeStringifyJSON(request?.data));
+  let requestDataString;
+
+  // File uploads are redacted, multipart FormData is formatted from original data for readability, and other types are stringified as-is.
+  if (request.mode === 'file') {
+    requestDataString = '<request body redacted>';
+  } else if (request?.data instanceof FormData && Array.isArray(request._originalMultipartData)) {
+    const boundary = request.data._boundary || 'boundary';
+    requestDataString = formatMultipartData(request._originalMultipartData, boundary);
+  } else {
+    requestDataString = typeof request?.data === 'string' ? request?.data : safeStringifyJSON(request?.data);
+  }
+
   const requestCopy = cloneDeep(request);
   if (!requestCopy.data) {
     return { data: null, dataBuffer: null };
diff --git a/packages/bruno-electron/src/utils/constants.js b/packages/bruno-electron/src/utils/constants.js
new file mode 100644
index 000000000..f21b90b83
--- /dev/null
+++ b/packages/bruno-electron/src/utils/constants.js
@@ -0,0 +1 @@
+export const REQUEST_TYPES = ['http-request', 'graphql-request', 'grpc-request', 'ws-request'];
diff --git a/packages/bruno-electron/src/utils/encryption.js b/packages/bruno-electron/src/utils/encryption.js
index 54c1a7cc9..4f80f8cd5 100644
--- a/packages/bruno-electron/src/utils/encryption.js
+++ b/packages/bruno-electron/src/utils/encryption.js
@@ -67,7 +67,6 @@ function aes256Decrypt(data, passkey = null) {
   }
 }
 
-
 // electron safe storage encryption and decryption functions
 function safeStorageEncrypt(str) {
   let encryptedStringBuffer = safeStorage.encryptString(str);
diff --git a/packages/bruno-electron/src/utils/filesystem.js b/packages/bruno-electron/src/utils/filesystem.js
index 65ea4a106..f6d725e6d 100644
--- a/packages/bruno-electron/src/utils/filesystem.js
+++ b/packages/bruno-electron/src/utils/filesystem.js
@@ -40,11 +40,10 @@ const isDirectory = (dirPath) => {
 
 const hasSubDirectories = (dir) => {
   const files = fs.readdirSync(dir);
-  return files.some(file => fs.statSync(path.join(dir, file)).isDirectory());
+  return files.some((file) => fs.statSync(path.join(dir, file)).isDirectory());
 };
 
 const normalizeAndResolvePath = (pathname) => {
-
   if (isWSLPath(pathname)) {
     return normalizeWSLPath(pathname);
   }
@@ -64,8 +63,7 @@ const normalizeAndResolvePath = (pathname) => {
 function isWSLPath(pathname) {
   // Check if the path starts with the WSL prefix
   // eg. "\\wsl.localhost\Ubuntu\home\user\bruno\collection\scripting\api\req\getHeaders.bru"
-    return pathname.startsWith('\\\\') || pathname.startsWith('//') || pathname.startsWith('/wsl.localhost/') || pathname.startsWith('\\wsl.localhost');
-
+  return pathname.startsWith('\\\\') || pathname.startsWith('//') || pathname.startsWith('/wsl.localhost/') || pathname.startsWith('\\wsl.localhost');
 }
 
 function normalizeWSLPath(pathname) {
@@ -74,11 +72,10 @@ function normalizeWSLPath(pathname) {
   return pathname.replace(/^\/wsl.localhost/, '\\\\wsl.localhost').replace(/\//g, '\\');
 }
 
-
 const writeFile = async (pathname, content, isBinary = false) => {
   try {
     await safeWriteFile(pathname, content, {
-      encoding: !isBinary ? "utf-8" : null
+      encoding: !isBinary ? 'utf-8' : null
     });
   } catch (err) {
     console.error(`Error writing file at ${pathname}:`, err);
@@ -96,6 +93,17 @@ const hasBruExtension = (filename) => {
   return ['bru'].some((ext) => filename.toLowerCase().endsWith(`.${ext}`));
 };
 
+const hasRequestExtension = (filename, format = null) => {
+  if (!filename || typeof filename !== 'string') return false;
+
+  if (format) {
+    const ext = format === 'yml' ? 'yml' : 'bru';
+    return filename.toLowerCase().endsWith(`.${ext}`);
+  }
+
+  return ['bru', 'yml'].some((ext) => filename.toLowerCase().endsWith(`.${ext}`));
+};
+
 const createDirectory = async (dir) => {
   if (!dir) {
     throw new Error(`directory: path is null`);
@@ -157,8 +165,16 @@ const searchForFiles = (dir, extension) => {
   return results;
 };
 
-const searchForBruFiles = (dir) => {
-  return searchForFiles(dir, '.bru');
+// Search for request files based on collection filetype by reading config
+const searchForRequestFiles = (dir, collectionPath = null) => {
+  const format = getCollectionFormat(collectionPath || dir);
+  if (format === 'yml') {
+    return searchForFiles(dir, '.yml');
+  } else if (format === 'bru') {
+    return searchForFiles(dir, '.bru');
+  } else {
+    throw new Error(`Invalid format: ${format}`);
+  }
 };
 
 const sanitizeName = (name) => {
@@ -196,23 +212,36 @@ const generateUniqueName = (baseName, checkExists) => {
   return uniqueName;
 };
 
-const validateName = (name) => {
-    const invalidCharacters = /[<>:"/\\|?*\x00-\x1F]/g; // keeping this for informational purpose
-    const reservedDeviceNames = /^(CON|PRN|AUX|NUL|COM[0-9]|LPT[0-9])$/i;
-    const firstCharacter = /^[^\s\-<>:"/\\|?*\x00-\x1F]/; // no space, hyphen and `invalidCharacters`
-    const middleCharacters = /^[^<>:"/\\|?*\x00-\x1F]*$/;   // no `invalidCharacters`
-    const lastCharacter = /[^.\s<>:"/\\|?*\x00-\x1F]$/; // no dot, space and `invalidCharacters`
-    if (name.length > 255) return false;          // max name length
+const getCollectionFormat = (collectionPath) => {
+  const ocYmlPath = path.join(collectionPath, 'opencollection.yml');
+  if (fs.existsSync(ocYmlPath)) {
+    return 'yml';
+  }
 
-    if (reservedDeviceNames.test(name)) return false; // windows reserved names
+  const brunoJsonPath = path.join(collectionPath, 'bruno.json');
+  if (fs.existsSync(brunoJsonPath)) {
+    return 'bru';
+  }
 
-    return (
-        firstCharacter.test(name) &&
-        middleCharacters.test(name) &&
-        lastCharacter.test(name)
-    );
+  throw new Error(`No collection configuration found at: ${collectionPath}`);
 };
 
+const validateName = (name) => {
+  const invalidCharacters = /[<>:"/\\|?*\x00-\x1F]/g; // keeping this for informational purpose
+  const reservedDeviceNames = /^(CON|PRN|AUX|NUL|COM[0-9]|LPT[0-9])$/i;
+  const firstCharacter = /^[^\s\-<>:"/\\|?*\x00-\x1F]/; // no space, hyphen and `invalidCharacters`
+  const middleCharacters = /^[^<>:"/\\|?*\x00-\x1F]*$/; // no `invalidCharacters`
+  const lastCharacter = /[^.\s<>:"/\\|?*\x00-\x1F]$/; // no dot, space and `invalidCharacters`
+  if (name.length > 255) return false; // max name length
+
+  if (reservedDeviceNames.test(name)) return false; // windows reserved names
+
+  return (
+    firstCharacter.test(name)
+    && middleCharacters.test(name)
+    && lastCharacter.test(name)
+  );
+};
 
 const safeToRename = (oldPath, newPath) => {
   try {
@@ -276,11 +305,11 @@ const getCollectionStats = async (directoryPath) => {
   maxFileSize = sizeInMB(maxFileSize);
 
   return { size, filesCount, maxFileSize };
-}
+};
 
 const sizeInMB = (size) => {
   return size / (1024 * 1024);
-}
+};
 
 const getSafePathToWrite = (filePath) => {
   const MAX_FILENAME_LENGTH = 255; // Common limit on most filesystems
@@ -288,16 +317,23 @@ const getSafePathToWrite = (filePath) => {
   let ext = path.extname(filePath);
   let base = path.basename(filePath, ext);
   if (base.length + ext.length > MAX_FILENAME_LENGTH) {
-      base = sanitizeName(base);
-      base = base.slice(0, MAX_FILENAME_LENGTH - ext.length);
+    base = sanitizeName(base);
+    base = base.slice(0, MAX_FILENAME_LENGTH - ext.length);
   }
   let safePath = path.join(dir, base + ext);
   return safePath;
-}
+};
 
 async function safeWriteFile(filePath, data, options) {
   const safePath = getSafePathToWrite(filePath);
-  await fs.writeFile(safePath, data, options);
+
+  try {
+    const fsExtra = require('fs-extra');
+    fsExtra.outputFileSync(safePath, data, options);
+  } catch (err) {
+    console.error(`Error writing file at ${safePath}:`, err);
+    return Promise.reject(err);
+  }
 }
 
 function safeWriteFileSync(filePath, data) {
@@ -313,7 +349,7 @@ const copyPath = async (source, destination) => {
   if (targetPathExists) {
     throw new Error(`Cannot copy, ${path.basename(source)} already exists in ${path.basename(destination)}`);
   }
-  
+
   const copy = async (source, destination) => {
     const stat = await fsPromises.lstat(source);
     if (stat.isDirectory()) {
@@ -327,10 +363,10 @@ const copyPath = async (source, destination) => {
     } else {
       await fsPromises.copyFile(source, destination);
     }
-  }
+  };
 
   await copy(source, targetPath);
-}
+};
 
 // Recursively removes a source <file/directory>.
 const removePath = async (source) => {
@@ -345,7 +381,7 @@ const removePath = async (source) => {
   } else {
     await fsPromises.unlink(source);
   }
-}
+};
 
 // Recursively gets paths.
 const getPaths = async (source) => {
@@ -360,10 +396,10 @@ const getPaths = async (source) => {
         await _getPaths(entryPath);
       }
     }
-  }
+  };
   await _getPaths(source);
   return paths;
-}
+};
 
 /**
  * Checks if a file is larger than a given threshold.
@@ -393,12 +429,13 @@ module.exports = {
   writeFile,
   hasJsonExtension,
   hasBruExtension,
+  hasRequestExtension,
   createDirectory,
   browseDirectory,
   browseFiles,
   chooseFileToSave,
   searchForFiles,
-  searchForBruFiles,
+  searchForRequestFiles,
   sanitizeName,
   isWindowsOS,
   safeToRename,
@@ -412,5 +449,6 @@ module.exports = {
   removePath,
   getPaths,
   isLargeFile,
-  generateUniqueName
+  generateUniqueName,
+  getCollectionFormat
 };
diff --git a/packages/bruno-electron/src/utils/form-data.js b/packages/bruno-electron/src/utils/form-data.js
index 9bff10442..540ee273e 100644
--- a/packages/bruno-electron/src/utils/form-data.js
+++ b/packages/bruno-electron/src/utils/form-data.js
@@ -3,6 +3,61 @@ const FormData = require('form-data');
 const fs = require('fs');
 const path = require('path');
 
+const formatMultipartData = (multipartData, boundary) => {
+  if (!Array.isArray(multipartData) || multipartData.length === 0) {
+    return '';
+  }
+
+  const normalizeBoundary = (b) => {
+    const value = b || 'boundary';
+    return value.replace(/^--+/, '').replace(/--+$/, '');
+  };
+
+  const getFileName = (filePath) => {
+    if (typeof filePath === 'string' && filePath.trim()) {
+      return path.basename(filePath) || 'file';
+    }
+    return 'file';
+  };
+
+  const formatValue = (value) => {
+    if (Array.isArray(value)) {
+      return value.map((v) => String(v ?? '')).join(', ');
+    }
+    return String(value ?? '');
+  };
+
+  const boundaryValue = normalizeBoundary(boundary);
+  const parts = [];
+
+  multipartData.forEach((field) => {
+    if (!field || !field.name) return;
+
+    parts.push(`----${boundaryValue}`);
+    parts.push('Content-Disposition: form-data');
+
+    if (field.type === 'file') {
+      const filePaths = Array.isArray(field.value) ? field.value : (field.value ? [field.value] : ['']);
+      filePaths.forEach((filePath) => {
+        parts.push(`----${boundaryValue}`);
+        parts.push('Content-Disposition: form-data');
+        const fileName = getFileName(filePath);
+        parts.push(`name: ${field.name}`);
+        parts.push(`value: [File: ${fileName}]`);
+        parts.push('');
+      });
+    } else {
+      const value = formatValue(field.value);
+      parts.push(`name: ${field.name}`);
+      parts.push(`value: ${value}`);
+      parts.push('');
+    }
+  });
+
+  parts.push(`----${boundaryValue}--`);
+  return parts.join('\n');
+};
+
 const createFormData = (data, collectionPath) => {
   // make axios work in node using form data
   // reference: https://github.com/axios/axios/issues/1006#issuecomment-320165427
@@ -38,5 +93,6 @@ const createFormData = (data, collectionPath) => {
 };
 
 module.exports = {
-  createFormData
+  createFormData,
+  formatMultipartData
 };
diff --git a/packages/bruno-electron/src/utils/oauth2.js b/packages/bruno-electron/src/utils/oauth2.js
index 4c24c7f22..9d512de6b 100644
--- a/packages/bruno-electron/src/utils/oauth2.js
+++ b/packages/bruno-electron/src/utils/oauth2.js
@@ -12,7 +12,7 @@ const persistOauth2Credentials = ({ collectionUid, url, credentials, credentials
   if (credentials?.error || !credentials?.access_token) return;
   const enhancedCredentials = {
     ...credentials,
-    created_at: Date.now(),
+    created_at: Date.now()
   };
   oauth2Store.updateCredentialsForCollection({ collectionUid, url, credentials: enhancedCredentials, credentialsId });
 };
@@ -25,8 +25,7 @@ const getStoredOauth2Credentials = ({ collectionUid, url, credentialsId }) => {
   try {
     const credentials = oauth2Store.getCredentialsForCollection({ collectionUid, url, credentialsId });
     return credentials;
-  }
-  catch (error) {
+  } catch (error) {
     return null;
   }
 };
@@ -44,7 +43,7 @@ const isTokenExpired = (credentials) => {
 
 const safeParseJSONBuffer = (data) => {
   return safeParseJSON(Buffer.isBuffer(data) ? data.toString() : data);
-}
+};
 
 const getCredentialsFromTokenUrl = async ({ requestConfig, certsAndProxyConfig }) => {
   const { proxyMode, proxyConfig, httpsAgentRequestFields, interpolationOptions } = certsAndProxyConfig;
@@ -70,14 +69,13 @@ const getCredentialsFromTokenUrl = async ({ requestConfig, certsAndProxyConfig }
         statusText: responseStatusText,
         timeline
       }
-    }
-  }
-  catch (error) {
+    };
+  } catch (error) {
     if (error.response) {
       const { response, config } = error;
       const { url: responseUrl, headers: responseHeaders, status: responseStatus, statusText: responseStatusText, data: responseData, timeline } = response || {};
       const { url: requestUrl, headers: requestHeaders, data: requestData } = config || {};
-      const errorResponseData = safeStringifyJSON(safeParseJSONBuffer(responseData))
+      const errorResponseData = safeStringifyJSON(safeParseJSONBuffer(responseData));
       requestDetails = {
         request: {
           url: requestUrl,
@@ -96,8 +94,7 @@ const getCredentialsFromTokenUrl = async ({ requestConfig, certsAndProxyConfig }
           timestamp: Date.now()
         }
       };
-    }
-    else if (error?.code) {
+    } else if (error?.code) {
       // error.config is not available here
       const { url: requestUrl, headers: requestHeaders, data: requestData } = requestConfig;
       requestDetails = {
@@ -123,11 +120,11 @@ const getCredentialsFromTokenUrl = async ({ requestConfig, certsAndProxyConfig }
     requestId: Date.now().toString(),
     fromCache: false,
     completed: true,
-    requests: [], // No sub-requests in this context
+    requests: [] // No sub-requests in this context
   };
 
   return { credentials: parsedResponseData, requestDetails };
-}
+};
 
 // AUTHORIZATION CODE
 
@@ -148,10 +145,10 @@ const getOAuth2TokenUsingAuthorizationCode = async ({ request, collectionUid, fo
     credentialsId,
     autoRefreshToken,
     autoFetchToken,
-    additionalParameters,
+    additionalParameters
   } = oAuth;
   const url = requestCopy?.oauth2?.accessTokenUrl;
-  
+
   // Validate required fields
   if (!authorizationUrl) {
     return {
@@ -249,20 +246,20 @@ const getOAuth2TokenUsingAuthorizationCode = async ({ request, collectionUid, fo
   axiosRequestConfig.method = 'POST';
   axiosRequestConfig.headers = {
     'content-type': 'application/x-www-form-urlencoded',
-    'Accept': 'application/json',
+    'Accept': 'application/json'
   };
-  if (credentialsPlacement === "basic_auth_header") {
-    axiosRequestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret)}`).toString('base64')}`;
+  if (credentialsPlacement === 'basic_auth_header') {
+    axiosRequestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
   }
   const data = {
     grant_type: 'authorization_code',
     code: authorizationCode,
-    redirect_uri: callbackUrl,
+    redirect_uri: callbackUrl
   };
-  if (credentialsPlacement !== "basic_auth_header") {
+  if (credentialsPlacement !== 'basic_auth_header') {
     data.client_id = clientId;
   }
-  if (clientSecret && clientSecret.trim() !== '' && credentialsPlacement !== "basic_auth_header") {
+  if (clientSecret && clientSecret.trim() !== '' && credentialsPlacement !== 'basic_auth_header') {
     data.client_secret = clientSecret;
   }
   if (pkce) {
@@ -316,7 +313,7 @@ const getOAuth2AuthorizationCode = (request, codeChallenge, collectionUid) => {
       authorizationUrlWithQueryParams.searchParams.append('state', state);
     }
     if (additionalParameters?.authorization?.length) {
-      additionalParameters.authorization.forEach(param => {
+      additionalParameters.authorization.forEach((param) => {
         if (param.enabled && param.name) {
           if (param.sendIn === 'queryparams') {
             authorizationUrlWithQueryParams.searchParams.append(param.name, param.value || '');
@@ -324,7 +321,7 @@ const getOAuth2AuthorizationCode = (request, codeChallenge, collectionUid) => {
         }
       });
     }
-    
+
     try {
       const authorizeUrl = authorizationUrlWithQueryParams.toString();
       const { authorizationCode, debugInfo } = await authorizeUserInWindow({
@@ -344,14 +341,14 @@ const getAdditionalHeaders = (params) => {
   if (!params || !params.length) {
     return {};
   }
-  
+
   const headers = {};
-  params.forEach(param => {
+  params.forEach((param) => {
     if (param.enabled && param.name && param.sendIn === 'headers') {
       headers[param.name] = param.value || '';
     }
   });
-  
+
   return headers;
 };
 
@@ -368,7 +365,7 @@ const getOAuth2TokenUsingClientCredentials = async ({ request, collectionUid, fo
     credentialsId,
     autoRefreshToken,
     autoFetchToken,
-    additionalParameters,
+    additionalParameters
   } = oAuth;
 
   const url = requestCopy?.oauth2?.accessTokenUrl;
@@ -448,18 +445,18 @@ const getOAuth2TokenUsingClientCredentials = async ({ request, collectionUid, fo
   axiosRequestConfig.method = 'POST';
   axiosRequestConfig.headers = {
     'content-type': 'application/x-www-form-urlencoded',
-    'Accept': 'application/json',
+    'Accept': 'application/json'
   };
-  if (credentialsPlacement === "basic_auth_header" && clientSecret && clientSecret.trim() !== '') {
-    axiosRequestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret)}`).toString('base64')}`;
+  if (credentialsPlacement === 'basic_auth_header' && clientSecret && clientSecret.trim() !== '') {
+    axiosRequestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
   }
   const data = {
-    grant_type: 'client_credentials',
+    grant_type: 'client_credentials'
   };
-  if (credentialsPlacement !== "basic_auth_header") {
+  if (credentialsPlacement !== 'basic_auth_header') {
     data.client_id = clientId;
   }
-  if (clientSecret && clientSecret.trim() !== '' && credentialsPlacement !== "basic_auth_header") {
+  if (clientSecret && clientSecret.trim() !== '' && credentialsPlacement !== 'basic_auth_header') {
     data.client_secret = clientSecret;
   }
   if (scope && scope.trim() !== '') {
@@ -497,7 +494,7 @@ const getOAuth2TokenUsingPasswordCredentials = async ({ request, collectionUid,
     credentialsId,
     autoRefreshToken,
     autoFetchToken,
-    additionalParameters,
+    additionalParameters
   } = oAuth;
   const url = requestCopy?.oauth2?.accessTokenUrl;
 
@@ -595,20 +592,20 @@ const getOAuth2TokenUsingPasswordCredentials = async ({ request, collectionUid,
   axiosRequestConfig.method = 'POST';
   axiosRequestConfig.headers = {
     'content-type': 'application/x-www-form-urlencoded',
-    'Accept': 'application/json',
+    'Accept': 'application/json'
   };
-  if (credentialsPlacement === "basic_auth_header" && clientSecret && clientSecret.trim() !== '') {
-    axiosRequestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret)}`).toString('base64')}`;
+  if (credentialsPlacement === 'basic_auth_header' && clientSecret && clientSecret.trim() !== '') {
+    axiosRequestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
   }
   const data = {
     grant_type: 'password',
     username,
-    password,
+    password
   };
-  if (credentialsPlacement !== "basic_auth_header") {
+  if (credentialsPlacement !== 'basic_auth_header') {
     data.client_id = clientId;
   }
-  if (clientSecret && clientSecret.trim() !== '' && credentialsPlacement !== "basic_auth_header") {
+  if (clientSecret && clientSecret.trim() !== '' && credentialsPlacement !== 'basic_auth_header') {
     data.client_secret = clientSecret;
   }
   if (scope && scope.trim() !== '') {
@@ -644,12 +641,12 @@ const refreshOauth2Token = async ({ requestCopy, collectionUid, certsAndProxyCon
   } else {
     const data = {
       grant_type: 'refresh_token',
-      refresh_token: credentials.refresh_token,
+      refresh_token: credentials.refresh_token
     };
-    if (credentialsPlacement !== "basic_auth_header") {
+    if (credentialsPlacement !== 'basic_auth_header') {
       data.client_id = clientId;
     }
-    if (clientSecret && clientSecret.trim() !== '' && credentialsPlacement !== "basic_auth_header") {
+    if (clientSecret && clientSecret.trim() !== '' && credentialsPlacement !== 'basic_auth_header') {
       data.client_secret = clientSecret;
     }
     let axiosRequestConfig = {};
@@ -658,8 +655,8 @@ const refreshOauth2Token = async ({ requestCopy, collectionUid, certsAndProxyCon
       'content-type': 'application/x-www-form-urlencoded',
       'Accept': 'application/json'
     };
-    if (credentialsPlacement === "basic_auth_header") {
-      axiosRequestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret)}`).toString('base64')}`;
+    if (credentialsPlacement === 'basic_auth_header') {
+      axiosRequestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
     }
     axiosRequestConfig.url = url;
     axiosRequestConfig.responseType = 'arraybuffer';
@@ -703,7 +700,7 @@ const generateCodeChallenge = (codeVerifier) => {
 
 // Apply additional parameters to a request
 const applyAdditionalParameters = (requestCopy, data, params = []) => {
-  params.forEach(param => {
+  params.forEach((param) => {
     if (!param.enabled || !param.name) {
       return;
     }
@@ -718,8 +715,7 @@ const applyAdditionalParameters = (requestCopy, data, params = []) => {
           let url = new URL(requestCopy.url);
           url.searchParams.append(param.name, param.value || '');
           requestCopy.url = url.href;
-        }
-        catch (error) {
+        } catch (error) {
           console.error('invalid token/refresh url', requestCopy.url);
         }
         break;
@@ -729,7 +725,7 @@ const applyAdditionalParameters = (requestCopy, data, params = []) => {
         break;
     }
   });
-}
+};
 
 const getOAuth2TokenUsingImplicitGrant = async ({ request, collectionUid, forceFetch = false }) => {
   const { oauth2 = {} } = request;
@@ -766,21 +762,21 @@ const getOAuth2TokenUsingImplicitGrant = async ({ request, collectionUid, forceF
   // Check if we already have valid credentials
   if (!forceFetch) {
     try {
-      const storedCredentials = getStoredOauth2Credentials({ 
-        collectionUid, 
-        url: authorizationUrl, 
-        credentialsId 
+      const storedCredentials = getStoredOauth2Credentials({
+        collectionUid,
+        url: authorizationUrl,
+        credentialsId
       });
-      
+
       if (storedCredentials) {
         // Token exists
         if (!isTokenExpired(storedCredentials)) {
           // Token is valid, use it
-          return { 
+          return {
             collectionUid,
-            credentials: storedCredentials, 
-            url: authorizationUrl, 
-            credentialsId 
+            credentials: storedCredentials,
+            url: authorizationUrl,
+            credentialsId
           };
         } else {
           // Token is expired - unlike other grant types, implicit flow doesn't support refresh tokens
@@ -789,11 +785,11 @@ const getOAuth2TokenUsingImplicitGrant = async ({ request, collectionUid, forceF
             clearOauth2Credentials({ collectionUid, url: authorizationUrl, credentialsId });
           } else {
             // Proceed with expired token
-            return { 
+            return {
               collectionUid,
-              credentials: storedCredentials, 
-              url: authorizationUrl, 
-              credentialsId 
+              credentials: storedCredentials,
+              url: authorizationUrl,
+              credentialsId
             };
           }
         }
@@ -801,11 +797,11 @@ const getOAuth2TokenUsingImplicitGrant = async ({ request, collectionUid, forceF
         // No stored credentials
         if (!autoFetchToken) {
           // Don't fetch token if autoFetchToken is disabled
-          return { 
+          return {
             collectionUid,
-            credentials: null, 
-            url: authorizationUrl, 
-            credentialsId 
+            credentials: null,
+            url: authorizationUrl,
+            credentialsId
           };
         }
         // Otherwise proceed to fetch new token
@@ -827,7 +823,7 @@ const getOAuth2TokenUsingImplicitGrant = async ({ request, collectionUid, forceF
     authorizationUrlWithQueryParams.searchParams.append('state', state);
   }
   if (additionalParameters?.authorization?.length) {
-    additionalParameters.authorization.forEach(param => {
+    additionalParameters.authorization.forEach((param) => {
       if (param.enabled && param.name) {
         if (param.sendIn === 'queryparams') {
           authorizationUrlWithQueryParams.searchParams.append(param.name, param.value || '');
@@ -837,7 +833,7 @@ const getOAuth2TokenUsingImplicitGrant = async ({ request, collectionUid, forceF
   }
 
   const authorizeUrl = authorizationUrlWithQueryParams.toString();
-  
+
   try {
     const { implicitTokens, debugInfo } = await authorizeUserInWindow({
       authorizeUrl,
@@ -856,7 +852,7 @@ const getOAuth2TokenUsingImplicitGrant = async ({ request, collectionUid, forceF
         debugInfo
       };
     }
-    
+
     const credentials = {
       access_token: implicitTokens.access_token,
       token_type: implicitTokens.token_type || 'Bearer',
@@ -876,7 +872,7 @@ const getOAuth2TokenUsingImplicitGrant = async ({ request, collectionUid, forceF
       credentials,
       credentialsId
     });
-    
+
     return {
       collectionUid,
       credentials,
diff --git a/packages/bruno-electron/src/utils/parse.js b/packages/bruno-electron/src/utils/parse.js
index 655b9e6f7..d8aacfa5a 100644
--- a/packages/bruno-electron/src/utils/parse.js
+++ b/packages/bruno-electron/src/utils/parse.js
@@ -39,4 +39,4 @@ async function parseLargeRequestWithRedaction(bruContent) {
   return parsedData;
 }
 
-module.exports = { parseLargeRequestWithRedaction };
\ No newline at end of file
+module.exports = { parseLargeRequestWithRedaction };
diff --git a/packages/bruno-electron/src/utils/proxy-util.js b/packages/bruno-electron/src/utils/proxy-util.js
index dd42541fb..dacbfa98f 100644
--- a/packages/bruno-electron/src/utils/proxy-util.js
+++ b/packages/bruno-electron/src/utils/proxy-util.js
@@ -87,7 +87,6 @@ class PatchedHttpsProxyAgent extends HttpsProxyAgent {
 function createTimelineAgentClass(BaseAgentClass) {
   return class extends BaseAgentClass {
     constructor(options, timeline) {
-
       let caCertificatesCount = options.caCertificatesCount || {};
       delete options.caCertificatesCount;
 
@@ -97,7 +96,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         // Ensure TLS options are properly set
         const tlsOptions = {
           ...agentOptions,
-          rejectUnauthorized: agentOptions.rejectUnauthorized ?? true,
+          rejectUnauthorized: agentOptions.rejectUnauthorized ?? true
         };
         super(proxyUri, tlsOptions);
         this.timeline = Array.isArray(timeline) ? timeline : [];
@@ -108,20 +107,20 @@ function createTimelineAgentClass(BaseAgentClass) {
         this.timeline.push({
           timestamp: new Date(),
           type: 'info',
-          message: `SSL validation: ${tlsOptions.rejectUnauthorized ? 'enabled' : 'disabled'}`,
+          message: `SSL validation: ${tlsOptions.rejectUnauthorized ? 'enabled' : 'disabled'}`
         });
 
         // Log the proxy details
         this.timeline.push({
           timestamp: new Date(),
           type: 'info',
-          message: `Using proxy: ${proxyUri}`,
+          message: `Using proxy: ${proxyUri}`
         });
       } else {
         // This is a regular HTTPS agent case
         const tlsOptions = {
           ...options,
-          rejectUnauthorized: options.rejectUnauthorized ?? true,
+          rejectUnauthorized: options.rejectUnauthorized ?? true
         };
         super(tlsOptions);
         this.timeline = Array.isArray(timeline) ? timeline : [];
@@ -132,14 +131,13 @@ function createTimelineAgentClass(BaseAgentClass) {
         this.timeline.push({
           timestamp: new Date(),
           type: 'info',
-          message: `SSL validation: ${tlsOptions.rejectUnauthorized ? 'enabled' : 'disabled'}`,
+          message: `SSL validation: ${tlsOptions.rejectUnauthorized ? 'enabled' : 'disabled'}`
         });
       }
 
       this.caCertificatesCount = caCertificatesCount;
     }
 
-
     createConnection(options, callback) {
       const { host, port } = options;
 
@@ -148,7 +146,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         this.timeline.push({
           timestamp: new Date(),
           type: 'tls',
-          message: `ALPN: offers ${this.alpnProtocols.join(', ')}`,
+          message: `ALPN: offers ${this.alpnProtocols.join(', ')}`
         });
       }
 
@@ -160,14 +158,14 @@ function createTimelineAgentClass(BaseAgentClass) {
       this.timeline.push({
         timestamp: new Date(),
         type: 'tls',
-        message: `CA Certificates: ${rootCerts} root, ${systemCerts} system, ${extraCerts} extra, ${customCerts} custom`,
+        message: `CA Certificates: ${rootCerts} root, ${systemCerts} system, ${extraCerts} extra, ${customCerts} custom`
       });
 
       // Log "Trying host:port..."
       this.timeline.push({
         timestamp: new Date(),
         type: 'info',
-        message: `Trying ${host}:${port}...`,
+        message: `Trying ${host}:${port}...`
       });
 
       let socket;
@@ -177,7 +175,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         this.timeline.push({
           timestamp: new Date(),
           type: 'error',
-          message: `Error creating connection: ${error.message}`,
+          message: `Error creating connection: ${error.message}`
         });
         error.timeline = this.timeline;
         throw error;
@@ -189,13 +187,13 @@ function createTimelineAgentClass(BaseAgentClass) {
           this.timeline.push({
             timestamp: new Date(),
             type: 'error',
-            message: `DNS lookup error for ${host}: ${err.message}`,
+            message: `DNS lookup error for ${host}: ${err.message}`
           });
         } else {
           this.timeline.push({
             timestamp: new Date(),
             type: 'info',
-            message: `DNS lookup: ${host} -> ${address}`,
+            message: `DNS lookup: ${host} -> ${address}`
           });
         }
       });
@@ -207,7 +205,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         this.timeline.push({
           timestamp: new Date(),
           type: 'info',
-          message: `Connected to ${host} (${address}) port ${remotePort}`,
+          message: `Connected to ${host} (${address}) port ${remotePort}`
         });
       });
 
@@ -219,7 +217,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         this.timeline.push({
           timestamp: new Date(),
           type: 'tls',
-          message: `SSL connection using ${protocol} / ${cipherSuite}`,
+          message: `SSL connection using ${protocol} / ${cipherSuite}`
         });
 
         // ALPN protocol
@@ -227,7 +225,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         this.timeline.push({
           timestamp: new Date(),
           type: 'tls',
-          message: `ALPN: server accepted ${alpnProtocol}`,
+          message: `ALPN: server accepted ${alpnProtocol}`
         });
 
         // Server certificate
@@ -236,41 +234,41 @@ function createTimelineAgentClass(BaseAgentClass) {
           this.timeline.push({
             timestamp: new Date(),
             type: 'tls',
-            message: `Server certificate:`,
+            message: `Server certificate:`
           });
           if (cert.subject) {
             this.timeline.push({
               timestamp: new Date(),
               type: 'tls',
-              message: ` subject: ${Object.entries(cert.subject).map(([k, v]) => `${k}=${v}`).join(', ')}`,
+              message: ` subject: ${Object.entries(cert.subject).map(([k, v]) => `${k}=${v}`).join(', ')}`
             });
           }
           if (cert.valid_from) {
             this.timeline.push({
               timestamp: new Date(),
               type: 'tls',
-              message: ` start date: ${cert.valid_from}`,
+              message: ` start date: ${cert.valid_from}`
             });
           }
           if (cert.valid_to) {
             this.timeline.push({
               timestamp: new Date(),
               type: 'tls',
-              message: ` expire date: ${cert.valid_to}`,
+              message: ` expire date: ${cert.valid_to}`
             });
           }
           if (cert.subjectaltname) {
             this.timeline.push({
               timestamp: new Date(),
               type: 'tls',
-              message: ` subjectAltName: ${cert.subjectaltname}`,
+              message: ` subjectAltName: ${cert.subjectaltname}`
             });
           }
           if (cert.issuer) {
             this.timeline.push({
               timestamp: new Date(),
               type: 'tls',
-              message: ` issuer: ${Object.entries(cert.issuer).map(([k, v]) => `${k}=${v}`).join(', ')}`,
+              message: ` issuer: ${Object.entries(cert.issuer).map(([k, v]) => `${k}=${v}`).join(', ')}`
             });
           }
 
@@ -278,7 +276,7 @@ function createTimelineAgentClass(BaseAgentClass) {
           this.timeline.push({
             timestamp: new Date(),
             type: 'tls',
-            message: `SSL certificate verify ok.`,
+            message: `SSL certificate verify ok.`
           });
         }
       });
@@ -287,7 +285,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         this.timeline.push({
           timestamp: new Date(),
           type: 'error',
-          message: `Socket error: ${err.message}`,
+          message: `Socket error: ${err.message}`
         });
       });
 
@@ -302,7 +300,7 @@ function setupProxyAgents({
   proxyConfig,
   httpsAgentRequestFields,
   interpolationOptions,
-  timeline,
+  timeline
 }) {
   // Ensure TLS options are properly set
   const tlsOptions = {
@@ -311,7 +309,7 @@ function setupProxyAgents({
     secureProtocol: undefined,
     // Allow Node.js to choose the protocol
     minVersion: 'TLSv1',
-    rejectUnauthorized: httpsAgentRequestFields.rejectUnauthorized !== undefined ? httpsAgentRequestFields.rejectUnauthorized : true,
+    rejectUnauthorized: httpsAgentRequestFields.rejectUnauthorized !== undefined ? httpsAgentRequestFields.rejectUnauthorized : true
   };
 
   if (proxyMode === 'on') {
@@ -367,7 +365,7 @@ function setupProxyAgents({
           new URL(https_proxy);
           const TimelineHttpsProxyAgent = createTimelineAgentClass(PatchedHttpsProxyAgent);
           requestConfig.httpsAgent = new TimelineHttpsProxyAgent(
-            { proxy: https_proxy,...tlsOptions },
+            { proxy: https_proxy, ...tlsOptions },
             timeline
           );
         } else {
@@ -387,7 +385,6 @@ function setupProxyAgents({
   }
 }
 
-
 module.exports = {
   shouldUseProxy,
   PatchedHttpsProxyAgent,
diff --git a/packages/bruno-electron/src/utils/tests/collection-utils.spec.js b/packages/bruno-electron/src/utils/tests/collection-utils.spec.js
index 3ed1a633c..f1383b1b4 100644
--- a/packages/bruno-electron/src/utils/tests/collection-utils.spec.js
+++ b/packages/bruno-electron/src/utils/tests/collection-utils.spec.js
@@ -2,7 +2,6 @@ const { transformRequestToSaveToFilesystem } = require('../collection');
 
 describe('transformRequestToSaveToFilesystem', () => {
   it('should preserve all relevant fields when transforming request', () => {
-
     const testItem = {
       uid: 'test-uid-123',
       type: 'http-request',
@@ -78,7 +77,7 @@ describe('transformRequestToSaveToFilesystem', () => {
     expect(result.name).toBe(testItem.name);
     expect(result.seq).toBe(testItem.seq);
     expect(result.settings).toEqual(testItem.settings);
-    
+
     // Verify tags are preserved (this is the main focus)
     expect(result.tags).toEqual(['smoke', 'regression', 'api']);
     expect(result.tags).toHaveLength(3);
@@ -167,7 +166,7 @@ describe('transformRequestToSaveToFilesystem', () => {
     expect(result.uid).toBe('draft-uid-789');
     expect(result.name).toBe('Draft Request Modified');
     expect(result.settings).toEqual({ enableEncodeUrl: true });
-    
+
     // Verify draft tags are preserved
     expect(result.tags).toEqual(['draft', 'wip', 'modified']);
     expect(result.tags).toContain('modified');
diff --git a/packages/bruno-electron/src/utils/tests/filesystem/index.spec.js b/packages/bruno-electron/src/utils/tests/filesystem/index.spec.js
index 60add1b57..be8401a62 100644
--- a/packages/bruno-electron/src/utils/tests/filesystem/index.spec.js
+++ b/packages/bruno-electron/src/utils/tests/filesystem/index.spec.js
@@ -24,14 +24,13 @@ describe('File System Operations', () => {
 
   describe('copyPath and removePath', () => {
     it('should move files and folder items multiple times', async () => {
-
       {
         const sourcePath = path.join(tempDir, 'folder_1', 'file_2.bru');
         const destDir = path.join(tempDir, 'folder_1', 'folder_1_1');
         await copyPath(sourcePath, destDir);
         await removePath(sourcePath);
       }
-      
+
       {
         const sourcePath = path.join(tempDir, 'folder_2');
         const destDir = path.join(tempDir, 'folder_1', 'folder_1_1');
@@ -57,7 +56,6 @@ describe('File System Operations', () => {
       expect(result).toBe(true);
     });
 
-
     it('should throw an error move file/folder if the destination has the same filename', async () => {
       {
         const sourcePath = path.join(tempDir, 'folder_1', 'file_dup.bru');
@@ -65,11 +63,9 @@ describe('File System Operations', () => {
         await expect(copyPath(sourcePath, destDir)).rejects.toThrow();
       }
     });
-
   });
 });
 
-
 // create folders and files recursively based on the defined json structure
 const createFilesAndFolders = async (dir, filesAndFolders) => {
   for (const item of filesAndFolders) {
@@ -81,7 +77,7 @@ const createFilesAndFolders = async (dir, filesAndFolders) => {
       await fs.writeFile(itemPath, item.content);
     }
   }
-}
+};
 
 // if a file/folder doesnt exist, return false
 // should only contain files and folders that are defined in the json structure
@@ -93,18 +89,18 @@ const verifyFilesAndFolders = async (dir, filesAndFolders) => {
     }
     for (const file of files) {
       const itemPath = path.join(dir, file);
-      const item = filesAndFolders.find(f => f.name === file);
+      const item = filesAndFolders.find((f) => f.name === file);
       if (!item) {
         return false;
       }
       if (item.type === 'folder') {
         return await verify(itemPath, item.files);
       } else {
-        return await fs.readFile(itemPath, 'utf8').then(content => content === item.content);
+        return await fs.readFile(itemPath, 'utf8').then((content) => content === item.content);
       }
     }
     return true;
-  }
+  };
 
   try {
     const verified = await verify(dir, filesAndFolders);
@@ -113,4 +109,4 @@ const verifyFilesAndFolders = async (dir, filesAndFolders) => {
     console.error(error);
     return false;
   }
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-electron/src/utils/tests/fixtures/filesystem/copypath-removepath.js b/packages/bruno-electron/src/utils/tests/fixtures/filesystem/copypath-removepath.js
index ea08f8d25..49ad66e45 100644
--- a/packages/bruno-electron/src/utils/tests/fixtures/filesystem/copypath-removepath.js
+++ b/packages/bruno-electron/src/utils/tests/fixtures/filesystem/copypath-removepath.js
@@ -1,155 +1,155 @@
 const initialCollectionStructure = [
   {
-    "name": "folder_1",
-    "type": "folder",
-    "files": [
+    name: 'folder_1',
+    type: 'folder',
+    files: [
       {
-        "name": "file_1.bru",
-        "type": "file",
-        "content": "file_1_content"
+        name: 'file_1.bru',
+        type: 'file',
+        content: 'file_1_content'
       },
       {
-        "name": "file_2.bru",
-        "type": "file",
-        "content": "file_2_content"
+        name: 'file_2.bru',
+        type: 'file',
+        content: 'file_2_content'
       },
       {
-        "name": "folder_1_1",
-        "type": "folder",
-        "files": [
+        name: 'folder_1_1',
+        type: 'folder',
+        files: [
           {
-            "name": "file_1_1.bru",
-            "type": "file",
-            "content": "file_1_1_content"
+            name: 'file_1_1.bru',
+            type: 'file',
+            content: 'file_1_1_content'
           },
           {
-            "name": "file_1_2.bru",
-            "type": "file",
-            "content": "file_1_2_content"
+            name: 'file_1_2.bru',
+            type: 'file',
+            content: 'file_1_2_content'
           }
         ]
       },
       {
-        "name": "file_1_3.bru",
-        "type": "file",
-        "content": "file_1_3_content"
+        name: 'file_1_3.bru',
+        type: 'file',
+        content: 'file_1_3_content'
       },
       {
-        "name": "file_dup.bru",
-        "type": "file",
-        "content": "file_dup_content"
+        name: 'file_dup.bru',
+        type: 'file',
+        content: 'file_dup_content'
       }
-    ],
+    ]
   },
   {
-    "name": "folder_2",
-    "type": "folder",
-    "files": [
+    name: 'folder_2',
+    type: 'folder',
+    files: [
       {
-        "name": "file_2_1.bru",
-        "type": "file",
-        "content": "file_2_1_content"
+        name: 'file_2_1.bru',
+        type: 'file',
+        content: 'file_2_1_content'
       },
       {
-        "name": "file_2_2.bru",
-        "type": "file",
-        "content": "file_2_2_content"
+        name: 'file_2_2.bru',
+        type: 'file',
+        content: 'file_2_2_content'
       },
       {
-        "name": "folder_2_1",
-        "type": "folder",
-        "files": [
+        name: 'folder_2_1',
+        type: 'folder',
+        files: [
           {
-            "name": "file_2_1_1.bru",
-            "type": "file",
-            "content": "file_2_1_1_content"
+            name: 'file_2_1_1.bru',
+            type: 'file',
+            content: 'file_2_1_1_content'
           }
         ]
       }
     ]
   },
   {
-    "name": "file_dup.bru",
-    "type": "file",
-    "content": "file_dup_content"
+    name: 'file_dup.bru',
+    type: 'file',
+    content: 'file_dup_content'
   }
 ];
 
 const finalCollectionStructure = [
   {
-    "name": "folder_1",
-    "type": "folder",
-    "files": [
+    name: 'folder_1',
+    type: 'folder',
+    files: [
       {
-        "name": "file_1.bru",
-        "type": "file",
-        "content": "file_1_content"
+        name: 'file_1.bru',
+        type: 'file',
+        content: 'file_1_content'
       },
       {
-        "name": "folder_1_1",
-        "type": "folder",
-        "files": [
+        name: 'folder_1_1',
+        type: 'folder',
+        files: [
           {
-            "name": "file_1_1.bru",
-            "type": "file",
-            "content": "file_1_1_content"
+            name: 'file_1_1.bru',
+            type: 'file',
+            content: 'file_1_1_content'
           },
           {
-            "name": "file_1_2.bru",
-            "type": "file",
-            "content": "file_1_2_content"
+            name: 'file_1_2.bru',
+            type: 'file',
+            content: 'file_1_2_content'
           },
           {
-            "name": "file_2.bru",
-            "type": "file",
-            "content": "file_2_content"
+            name: 'file_2.bru',
+            type: 'file',
+            content: 'file_2_content'
           },
           {
-            "name": "folder_2",
-            "type": "folder",
-            "files": [
+            name: 'folder_2',
+            type: 'folder',
+            files: [
               {
-                "name": "file_2_1.bru",
-                "type": "file",
-                "content": "file_2_1_content"
+                name: 'file_2_1.bru',
+                type: 'file',
+                content: 'file_2_1_content'
               }
             ]
           }
         ]
       },
       {
-        "name": "file_1_3.bru",
-        "type": "file",
-        "content": "file_1_3_content"
+        name: 'file_1_3.bru',
+        type: 'file',
+        content: 'file_1_3_content'
       },
       {
-        "name": "file_2_2.bru",
-        "type": "file",
-        "content": "file_2_2_content"
+        name: 'file_2_2.bru',
+        type: 'file',
+        content: 'file_2_2_content'
       },
       {
-        "name": "file_dup.bru",
-        "type": "file",
-        "content": "file_dup_content"
-      }
-    ],
-  },
-  {
-    "name": "folder_2_1",
-    "type": "folder",
-    "files": [
-      {
-        "name": "file_2_1_1.bru",
-        "type": "file",
-        "content": "file_2_1_1_content"
+        name: 'file_dup.bru',
+        type: 'file',
+        content: 'file_dup_content'
       }
     ]
   },
   {
-    "name": "file_dup.bru",
-    "type": "file",
-    "content": "file_dup_content"
+    name: 'folder_2_1',
+    type: 'folder',
+    files: [
+      {
+        name: 'file_2_1_1.bru',
+        type: 'file',
+        content: 'file_2_1_1_content'
+      }
+    ]
+  },
+  {
+    name: 'file_dup.bru',
+    type: 'file',
+    content: 'file_dup_content'
   }
 ];
 
-module.exports = { initialCollectionStructure, finalCollectionStructure };
\ No newline at end of file
+module.exports = { initialCollectionStructure, finalCollectionStructure };
diff --git a/packages/bruno-electron/src/utils/window.js b/packages/bruno-electron/src/utils/window.js
index 949a2aaa2..f62d2dd40 100644
--- a/packages/bruno-electron/src/utils/window.js
+++ b/packages/bruno-electron/src/utils/window.js
@@ -36,10 +36,10 @@ const isPositionValid = (bounds) => {
   const area = getArea(bounds);
 
   return (
-    bounds.x >= area.x &&
-    bounds.y >= area.y &&
-    bounds.x + bounds.width <= area.x + area.width &&
-    bounds.y + bounds.height <= area.y + area.height
+    bounds.x >= area.x
+    && bounds.y >= area.y
+    && bounds.x + bounds.width <= area.x + area.width
+    && bounds.y + bounds.height <= area.y + area.height
   );
 };
 
diff --git a/packages/bruno-electron/src/utils/workspace-config.js b/packages/bruno-electron/src/utils/workspace-config.js
new file mode 100644
index 000000000..8e575dc05
--- /dev/null
+++ b/packages/bruno-electron/src/utils/workspace-config.js
@@ -0,0 +1,225 @@
+const fs = require('fs');
+const path = require('path');
+const yaml = require('js-yaml');
+const { writeFile, validateName } = require('./filesystem');
+
+const WORKSPACE_TYPE = 'workspace';
+
+const makeRelativePath = (workspacePath, absolutePath) => {
+  if (!path.isAbsolute(absolutePath)) {
+    return absolutePath;
+  }
+
+  try {
+    return path.relative(workspacePath, absolutePath);
+  } catch (error) {
+    return absolutePath;
+  }
+};
+
+const normalizeCollectionEntry = (workspacePath, collection) => {
+  const relativePath = makeRelativePath(workspacePath, collection.path);
+
+  const normalizedCollection = {
+    name: collection.name,
+    path: relativePath
+  };
+
+  if (collection.remote) {
+    normalizedCollection.remote = collection.remote;
+  }
+
+  return normalizedCollection;
+};
+
+const validateWorkspacePath = (workspacePath) => {
+  if (!workspacePath) {
+    throw new Error('Workspace path is required');
+  }
+
+  if (!fs.existsSync(workspacePath)) {
+    throw new Error(`Workspace path does not exist: ${workspacePath}`);
+  }
+
+  const workspaceFilePath = path.join(workspacePath, 'workspace.yml');
+  if (!fs.existsSync(workspaceFilePath)) {
+    throw new Error('Invalid workspace: workspace.yml not found');
+  }
+
+  return true;
+};
+
+const validateWorkspaceDirectory = (dirPath) => {
+  if (!validateName(path.basename(dirPath))) {
+    throw new Error(`Invalid workspace directory name: ${dirPath}`);
+  }
+  return true;
+};
+
+const createWorkspaceConfig = (workspaceName) => ({
+  name: workspaceName,
+  type: WORKSPACE_TYPE,
+  version: '1.0.0',
+  docs: '',
+  collections: []
+});
+
+const readWorkspaceConfig = (workspacePath) => {
+  const workspaceFilePath = path.join(workspacePath, 'workspace.yml');
+
+  if (!fs.existsSync(workspaceFilePath)) {
+    throw new Error('Invalid workspace: workspace.yml not found');
+  }
+
+  const yamlContent = fs.readFileSync(workspaceFilePath, 'utf8');
+  const workspaceConfig = yaml.load(yamlContent);
+
+  if (!workspaceConfig || typeof workspaceConfig !== 'object') {
+    throw new Error('Invalid workspace: workspace.yml is malformed');
+  }
+
+  return workspaceConfig;
+};
+
+const writeWorkspaceConfig = async (workspacePath, config) => {
+  const yamlContent = yaml.dump(config, {
+    indent: 2,
+    lineWidth: -1,
+    noRefs: true
+  });
+  await writeFile(path.join(workspacePath, 'workspace.yml'), yamlContent);
+};
+
+const validateWorkspaceConfig = (config) => {
+  if (!config || typeof config !== 'object') {
+    throw new Error('Workspace configuration must be an object');
+  }
+
+  if (config.type !== WORKSPACE_TYPE) {
+    throw new Error('Invalid workspace: not a bruno workspace');
+  }
+
+  if (!config.name || typeof config.name !== 'string') {
+    throw new Error('Workspace must have a valid name');
+  }
+
+  return true;
+};
+
+const updateWorkspaceName = async (workspacePath, newName) => {
+  const config = readWorkspaceConfig(workspacePath);
+  config.name = newName;
+  await writeWorkspaceConfig(workspacePath, config);
+  return config;
+};
+
+const updateWorkspaceDocs = async (workspacePath, docs) => {
+  const config = readWorkspaceConfig(workspacePath);
+  config.docs = docs;
+  await writeWorkspaceConfig(workspacePath, config);
+  return docs;
+};
+
+const addCollectionToWorkspace = async (workspacePath, collection) => {
+  const config = readWorkspaceConfig(workspacePath);
+
+  if (!config.collections) {
+    config.collections = [];
+  }
+
+  // Normalize collection entry
+  const normalizedCollection = {
+    name: collection.name,
+    path: collection.path
+  };
+
+  if (collection.remote) {
+    normalizedCollection.remote = collection.remote;
+  }
+
+  // Check if collection already exists
+  const existingIndex = config.collections.findIndex((c) => c.name === normalizedCollection.name || c.path === normalizedCollection.path);
+
+  if (existingIndex >= 0) {
+    config.collections[existingIndex] = normalizedCollection;
+  } else {
+    config.collections.push(normalizedCollection);
+  }
+
+  await writeWorkspaceConfig(workspacePath, config);
+  return config.collections;
+};
+
+const removeCollectionFromWorkspace = async (workspacePath, collectionPath) => {
+  const config = readWorkspaceConfig(workspacePath);
+
+  let removedCollection = null;
+  let shouldDeleteFiles = false;
+
+  config.collections = (config.collections || []).filter((c) => {
+    const collectionPathFromYml = c.path;
+
+    if (!collectionPathFromYml) {
+      return true;
+    }
+
+    // Convert to absolute path for comparison
+    const absoluteCollectionPath = path.isAbsolute(collectionPathFromYml)
+      ? collectionPathFromYml
+      : path.resolve(workspacePath, collectionPathFromYml);
+
+    if (path.normalize(absoluteCollectionPath) === path.normalize(collectionPath)) {
+      removedCollection = c;
+
+      // Delete files only for workspace collections (not remote, not external absolute paths)
+      const hasRemote = c.remote;
+      const isExternalPath = path.isAbsolute(collectionPathFromYml);
+
+      shouldDeleteFiles = !hasRemote && !isExternalPath;
+
+      return false; // Remove from array
+    }
+
+    return true; // Keep in array
+  });
+
+  await writeWorkspaceConfig(workspacePath, config);
+
+  return {
+    removedCollection,
+    shouldDeleteFiles,
+    updatedConfig: config
+  };
+};
+
+const getWorkspaceCollections = (workspacePath) => {
+  const config = readWorkspaceConfig(workspacePath);
+  const collections = config.collections || [];
+
+  // Resolve relative paths to absolute
+  return collections.map((collection) => {
+    if (collection.path && !path.isAbsolute(collection.path)) {
+      return {
+        ...collection,
+        path: path.join(workspacePath, collection.path)
+      };
+    }
+    return collection;
+  });
+};
+
+module.exports = {
+  makeRelativePath,
+  normalizeCollectionEntry,
+  validateWorkspacePath,
+  validateWorkspaceDirectory,
+  createWorkspaceConfig,
+  readWorkspaceConfig,
+  writeWorkspaceConfig,
+  validateWorkspaceConfig,
+  updateWorkspaceName,
+  updateWorkspaceDocs,
+  addCollectionToWorkspace,
+  removeCollectionFromWorkspace,
+  getWorkspaceCollections
+};
diff --git a/packages/bruno-electron/tests/network/execute-request-error-handler.spec.js b/packages/bruno-electron/tests/network/execute-request-error-handler.spec.js
index 3fe168adb..897da0da3 100644
--- a/packages/bruno-electron/tests/network/execute-request-error-handler.spec.js
+++ b/packages/bruno-electron/tests/network/execute-request-error-handler.spec.js
@@ -14,26 +14,26 @@ describe('executeRequestOnFailHandler', () => {
 
   it('should do nothing when request is null', async () => {
     const error = new Error('Test error');
-    
+
     await executeRequestOnFailHandler(null, error);
-    
+
     expect(consoleSpy).not.toHaveBeenCalled();
   });
 
   it('should do nothing when request is undefined', async () => {
     const error = new Error('Test error');
-    
+
     await executeRequestOnFailHandler(undefined, error);
-    
+
     expect(consoleSpy).not.toHaveBeenCalled();
   });
 
   it('should do nothing when onFailHandler is not a function', async () => {
     const request = { onFailHandler: 'not a function' };
     const error = new Error('Test error');
-    
+
     await executeRequestOnFailHandler(request, error);
-    
+
     expect(consoleSpy).not.toHaveBeenCalled();
   });
 
@@ -41,9 +41,9 @@ describe('executeRequestOnFailHandler', () => {
     const mockHandler = jest.fn();
     const request = { onFailHandler: mockHandler };
     const error = new Error('Test error');
-    
+
     await executeRequestOnFailHandler(request, error);
-    
+
     expect(mockHandler).toHaveBeenCalledWith(error);
     expect(mockHandler).toHaveBeenCalledTimes(1);
     expect(consoleSpy).not.toHaveBeenCalled();
@@ -98,15 +98,15 @@ describe('executeRequestOnFailHandler', () => {
     } catch (err) {
       error = err;
     }
-    
+
     // Verify this is actually a hard error (no response)
     expect(error.response).toBeUndefined();
-    
+
     await executeRequestOnFailHandler(request, error);
-    
+
     expect(mockHandler).toHaveBeenCalledWith(error);
     const passedError = mockHandler.mock.calls[0][0];
     expect(passedError.response).toBeUndefined(); // Should be undefined for hard errors
     expect(passedError.code).toBe('ECONNABORTED'); // Connection aborted due to timeout
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-electron/tests/network/fetch-gql-schema-handler.spec.js b/packages/bruno-electron/tests/network/fetch-gql-schema-handler.spec.js
index 8831ba48b..97f5a81d5 100644
--- a/packages/bruno-electron/tests/network/fetch-gql-schema-handler.spec.js
+++ b/packages/bruno-electron/tests/network/fetch-gql-schema-handler.spec.js
@@ -365,7 +365,5 @@ describe('fetchGqlSchemaHandler - variable precedence', () => {
       request,
       collection.root
     );
-  })
+  });
 });
-
-
diff --git a/packages/bruno-electron/tests/network/index.spec.js b/packages/bruno-electron/tests/network/index.spec.js
index 02cf97f88..5fa443132 100644
--- a/packages/bruno-electron/tests/network/index.spec.js
+++ b/packages/bruno-electron/tests/network/index.spec.js
@@ -1,15 +1,15 @@
 const { configureRequest } = require('../../src/ipc/network/index');
 
 describe('index: configureRequest', () => {
-  it("Should add 'http://' to the URL if no protocol is specified", async () => {
+  it('Should add \'http://\' to the URL if no protocol is specified', async () => {
     const request = { method: 'GET', url: 'test-domain', body: {} };
-    await configureRequest(null, null, request, null, null, null, null);
+    await configureRequest(null, {}, request, null, null, null, null);
     expect(request.url).toEqual('http://test-domain');
   });
 
-  it("Should NOT add 'http://' to the URL if a protocol is specified", async () => {
+  it('Should NOT add \'http://\' to the URL if a protocol is specified', async () => {
     const request = { method: 'GET', url: 'ftp://test-domain', body: {} };
-    await configureRequest(null, null, request, null, null, null, null);
+    await configureRequest(null, {}, request, null, null, null, null);
     expect(request.url).toEqual('ftp://test-domain');
   });
 });
diff --git a/packages/bruno-electron/tests/network/interpolate-vars.spec.js b/packages/bruno-electron/tests/network/interpolate-vars.spec.js
index 5fcd2ed1b..003928a11 100644
--- a/packages/bruno-electron/tests/network/interpolate-vars.spec.js
+++ b/packages/bruno-electron/tests/network/interpolate-vars.spec.js
@@ -3,28 +3,28 @@ const interpolateVars = require('../../src/ipc/network/interpolate-vars');
 describe('interpolate-vars: interpolateVars', () => {
   describe('Interpolates string', () => {
     describe('With environment variables', () => {
-      it("If there's a var with only alphanumeric characters in its name", async () => {
+      it('If there\'s a var with only alphanumeric characters in its name', async () => {
         const request = { method: 'GET', url: '{{testUrl1}}' };
 
         const result = interpolateVars(request, { testUrl1: 'test.com' }, null, null);
         expect(result.url).toEqual('test.com');
       });
 
-      it("If there's a var with a '.' in its name", async () => {
+      it('If there\'s a var with a \'.\' in its name', async () => {
         const request = { method: 'GET', url: '{{test.url}}' };
 
         const result = interpolateVars(request, { 'test.url': 'test.com' }, null, null);
         expect(result.url).toEqual('test.com');
       });
 
-      it("If there's a var with a '-' in its name", async () => {
+      it('If there\'s a var with a \'-\' in its name', async () => {
         const request = { method: 'GET', url: '{{test-url}}' };
 
         const result = interpolateVars(request, { 'test-url': 'test.com' }, null, null);
         expect(result.url).toEqual('test.com');
       });
 
-      it("If there's a var with a '_' in its name", async () => {
+      it('If there\'s a var with a \'_\' in its name', async () => {
         const request = { method: 'GET', url: '{{test_url}}' };
 
         const result = interpolateVars(request, { test_url: 'test.com' }, null, null);
@@ -32,10 +32,10 @@ describe('interpolate-vars: interpolateVars', () => {
       });
 
       it('If there are multiple variables', async () => {
-        const body =
-          '{\n  "firstElem": {{body-var-1}},\n  "secondElem": [{{body.var.2}}],\n  "thirdElem": {\n    "fourthElem": {{body_var_3}},\n    "{{varAsKey}}": {{valueForKey}} }}';
-        const expectedBody =
-          '{\n  "firstElem": Test1,\n  "secondElem": [Test2],\n  "thirdElem": {\n    "fourthElem": Test3,\n    "TestKey": TestValueForKey }}';
+        const body
+          = '{\n  "firstElem": {{body-var-1}},\n  "secondElem": [{{body.var.2}}],\n  "thirdElem": {\n    "fourthElem": {{body_var_3}},\n    "{{varAsKey}}": {{valueForKey}} }}';
+        const expectedBody
+          = '{\n  "firstElem": Test1,\n  "secondElem": [Test2],\n  "thirdElem": {\n    "fourthElem": Test3,\n    "TestKey": TestValueForKey }}';
 
         const request = { method: 'POST', url: 'test', data: body, headers: { 'content-type': 'json' } };
         const result = interpolateVars(
@@ -43,9 +43,9 @@ describe('interpolate-vars: interpolateVars', () => {
           {
             'body-var-1': 'Test1',
             'body.var.2': 'Test2',
-            body_var_3: 'Test3',
-            varAsKey: 'TestKey',
-            valueForKey: 'TestValueForKey'
+            'body_var_3': 'Test3',
+            'varAsKey': 'TestKey',
+            'valueForKey': 'TestValueForKey'
           },
           null,
           null
@@ -188,7 +188,7 @@ describe('interpolate-vars: interpolateVars', () => {
        * It should NOT turn process env vars into literal segments.
        * Otherwise, Handlebars will try to access the var literally
        */
-      it("If there's a var that starts with 'process.env.'", async () => {
+      it('If there\'s a var that starts with \'process.env.\'', async () => {
         const request = { method: 'GET', url: '{{process.env.TEST_VAR}}' };
 
         const result = interpolateVars(request, null, null, { TEST_VAR: 'test.com' });
@@ -255,21 +255,21 @@ describe('interpolate-vars: interpolateVars', () => {
 
   describe('Does NOT interpolate string', () => {
     describe('With environment variables', () => {
-      it("If it's not a var (no braces)", async () => {
+      it('If it\'s not a var (no braces)', async () => {
         const request = { method: 'GET', url: 'test' };
 
         const result = interpolateVars(request, { 'test.url': 'test.com' }, null, null);
         expect(result.url).toEqual('test');
       });
 
-      it("If it's not a var (only 1 set of braces)", async () => {
+      it('If it\'s not a var (only 1 set of braces)', async () => {
         const request = { method: 'GET', url: '{test.url}' };
 
         const result = interpolateVars(request, { 'test.url': 'test.com' }, null, null);
         expect(result.url).toEqual('{test.url}');
       });
 
-      it("If it's not a var (1 opening & 2 closing braces)", async () => {
+      it('If it\'s not a var (1 opening & 2 closing braces)', async () => {
         const request = { method: 'GET', url: '{test.url}}' };
 
         const result = interpolateVars(request, { 'test.url': 'test.com' }, null, null);
diff --git a/packages/bruno-electron/tests/network/prepare-request.spec.js b/packages/bruno-electron/tests/network/prepare-request.spec.js
index ec14ad3c0..89ba9c520 100644
--- a/packages/bruno-electron/tests/network/prepare-request.spec.js
+++ b/packages/bruno-electron/tests/network/prepare-request.spec.js
@@ -39,4 +39,4 @@ describe('prepare-request: prepareRequest', () => {
       expect(result.headers['content-type']).toEqual('application/json');
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-electron/tests/prepare-request.test.js b/packages/bruno-electron/tests/prepare-request.test.js
index 9830b45c3..fbbc477dc 100644
--- a/packages/bruno-electron/tests/prepare-request.test.js
+++ b/packages/bruno-electron/tests/prepare-request.test.js
@@ -26,21 +26,21 @@ describe('setAuthHeaders', () => {
   beforeEach(() => {
     // Reset all mocks
     jest.clearAllMocks();
-    
+
     // Reset crypto mock to return predictable values
     crypto.randomBytes.mockReturnValue(Buffer.from('1234567890abcdef', 'hex'));
-    
+
     // Setup default mock objects
     mockAxiosRequest = {
       headers: {}
     };
-    
+
     mockRequest = {
       auth: {
         mode: 'none'
       }
     };
-    
+
     mockCollectionRoot = {
       request: {
         auth: null
@@ -50,10 +50,10 @@ describe('setAuthHeaders', () => {
     // Setup a more sophisticated mock for lodash get function
     mockGet.mockImplementation((obj, path, defaultValue) => {
       if (!obj) return defaultValue;
-      
+
       const keys = path.split('.');
       let current = obj;
-      
+
       for (const key of keys) {
         if (current && typeof current === 'object' && key in current) {
           current = current[key];
@@ -61,7 +61,7 @@ describe('setAuthHeaders', () => {
           return defaultValue;
         }
       }
-      
+
       return current;
     });
   });
@@ -79,7 +79,7 @@ describe('setAuthHeaders', () => {
           profileName: 'default'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -102,7 +102,7 @@ describe('setAuthHeaders', () => {
           password: 'testpass'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -120,7 +120,7 @@ describe('setAuthHeaders', () => {
           token: 'test-token'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -136,7 +136,7 @@ describe('setAuthHeaders', () => {
           password: 'testpass'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -156,7 +156,7 @@ describe('setAuthHeaders', () => {
           domain: 'testdomain'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -176,7 +176,7 @@ describe('setAuthHeaders', () => {
           password: 'testpass'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -193,7 +193,7 @@ describe('setAuthHeaders', () => {
           placement: 'header'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -210,7 +210,7 @@ describe('setAuthHeaders', () => {
           placement: 'queryparams'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -231,7 +231,7 @@ describe('setAuthHeaders', () => {
           placement: 'header'
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -263,7 +263,7 @@ describe('setAuthHeaders', () => {
           additionalParameters: { authorization: [], token: [], refresh: [] }
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -312,7 +312,7 @@ describe('setAuthHeaders', () => {
           additionalParameters: { authorization: [], token: [], refresh: [] }
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -357,7 +357,7 @@ describe('setAuthHeaders', () => {
           additionalParameters: { authorization: [], token: [], refresh: [] }
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -398,7 +398,7 @@ describe('setAuthHeaders', () => {
           additionalParameters: { authorization: [], token: [], refresh: [] }
         }
       };
-      
+
       mockRequest.auth.mode = 'inherit';
 
       const result = setAuthHeaders(mockAxiosRequest, mockRequest, mockCollectionRoot);
@@ -434,7 +434,7 @@ describe('setAuthHeaders', () => {
           region: 'us-east-1',
           profileName: 'default'
         }
-      }
+      };
       mockRequest.auth = {
         mode: 'awsv4',
         awsv4: {
@@ -624,7 +624,7 @@ describe('setAuthHeaders', () => {
       });
     });
 
-        test('should set OAuth2 password grant at request level', () => {
+    test('should set OAuth2 password grant at request level', () => {
       mockCollectionRoot.request.auth = {
         mode: 'oauth2',
         oauth2: {
@@ -702,7 +702,7 @@ describe('setAuthHeaders', () => {
           username: 'collectionuser',
           password: 'collectionpass',
           clientId: 'collection-client',
-          clientSecret: 'collection-secret',
+          clientSecret: 'collection-secret'
         }
       };
       mockRequest.auth = {
diff --git a/packages/bruno-electron/tests/store/global-environments.test.js b/packages/bruno-electron/tests/store/global-environments.test.js
index b01e762fb..a5dd323ac 100644
--- a/packages/bruno-electron/tests/store/global-environments.test.js
+++ b/packages/bruno-electron/tests/store/global-environments.test.js
@@ -13,20 +13,20 @@ describe('global environment variable type backward compatibility', () => {
     const mockGlobalEnvironments = [
       {
         uid: 'yDlwWe3qgimPG20G7AbF7',
-        name: "Test Environment",
+        name: 'Test Environment',
         variables: [
           {
             uid: 'b6BIHGaCrm4m97YA2dIdx',
-            name: "regular_var",
-            value: "regular_value",
+            name: 'regular_var',
+            value: 'regular_value',
             enabled: true,
             secret: false
             // Missing: type field
           },
           {
             uid: 'yQTqanPoMdRjKnHyIOZNc',
-            name: "secret_var",
-            value: "secret_value",
+            name: 'secret_var',
+            value: 'secret_value',
             enabled: true,
             secret: true
             // Missing: type field
@@ -42,8 +42,8 @@ describe('global environment variable type backward compatibility', () => {
     expect(processedEnvironments).toHaveLength(1);
     expect(processedEnvironments[0].variables).toHaveLength(2);
 
-    const regularVar = processedEnvironments[0].variables.find(v => v.name === 'regular_var');
-    const secretVar = processedEnvironments[0].variables.find(v => v.name === 'secret_var');
+    const regularVar = processedEnvironments[0].variables.find((v) => v.name === 'regular_var');
+    const secretVar = processedEnvironments[0].variables.find((v) => v.name === 'secret_var');
 
     expect(regularVar.name).toBe('regular_var');
     expect(regularVar.type).toBe('text');
diff --git a/packages/bruno-electron/tests/utils/collection.spec.js b/packages/bruno-electron/tests/utils/collection.spec.js
index 363537db6..2653f97f3 100644
--- a/packages/bruno-electron/tests/utils/collection.spec.js
+++ b/packages/bruno-electron/tests/utils/collection.spec.js
@@ -1,4 +1,4 @@
-const { parseBruFileMeta } = require("../../src/utils/collection");
+const { parseBruFileMeta } = require('../../src/utils/collection');
 
 describe('parseBruFileMeta', () => {
   test('parses valid meta block correctly', () => {
@@ -285,4 +285,4 @@ describe('parseBruFileMeta', () => {
       }
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-electron/tests/utils/common.spec.js b/packages/bruno-electron/tests/utils/common.spec.js
index 077aac16d..81e620e78 100644
--- a/packages/bruno-electron/tests/utils/common.spec.js
+++ b/packages/bruno-electron/tests/utils/common.spec.js
@@ -1,17 +1,18 @@
-const { flattenDataForDotNotation } = require('../../src/utils/common');
+const { flattenDataForDotNotation, parseDataFromRequest } = require('../../src/utils/common');
+const FormData = require('form-data');
 
 describe('utils: flattenDataForDotNotation', () => {
   test('Flatten a simple object with dot notation', () => {
     const input = {
       person: {
         name: 'John',
-        age: 30,
-      },
+        age: 30
+      }
     };
 
     const expectedOutput = {
       'person.name': 'John',
-      'person.age': 30,
+      'person.age': 30
     };
 
     expect(flattenDataForDotNotation(input)).toEqual(expectedOutput);
@@ -21,65 +22,85 @@ describe('utils: flattenDataForDotNotation', () => {
     const input = {
       users: [
         { name: 'Alice', age: 25 },
-        { name: 'Bob', age: 28 },
-      ],
+        { name: 'Bob', age: 28 }
+      ]
     };
-  
+
     const expectedOutput = {
       'users[0].name': 'Alice',
       'users[0].age': 25,
       'users[1].name': 'Bob',
-      'users[1].age': 28,
+      'users[1].age': 28
     };
-  
+
     expect(flattenDataForDotNotation(input)).toEqual(expectedOutput);
   });
-  
+
   test('Flatten an empty object', () => {
     const input = {};
-  
+
     const expectedOutput = {};
-  
+
     expect(flattenDataForDotNotation(input)).toEqual(expectedOutput);
   });
-  
+
   test('Flatten an object with nested objects', () => {
     const input = {
       person: {
         name: 'Alice',
         address: {
           city: 'New York',
-          zipcode: '10001',
-        },
-      },
+          zipcode: '10001'
+        }
+      }
     };
-  
+
     const expectedOutput = {
       'person.name': 'Alice',
       'person.address.city': 'New York',
-      'person.address.zipcode': '10001',
+      'person.address.zipcode': '10001'
     };
-  
+
     expect(flattenDataForDotNotation(input)).toEqual(expectedOutput);
   });
-  
+
   test('Flatten an object with arrays of objects', () => {
     const input = {
       teams: [
         { name: 'Team A', members: ['Alice', 'Bob'] },
-        { name: 'Team B', members: ['Charlie', 'David'] },
-      ],
+        { name: 'Team B', members: ['Charlie', 'David'] }
+      ]
     };
-  
+
     const expectedOutput = {
       'teams[0].name': 'Team A',
       'teams[0].members[0]': 'Alice',
       'teams[0].members[1]': 'Bob',
       'teams[1].name': 'Team B',
       'teams[1].members[0]': 'Charlie',
-      'teams[1].members[1]': 'David',
+      'teams[1].members[1]': 'David'
     };
-  
+
     expect(flattenDataForDotNotation(input)).toEqual(expectedOutput);
   });
-});
\ No newline at end of file
+});
+
+describe('utils: parseDataFromRequest', () => {
+  test('should format multipart FormData', () => {
+    const formData = new FormData();
+    formData._boundary = 'boundary123';
+    const request = {
+      data: formData,
+      _originalMultipartData: [
+        { name: 'description', type: 'text', value: 'dfv' },
+        { name: 'file', type: 'file', value: ['Dumy.xml'] }
+      ],
+      headers: {}
+    };
+
+    const result = parseDataFromRequest(request);
+    expect(result.data).toContain('name: description');
+    expect(result.data).toContain('value: dfv');
+    expect(result.data).toContain('value: [File: Dumy.xml]');
+  });
+});
diff --git a/packages/bruno-electron/tests/utils/form-data.spec.js b/packages/bruno-electron/tests/utils/form-data.spec.js
new file mode 100644
index 000000000..8d7443ef7
--- /dev/null
+++ b/packages/bruno-electron/tests/utils/form-data.spec.js
@@ -0,0 +1,46 @@
+const { formatMultipartData } = require('../../src/utils/form-data');
+
+describe('utils: formatMultipartData', () => {
+  test('should format text field', () => {
+    const data = [{ name: 'description', type: 'text', value: 'dfv' }];
+    const result = formatMultipartData(data, 'boundary');
+
+    expect(result).toContain('----boundary');
+    expect(result).toContain('Content-Disposition: form-data');
+    expect(result).toContain('name: description');
+    expect(result).toContain('value: dfv');
+    expect(result).toContain('----boundary--');
+  });
+
+  test('should format file field', () => {
+    const data = [{ name: 'file', type: 'file', value: ['Dumy.xml'] }];
+    const result = formatMultipartData(data, 'boundary');
+
+    expect(result).toContain('name: file');
+    expect(result).toContain('value: [File: Dumy.xml]');
+  });
+
+  test('should format multiple fields', () => {
+    const data = [
+      { name: 'description', type: 'text', value: 'dfv' },
+      { name: 'file', type: 'file', value: ['Dumy.xml'] }
+    ];
+    const result = formatMultipartData(data, 'boundary');
+
+    expect(result).toContain('name: description');
+    expect(result).toContain('value: dfv');
+    expect(result).toContain('name: file');
+    expect(result).toContain('value: [File: Dumy.xml]');
+  });
+
+  test('should return empty string for invalid input', () => {
+    expect(formatMultipartData([], 'boundary')).toBe('');
+    expect(formatMultipartData(null, 'boundary')).toBe('');
+  });
+
+  test('should normalize boundary', () => {
+    const data = [{ name: 'field', type: 'text', value: 'value' }];
+    expect(formatMultipartData(data, '--boundary')).toContain('----boundary');
+    expect(formatMultipartData(data, 'boundary--')).toContain('----boundary');
+  });
+});
diff --git a/packages/bruno-filestore/package.json b/packages/bruno-filestore/package.json
index edf79b6f1..0b7078d46 100644
--- a/packages/bruno-filestore/package.json
+++ b/packages/bruno-filestore/package.json
@@ -13,7 +13,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "prebuild": "npm run clean",
-    "build": "rollup -c",
+    "build": "rollup -c && tsc --emitDeclarationOnly",
     "watch": "rollup -c -w",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -22,14 +22,18 @@
   "devDependencies": {
     "@babel/preset-env": "^7.22.0",
     "@babel/preset-typescript": "^7.22.0",
+    "@opencollection/types": "0.1.0",
+    "@usebruno/schema-types": "0.0.1",
     "@rollup/plugin-commonjs": "^23.0.2",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
-    "@rollup/plugin-typescript": "^9.0.2",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.191",
     "@types/node": "^24.1.0",
     "babel-jest": "^29.7.0",
     "jest": "^29.2.0",
+    "nanoid": "3.3.8",
     "rimraf": "^3.0.2",
     "rollup": "3.29.5",
     "rollup-plugin-dts": "^5.0.0",
@@ -41,7 +45,10 @@
     "rollup": "3.29.5"
   },
   "dependencies": {
+    "@types/nanoid": "^2.1.0",
     "@usebruno/lang": "0.12.0",
-    "lodash": "^4.17.21"
+    "ajv": "^8.17.1",
+    "lodash": "^4.17.21",
+    "yaml": "^2.3.4"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/bruno-filestore/rollup.config.js b/packages/bruno-filestore/rollup.config.js
index e272dc015..054ea3fbc 100644
--- a/packages/bruno-filestore/rollup.config.js
+++ b/packages/bruno-filestore/rollup.config.js
@@ -1,12 +1,43 @@
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
 const commonjs = require('@rollup/plugin-commonjs');
 const typescript = require('@rollup/plugin-typescript');
-const dts = require('rollup-plugin-dts');
+const json = require('@rollup/plugin-json');
 const { terser } = require('rollup-plugin-terser');
 const peerDepsExternal = require('rollup-plugin-peer-deps-external');
 
 const packageJson = require('./package.json');
 
+const externalDeps = [
+  '@usebruno/lang',
+  '@usebruno/schema-types',
+  /@usebruno\/schema-types\/.*/,
+  '@opencollection/types',
+  /@opencollection\/types\/.*/,
+  // Runtime dependencies
+  'lodash',
+  'yaml',
+  'ajv',
+  // Node built-ins
+  'worker_threads',
+  'path',
+  'fs'
+];
+
+const commonPlugins = [
+  peerDepsExternal(),
+  nodeResolve({
+    extensions: ['.js', '.ts', '.tsx', '.json']
+  }),
+  json(),
+  commonjs(),
+  typescript({
+    tsconfig: './tsconfig.json',
+    declaration: false,
+    declarationMap: false
+  }),
+  terser()
+];
+
 module.exports = [
   {
     input: 'src/index.ts',
@@ -24,16 +55,8 @@ module.exports = [
         exports: 'named'
       }
     ],
-    plugins: [
-      peerDepsExternal(),
-      nodeResolve({
-        extensions: ['.js', '.ts', '.tsx', '.json', '.css']
-      }),
-      commonjs(),
-      typescript({ tsconfig: './tsconfig.json' }),
-      terser(),
-    ],
-    external: ['@usebruno/lang', 'lodash', 'worker_threads', 'path']
+    plugins: commonPlugins,
+    external: externalDeps
   },
   {
     input: 'src/workers/worker-script.ts',
@@ -49,15 +72,7 @@ module.exports = [
         sourcemap: true
       }
     ],
-    plugins: [
-      peerDepsExternal(),
-      nodeResolve({
-        extensions: ['.js', '.ts', '.tsx', '.json', '.css']
-      }),
-      commonjs(),
-      typescript({ tsconfig: './tsconfig.json' }),
-      terser(),
-    ],
-    external: ['@usebruno/lang', 'lodash', 'worker_threads', 'path']
+    plugins: commonPlugins,
+    external: externalDeps
   }
-]; 
\ No newline at end of file
+];
diff --git a/packages/bruno-filestore/src/formats/bru/index.ts b/packages/bruno-filestore/src/formats/bru/index.ts
index 3d3fe02ba..ba000e1d6 100644
--- a/packages/bruno-filestore/src/formats/bru/index.ts
+++ b/packages/bruno-filestore/src/formats/bru/index.ts
@@ -9,7 +9,7 @@ import {
 } from '@usebruno/lang';
 import { getOauth2AdditionalParameters } from './utils/oauth2-additional-params';
 
-export const bruRequestToJson = (data: string | any, parsed: boolean = false): any => {
+export const parseBruRequest = (data: string | any, parsed: boolean = false): any => {
   try {
     const json = parsed ? data : bruToJsonV2(data);
 
@@ -109,12 +109,12 @@ export const bruRequestToJson = (data: string | any, parsed: boolean = false): a
     }
     return transformedJson;
   } catch (error) {
-    console.log('bruRequestToJson error', error);
+    console.log('parseBruRequest error', error);
     throw error;
   }
 };
 
-export const jsonRequestToBru = (json: any): string => {
+export const stringifyBruRequest = (json: any): string => {
   try {
     let type = _.get(json, 'type');
     switch (type) {
@@ -160,8 +160,8 @@ export const jsonRequestToBru = (json: any): string => {
         mode: 'json',
         json: '{}'
       });
-    } // For gRPC, add gRPC-specific structure but maintain field names
-    else if (type === 'grpc') {
+    } else if (type === 'grpc') {
+      // For gRPC, add gRPC-specific structure but maintain field names
       bruJson.grpc = {
         url: _.get(json, 'request.url'),
         auth: _.get(json, 'request.auth.mode', 'none'),
@@ -227,7 +227,7 @@ export const jsonRequestToBru = (json: any): string => {
   }
 };
 
-export const bruCollectionToJson = (data: string | any, parsed: boolean = false): any => {
+export const parseBruCollection = (data: string | any, parsed: boolean = false): any => {
   try {
     const json = parsed ? data : _collectionBruToJson(data);
 
@@ -273,7 +273,7 @@ export const bruCollectionToJson = (data: string | any, parsed: boolean = false)
   }
 };
 
-export const jsonCollectionToBru = (json: any, isFolder?: boolean): string => {
+export const stringifyBruCollection = (json: any, isFolder?: boolean): string => {
   try {
     const collectionBruJson: any = {
       headers: _.get(json, 'request.headers', []),
@@ -314,7 +314,7 @@ export const jsonCollectionToBru = (json: any, isFolder?: boolean): string => {
   }
 };
 
-export const bruEnvironmentToJson = (bru: string): any => {
+export const parseBruEnvironment = (bru: string): any => {
   try {
     const json = bruToEnvJsonV2(bru);
 
@@ -331,7 +331,7 @@ export const bruEnvironmentToJson = (bru: string): any => {
   }
 };
 
-export const jsonEnvironmentToBru = (json: any): string => {
+export const stringifyBruEnvironment = (json: any): string => {
   try {
     const bru = envJsonToBruV2(json);
     return bru;
diff --git a/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js b/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js
index 707c6127c..51039f1aa 100644
--- a/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js
+++ b/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js
@@ -1,5 +1,5 @@
 const { getOauth2AdditionalParameters } = require('../utils/oauth2-additional-params');
-const { bruRequestToJson, bruCollectionToJson } = require('../index');
+const { parseBruRequest, parseBruCollection } = require('../index');
 const { getBruJsonWithAdditionalParams } = require('./fixtures/oauth2-additional-params');
 
 describe('getOauth2AdditionalParameters', () => {
diff --git a/packages/bruno-filestore/src/formats/bru/utils/oauth2-additional-params.ts b/packages/bruno-filestore/src/formats/bru/utils/oauth2-additional-params.ts
index 54a613807..1102ce675 100644
--- a/packages/bruno-filestore/src/formats/bru/utils/oauth2-additional-params.ts
+++ b/packages/bruno-filestore/src/formats/bru/utils/oauth2-additional-params.ts
@@ -5,7 +5,7 @@ export interface T_OAuth2AdditionalParam {
   name: string;
   value: string;
   enabled: boolean;
-  sendIn: T_Oauth2ParameterSendInType
+  sendIn: T_Oauth2ParameterSendInType;
 }
 
 export interface T_OAuth2AdditionalParameters {
@@ -43,16 +43,16 @@ const PARAMETER_MAPPINGS: T_Oauth2ParameterMapping[] = [
   // Authorization parameters (only for authorization_code grant type)
   { type: 'authorization', sendIn: 'headers', source: 'oauth2_additional_parameters_auth_req_headers' },
   { type: 'authorization', sendIn: 'queryparams', source: 'oauth2_additional_parameters_auth_req_queryparams' },
-  
+
   // Token parameters (for all grant types)
   { type: 'token', sendIn: 'headers', source: 'oauth2_additional_parameters_access_token_req_headers' },
   { type: 'token', sendIn: 'queryparams', source: 'oauth2_additional_parameters_access_token_req_queryparams' },
   { type: 'token', sendIn: 'body', source: 'oauth2_additional_parameters_access_token_req_bodyvalues' },
-  
+
   // Refresh parameters (for grant types that support refresh)
   { type: 'refresh', sendIn: 'headers', source: 'oauth2_additional_parameters_refresh_token_req_headers' },
   { type: 'refresh', sendIn: 'queryparams', source: 'oauth2_additional_parameters_refresh_token_req_queryparams' },
-  { type: 'refresh', sendIn: 'body', source: 'oauth2_additional_parameters_refresh_token_req_bodyvalues' },
+  { type: 'refresh', sendIn: 'body', source: 'oauth2_additional_parameters_refresh_token_req_bodyvalues' }
 ];
 
 /**
@@ -62,8 +62,8 @@ const mapParametersFromSource = (sourceParams: any[], sendIn: T_Oauth2ParameterS
   if (!sourceParams?.length) {
     return [];
   }
-  
-  return sourceParams.map(param => ({
+
+  return sourceParams.map((param) => ({
     ...param,
     sendIn
   }));
@@ -81,7 +81,7 @@ const shouldIncludeParameterType = (type: T_Oauth2ParameterType, grantType: stri
   if (type === 'token' || type === 'refresh') {
     return grantType !== 'implicit';
   }
-  
+
   // Token and refresh parameters are valid for all grant types
   return true;
 };
@@ -90,15 +90,15 @@ const shouldIncludeParameterType = (type: T_Oauth2ParameterType, grantType: stri
  * Collects all parameters for a specific type (authorization, token, or refresh)
  */
 const collectParametersForType = (
-  json: T_BruJson, 
-  type: T_Oauth2ParameterType, 
+  json: T_BruJson,
+  type: T_Oauth2ParameterType,
   grantType: string
 ): T_OAuth2AdditionalParam[] => {
   if (!shouldIncludeParameterType(type, grantType)) {
     return [];
   }
 
-  const relevantMappings = PARAMETER_MAPPINGS.filter(mapping => mapping.type === type);
+  const relevantMappings = PARAMETER_MAPPINGS.filter((mapping) => mapping.type === type);
   const allParams: T_OAuth2AdditionalParam[] = [];
 
   for (const mapping of relevantMappings) {
@@ -113,29 +113,28 @@ const collectParametersForType = (
 /**
  * This function extracts OAuth2 additional parameters from various sources in the bru json data and organizes
  * them into a structured format based on their usage context (authorization, token, refresh).
- * 
+ *
  * @param json - json object containing OAuth2 configuration and additional parameters
  * @returns OAuth2 additional parameters
  */
-export const getOauth2AdditionalParameters = (json: T_BruJson): T_OAuth2AdditionalParameters  => {
+export const getOauth2AdditionalParameters = (json: T_BruJson): T_OAuth2AdditionalParameters => {
   const grantType = json.auth.oauth2.grantType;
   const additionalParameters: T_OAuth2AdditionalParameters = {};
 
   try {
     // Collect parameters for each type
     const parameterTypes: T_Oauth2ParameterType[] = ['authorization', 'token', 'refresh'];
-    
+
     for (const type of parameterTypes) {
       const params = collectParametersForType(json, type, grantType);
       if (params.length > 0) {
         additionalParameters[type] = params;
       }
     }
-  }
-  catch(error) {
+  } catch (error) {
     console.error(error);
-    console.error("Error while getting the oauth2 additional parameters!");
+    console.error('Error while getting the oauth2 additional parameters!');
   }
-  
+
   return additionalParameters;
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-filestore/src/formats/bru/utils/request-parse-and-redact-body-data.ts b/packages/bruno-filestore/src/formats/bru/utils/request-parse-and-redact-body-data.ts
index 6e2313575..99b4e5c69 100644
--- a/packages/bruno-filestore/src/formats/bru/utils/request-parse-and-redact-body-data.ts
+++ b/packages/bruno-filestore/src/formats/bru/utils/request-parse-and-redact-body-data.ts
@@ -7,11 +7,11 @@ export const bruRequestParseAndRedactBodyData = (bruFileContent: string) => {
   try {
     // Define the patterns that indicate the start of different body types
     const bodyTypePatterns = [
-      "body:json {",
-      "body:text {",
-      "body:xml {",
-      "body:sparql {",
-      "body:graphql {"
+      'body:json {',
+      'body:text {',
+      'body:xml {',
+      'body:sparql {',
+      'body:graphql {'
     ];
 
     // Normalize line endings to LF
@@ -37,30 +37,30 @@ export const bruRequestParseAndRedactBodyData = (bruFileContent: string) => {
 
     // Split the file content into blocks
     let fileContentBlocks = bruFileContent.split(`${EOL}}${EOL}`);
-    fileContentBlocks = fileContentBlocks.filter(Boolean).map(_ => _.trim());
+    fileContentBlocks = fileContentBlocks.filter(Boolean).map((_) => _.trim());
 
     // Extract body blocks and their content
     const extractedBodyBlocks = fileContentBlocks
-      .filter(block => bodyTypePatterns.some(pattern => block.startsWith(pattern)))
+      .filter((block) => bodyTypePatterns.some((pattern) => block.startsWith(pattern)))
       .reduce((bodyContentMap: Record<string, string>, bodyBlock) => {
         // Extract the body type (json, text, xml, etc.) from the first line
         const firstLine = bodyBlock.split(EOL)[0];
         const bodyType = firstLine.split(`body:`)[1].split(/\s/)[0];
-        
+
         // Extract the body content (everything between the opening and closing braces)
         const bodyContentLines = bodyBlock.split(EOL).slice(1);
         const rawBodyContent = bodyContentLines.join(EOL);
-        
+
         // Remove indentation from the body content
         const cleanBodyContent = removeLeadingIndentation(rawBodyContent);
-        
+
         bodyContentMap[bodyType] = cleanBodyContent;
         return bodyContentMap;
       }, {});
 
     // Filter out body blocks to get the remaining file content
-    const fileContentWithoutBodyBlocks = fileContentBlocks.filter(block => 
-      !bodyTypePatterns.some(pattern => block.startsWith(pattern))
+    const fileContentWithoutBodyBlocks = fileContentBlocks.filter((block) =>
+      !bodyTypePatterns.some((pattern) => block.startsWith(pattern))
     );
 
     return {
@@ -74,4 +74,4 @@ export const bruRequestParseAndRedactBodyData = (bruFileContent: string) => {
       extractedBodyContent: {}
     };
   }
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/assertions.ts b/packages/bruno-filestore/src/formats/yml/common/assertions.ts
new file mode 100644
index 000000000..03c243903
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/assertions.ts
@@ -0,0 +1,146 @@
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import type { Assertion } from '@opencollection/types/common/assertions';
+import { uuid } from '../../../utils';
+
+const OPERATORS = [
+  'eq',
+  'neq',
+  'gt',
+  'gte',
+  'lt',
+  'lte',
+  'in',
+  'notIn',
+  'contains',
+  'notContains',
+  'length',
+  'matches',
+  'notMatches',
+  'startsWith',
+  'endsWith',
+  'between',
+  'isEmpty',
+  'isNotEmpty',
+  'isNull',
+  'isUndefined',
+  'isDefined',
+  'isTruthy',
+  'isFalsy',
+  'isJson',
+  'isNumber',
+  'isString',
+  'isBoolean',
+  'isArray'
+] as const;
+
+const UNARY_OPERATORS = [
+  'isEmpty',
+  'isNotEmpty',
+  'isNull',
+  'isUndefined',
+  'isDefined',
+  'isTruthy',
+  'isFalsy',
+  'isJson',
+  'isNumber',
+  'isString',
+  'isBoolean',
+  'isArray'
+] as const;
+
+type Operator = typeof OPERATORS[number];
+
+const parseAssertionOperator = (str: string = ''): { operator: Operator; value: string | undefined } => {
+  if (!str || typeof str !== 'string' || !str.length) {
+    return {
+      operator: 'eq',
+      value: str
+    };
+  }
+
+  const [firstWord, ...rest] = str.trim().split(' ');
+  const remainingValue = rest.join(' ');
+
+  // Check if first word is a unary operator
+  if (UNARY_OPERATORS.includes(firstWord as any)) {
+    return {
+      operator: firstWord as Operator,
+      value: undefined
+    };
+  }
+
+  // Check if first word is any recognized operator
+  if (OPERATORS.includes(firstWord as any)) {
+    return {
+      operator: firstWord as Operator,
+      value: remainingValue
+    };
+  }
+
+  // If not a recognized operator, treat the whole string as value with 'eq' operator
+  return {
+    operator: 'eq',
+    value: str
+  };
+};
+
+export const toOpenCollectionAssertions = (assertions: BrunoKeyValue[] | null | undefined): Assertion[] | undefined => {
+  if (!assertions?.length) {
+    return undefined;
+  }
+
+  const ocAssertions: Assertion[] = assertions.map((assertion: BrunoKeyValue): Assertion => {
+    const { operator, value } = parseAssertionOperator(assertion.value || '');
+
+    const ocAssertion: Assertion = {
+      expression: assertion.name || '',
+      operator,
+      ...(value !== undefined && { value })
+    };
+
+    if (assertion?.description?.trim().length) {
+      ocAssertion.description = assertion.description;
+    }
+
+    if (assertion.enabled === false) {
+      ocAssertion.disabled = true;
+    }
+
+    return ocAssertion;
+  });
+
+  return ocAssertions.length > 0 ? ocAssertions : undefined;
+};
+
+export const toBrunoAssertions = (assertions: Assertion[] | null | undefined): BrunoKeyValue[] | undefined => {
+  if (!assertions?.length) {
+    return undefined;
+  }
+
+  const brunoAssertions: BrunoKeyValue[] = assertions.map((assertion: Assertion): BrunoKeyValue => {
+    // Reconstruct the "operator value" format that Bruno uses
+    let valueString = assertion.operator;
+    if (assertion.value !== undefined && assertion.value !== null) {
+      valueString = `${assertion.operator} ${assertion.value}`;
+    }
+
+    const brunoAssertion: BrunoKeyValue = {
+      uid: uuid(),
+      name: assertion.expression || '',
+      value: valueString,
+      enabled: assertion.disabled !== true
+    };
+
+    if (assertion.description) {
+      if (typeof assertion.description === 'string' && assertion.description.trim().length) {
+        brunoAssertion.description = assertion.description;
+      } else if (typeof assertion.description === 'object' && assertion.description.content?.trim().length) {
+        brunoAssertion.description = assertion.description.content;
+      }
+    }
+
+    return brunoAssertion;
+  });
+
+  return brunoAssertions.length > 0 ? brunoAssertions : undefined;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/auth-oauth2.ts b/packages/bruno-filestore/src/formats/yml/common/auth-oauth2.ts
new file mode 100644
index 000000000..5e52918cd
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/auth-oauth2.ts
@@ -0,0 +1,553 @@
+import type {
+  AuthOAuth2,
+  OAuth2AdditionalParameter,
+  OAuth2AuthorizationCodeFlow,
+  OAuth2ClientCredentials,
+  OAuth2ClientCredentialsFlow,
+  OAuth2ImplicitFlow,
+  OAuth2PKCE,
+  OAuth2ResourceOwner,
+  OAuth2ResourceOwnerPasswordFlow,
+  OAuth2Settings,
+  OAuth2TokenConfig
+} from '@opencollection/types/common/auth';
+import type {
+  OAuth2 as BrunoOAuth2,
+  OAuthAdditionalParameter as BrunoOAuthAdditionalParameter
+} from '@usebruno/schema-types/common/auth';
+import { isString, isNonEmptyString } from '../../../utils';
+
+const normalizeBoolean = (value?: boolean | null): boolean | undefined =>
+  typeof value === 'boolean' ? value : undefined;
+
+const mapSendIn = (sendIn?: string | null): OAuth2AdditionalParameter['placement'] | undefined => {
+  if (!isString(sendIn)) {
+    return undefined;
+  }
+
+  switch (sendIn.trim().toLowerCase()) {
+    case 'headers':
+      return 'header';
+    case 'queryparams':
+      return 'query';
+    case 'body':
+      return 'body';
+    default:
+      return undefined;
+  }
+};
+
+const mapAdditionalParameters = (params?: BrunoOAuthAdditionalParameter[] | null): OAuth2AdditionalParameter[] | undefined => {
+  if (!Array.isArray(params) || params.length === 0) {
+    return undefined;
+  }
+
+  const mapped = params
+    .filter((param) => param && isNonEmptyString(param.name))
+    .map((param) => {
+      const placement = mapSendIn(param!.sendIn);
+      if (!placement) {
+        return undefined;
+      }
+
+      const mappedParam: OAuth2AdditionalParameter = {
+        name: param!.name!.trim(),
+        placement
+      };
+
+      isNonEmptyString(param!.value) && (mappedParam.value = param.value);
+
+      return mappedParam;
+    })
+    .filter((param): param is OAuth2AdditionalParameter => Boolean(param));
+
+  return mapped.length > 0 ? mapped : undefined;
+};
+
+const buildClientCredentials = (oauth: BrunoOAuth2): OAuth2ClientCredentials | undefined => {
+  const credentials: OAuth2ClientCredentials = {};
+
+  isNonEmptyString(oauth.clientId) && (credentials.clientId = oauth.clientId);
+  isNonEmptyString(oauth.clientSecret) && (credentials.clientSecret = oauth.clientSecret);
+  isNonEmptyString(oauth.credentialsPlacement) && (credentials.placement = oauth.credentialsPlacement);
+
+  return Object.keys(credentials).length > 0 ? credentials : undefined;
+};
+
+const buildResourceOwner = (oauth: BrunoOAuth2): OAuth2ResourceOwner | undefined => {
+  const resourceOwner: OAuth2ResourceOwner = {};
+
+  isNonEmptyString(oauth.username) && (resourceOwner.username = oauth.username);
+  isNonEmptyString(oauth.password) && (resourceOwner.password = oauth.password);
+
+  return Object.keys(resourceOwner).length > 0 ? resourceOwner : undefined;
+};
+
+const buildPkce = (pkce?: boolean | null): OAuth2PKCE | undefined => {
+  if (pkce === null || pkce === undefined) {
+    return undefined;
+  }
+
+  return { enabled: Boolean(pkce) };
+};
+
+const buildTokenConfig = (oauth: BrunoOAuth2): OAuth2TokenConfig | undefined => {
+  const tokenConfig: OAuth2TokenConfig = {};
+
+  isNonEmptyString(oauth.credentialsId) && (tokenConfig.id = oauth.credentialsId);
+
+  if (!isNonEmptyString(oauth.tokenPlacement)) {
+    // default to header
+    tokenConfig.placement = { header: '' };
+  }
+
+  if (oauth.tokenPlacement === 'header') {
+    tokenConfig.placement = {
+      header: oauth.tokenHeaderPrefix as string
+    };
+  }
+
+  if (oauth.tokenPlacement === 'url') {
+    tokenConfig.placement = {
+      query: oauth.tokenQueryKey as string
+    };
+  }
+
+  return Object.keys(tokenConfig).length > 0 ? tokenConfig : undefined;
+};
+
+const buildSettings = (oauth: BrunoOAuth2): OAuth2Settings | undefined => {
+  const autoFetchToken = normalizeBoolean(oauth.autoFetchToken);
+  const autoRefreshToken = normalizeBoolean(oauth.autoRefreshToken);
+
+  const settings: OAuth2Settings = {};
+  if (autoFetchToken !== undefined) settings.autoFetchToken = autoFetchToken;
+  if (autoRefreshToken !== undefined) settings.autoRefreshToken = autoRefreshToken;
+
+  return Object.keys(settings).length > 0 ? settings : undefined;
+};
+
+const buildClientCredentialsFlow = (oauth: BrunoOAuth2): OAuth2ClientCredentialsFlow => {
+  const flow: OAuth2ClientCredentialsFlow = {
+    type: 'oauth2',
+    flow: 'client_credentials'
+  };
+
+  isNonEmptyString(oauth.accessTokenUrl) && (flow.accessTokenUrl = oauth.accessTokenUrl);
+  isNonEmptyString(oauth.refreshTokenUrl) && (flow.refreshTokenUrl = oauth.refreshTokenUrl);
+
+  const credentials = buildClientCredentials(oauth);
+  if (credentials) flow.credentials = credentials;
+
+  isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
+
+  const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
+  if (accessTokenRequest) {
+    flow.additionalParameters = { accessTokenRequest };
+  }
+
+  const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
+  if (refreshTokenRequest) {
+    flow.additionalParameters = { refreshTokenRequest };
+  }
+
+  const tokenConfig = buildTokenConfig(oauth);
+  if (tokenConfig) flow.tokenConfig = tokenConfig;
+
+  const settings = buildSettings(oauth);
+  if (settings) flow.settings = settings;
+
+  return flow;
+};
+
+const buildResourceOwnerPasswordFlow = (oauth: BrunoOAuth2): OAuth2ResourceOwnerPasswordFlow => {
+  const flow: OAuth2ResourceOwnerPasswordFlow = {
+    type: 'oauth2',
+    flow: 'resource_owner_password'
+  };
+
+  isNonEmptyString(oauth.accessTokenUrl) && (flow.accessTokenUrl = oauth.accessTokenUrl);
+  isNonEmptyString(oauth.refreshTokenUrl) && (flow.refreshTokenUrl = oauth.refreshTokenUrl);
+
+  const credentials = buildClientCredentials(oauth);
+  if (credentials) flow.credentials = credentials;
+
+  const resourceOwner = buildResourceOwner(oauth);
+  if (resourceOwner) flow.resourceOwner = resourceOwner;
+
+  isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
+
+  const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
+  if (accessTokenRequest) {
+    flow.additionalParameters = { accessTokenRequest };
+  }
+
+  const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
+  if (refreshTokenRequest) {
+    flow.additionalParameters = { refreshTokenRequest };
+  }
+
+  const tokenConfig = buildTokenConfig(oauth);
+  if (tokenConfig) flow.tokenConfig = tokenConfig;
+
+  const settings = buildSettings(oauth);
+  if (settings) flow.settings = settings;
+
+  return flow;
+};
+
+const buildAuthorizationCodeFlow = (oauth: BrunoOAuth2): OAuth2AuthorizationCodeFlow => {
+  const flow: OAuth2AuthorizationCodeFlow = {
+    type: 'oauth2',
+    flow: 'authorization_code'
+  };
+
+  isNonEmptyString(oauth.authorizationUrl) && (flow.authorizationUrl = oauth.authorizationUrl);
+  isNonEmptyString(oauth.accessTokenUrl) && (flow.accessTokenUrl = oauth.accessTokenUrl);
+  isNonEmptyString(oauth.refreshTokenUrl) && (flow.refreshTokenUrl = oauth.refreshTokenUrl);
+  isNonEmptyString(oauth.callbackUrl) && (flow.callbackUrl = oauth.callbackUrl);
+
+  const credentials = buildClientCredentials(oauth);
+  if (credentials) flow.credentials = credentials;
+
+  const authorizationRequest = mapAdditionalParameters(oauth.additionalParameters?.authorization);
+  if (authorizationRequest) {
+    flow.additionalParameters = { authorizationRequest };
+  }
+
+  const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
+  if (accessTokenRequest) {
+    flow.additionalParameters = { accessTokenRequest };
+  }
+
+  const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
+  if (refreshTokenRequest) {
+    flow.additionalParameters = { refreshTokenRequest };
+  }
+
+  isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
+  isNonEmptyString(oauth.state) && (flow.state = oauth.state);
+
+  const pkce = buildPkce(oauth.pkce);
+  if (pkce) flow.pkce = pkce;
+
+  const tokenConfig = buildTokenConfig(oauth);
+  if (tokenConfig) flow.tokenConfig = tokenConfig;
+
+  const settings = buildSettings(oauth);
+  if (settings) flow.settings = settings;
+
+  return flow;
+};
+
+const buildImplicitFlow = (oauth: BrunoOAuth2): OAuth2ImplicitFlow => {
+  const flow: OAuth2ImplicitFlow = {
+    type: 'oauth2',
+    flow: 'implicit'
+  };
+
+  isNonEmptyString(oauth.authorizationUrl) && (flow.authorizationUrl = oauth.authorizationUrl);
+  isNonEmptyString(oauth.callbackUrl) && (flow.callbackUrl = oauth.callbackUrl);
+  isNonEmptyString(oauth.clientId) && (flow.credentials = { clientId: oauth.clientId });
+  isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
+  isNonEmptyString(oauth.state) && (flow.state = oauth.state);
+
+  const authorizationRequest = mapAdditionalParameters(oauth.additionalParameters?.authorization);
+  if (authorizationRequest) {
+    flow.additionalParameters = { authorizationRequest };
+  }
+
+  const tokenConfig = buildTokenConfig(oauth);
+  if (tokenConfig) flow.tokenConfig = tokenConfig;
+
+  const settings = buildSettings(oauth);
+  if (settings) flow.settings = settings;
+
+  return flow;
+};
+
+export const toOpenCollectionOAuth2 = (oauth?: BrunoOAuth2 | null): AuthOAuth2 | undefined => {
+  if (!oauth) {
+    return undefined;
+  }
+
+  switch (oauth.grantType) {
+    case 'client_credentials':
+      return buildClientCredentialsFlow(oauth);
+    case 'password':
+      return buildResourceOwnerPasswordFlow(oauth);
+    case 'authorization_code':
+      return buildAuthorizationCodeFlow(oauth);
+    case 'implicit':
+      return buildImplicitFlow(oauth);
+    default:
+      console.warn(`toOpenCollectionOAuth2: Unsupported OAuth2 grant type "${oauth.grantType}".`);
+      return undefined;
+  }
+};
+
+const reversePlacementMapping = (placement?: OAuth2AdditionalParameter['placement']): 'headers' | 'queryparams' | 'body' | null => {
+  if (!placement) {
+    return null;
+  }
+
+  switch (placement) {
+    case 'header':
+      return 'headers';
+    case 'query':
+      return 'queryparams';
+    case 'body':
+      return 'body';
+    default:
+      return null;
+  }
+};
+
+const reverseAdditionalParameters = (params?: OAuth2AdditionalParameter[]): BrunoOAuthAdditionalParameter[] | null => {
+  if (!Array.isArray(params) || params.length === 0) {
+    return null;
+  }
+
+  const mapped = params.map((param): BrunoOAuthAdditionalParameter => {
+    const sendIn = reversePlacementMapping(param.placement);
+
+    return {
+      name: param.name || null,
+      value: param.value || null,
+      sendIn: sendIn || 'headers',
+      enabled: true
+    };
+  });
+
+  return mapped.length > 0 ? mapped : null;
+};
+
+export const toBrunoOAuth2 = (oauth: AuthOAuth2 | null | undefined): BrunoOAuth2 | null => {
+  if (!oauth) {
+    return null;
+  }
+
+  const brunoOAuth: BrunoOAuth2 = {
+    grantType: 'authorization_code',
+    username: null,
+    password: null,
+    callbackUrl: null,
+    authorizationUrl: null,
+    accessTokenUrl: null,
+    clientId: null,
+    clientSecret: null,
+    scope: null,
+    state: null,
+    pkce: false, // Default to false for all grant types
+    credentialsPlacement: null,
+    credentialsId: null,
+    tokenPlacement: null,
+    tokenHeaderPrefix: null,
+    tokenQueryKey: null,
+    refreshTokenUrl: null,
+    autoRefreshToken: false, // Default to false
+    autoFetchToken: true, // Default to true
+    additionalParameters: null
+  };
+
+  switch (oauth.flow) {
+    case 'client_credentials':
+      brunoOAuth.grantType = 'client_credentials';
+      if (oauth.accessTokenUrl) brunoOAuth.accessTokenUrl = oauth.accessTokenUrl;
+      if (oauth.refreshTokenUrl) brunoOAuth.refreshTokenUrl = oauth.refreshTokenUrl;
+      if (oauth.credentials?.clientId) brunoOAuth.clientId = oauth.credentials.clientId;
+      if (oauth.credentials?.clientSecret) brunoOAuth.clientSecret = oauth.credentials.clientSecret;
+      if (oauth.credentials?.placement) brunoOAuth.credentialsPlacement = oauth.credentials.placement;
+      if (oauth.scope) brunoOAuth.scope = oauth.scope;
+
+      // token config
+      if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.placement) {
+        if ('header' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'header';
+          brunoOAuth.tokenHeaderPrefix = oauth.tokenConfig.placement.header || '';
+        } else if ('query' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'url';
+          brunoOAuth.tokenQueryKey = oauth.tokenConfig.placement.query || '';
+        }
+      }
+
+      // additional parameters
+      if (oauth.additionalParameters) {
+        const tempParams: Record<string, any> = {};
+        if (oauth.additionalParameters.accessTokenRequest) {
+          const tokenParams = reverseAdditionalParameters(oauth.additionalParameters.accessTokenRequest);
+          if (tokenParams) {
+            tempParams.token = tokenParams;
+          }
+        }
+        if (oauth.additionalParameters.refreshTokenRequest) {
+          const refreshParams = reverseAdditionalParameters(oauth.additionalParameters.refreshTokenRequest);
+          if (refreshParams) {
+            tempParams.refresh = refreshParams;
+          }
+        }
+        // Only set additionalParameters if there are actual parameters
+        if (Object.keys(tempParams).length > 0) {
+          brunoOAuth.additionalParameters = tempParams;
+        }
+      }
+      break;
+
+    case 'resource_owner_password':
+      brunoOAuth.grantType = 'password';
+      if (oauth.accessTokenUrl) brunoOAuth.accessTokenUrl = oauth.accessTokenUrl;
+      if (oauth.refreshTokenUrl) brunoOAuth.refreshTokenUrl = oauth.refreshTokenUrl;
+      if (oauth.credentials?.clientId) brunoOAuth.clientId = oauth.credentials.clientId;
+      if (oauth.credentials?.clientSecret) brunoOAuth.clientSecret = oauth.credentials.clientSecret;
+      if (oauth.credentials?.placement) brunoOAuth.credentialsPlacement = oauth.credentials.placement;
+      if (oauth.resourceOwner?.username) brunoOAuth.username = oauth.resourceOwner.username;
+      if (oauth.resourceOwner?.password) brunoOAuth.password = oauth.resourceOwner.password;
+      if (oauth.scope) brunoOAuth.scope = oauth.scope;
+
+      // token config
+      if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.placement) {
+        if ('header' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'header';
+          brunoOAuth.tokenHeaderPrefix = oauth.tokenConfig.placement.header || '';
+        } else if ('query' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'url';
+          brunoOAuth.tokenQueryKey = oauth.tokenConfig.placement.query || '';
+        }
+      }
+
+      // additional parameters
+      if (oauth.additionalParameters) {
+        const tempParams: Record<string, any> = {};
+        if (oauth.additionalParameters.accessTokenRequest) {
+          const tokenParams = reverseAdditionalParameters(oauth.additionalParameters.accessTokenRequest);
+          if (tokenParams) {
+            tempParams.token = tokenParams;
+          }
+        }
+        if (oauth.additionalParameters.refreshTokenRequest) {
+          const refreshParams = reverseAdditionalParameters(oauth.additionalParameters.refreshTokenRequest);
+          if (refreshParams) {
+            tempParams.refresh = refreshParams;
+          }
+        }
+        // Only set additionalParameters if there are actual parameters
+        if (Object.keys(tempParams).length > 0) {
+          brunoOAuth.additionalParameters = tempParams;
+        }
+      }
+      break;
+
+    case 'authorization_code':
+      brunoOAuth.grantType = 'authorization_code';
+      if (oauth.authorizationUrl) brunoOAuth.authorizationUrl = oauth.authorizationUrl;
+      if (oauth.accessTokenUrl) brunoOAuth.accessTokenUrl = oauth.accessTokenUrl;
+      if (oauth.refreshTokenUrl) brunoOAuth.refreshTokenUrl = oauth.refreshTokenUrl;
+      if (oauth.callbackUrl) brunoOAuth.callbackUrl = oauth.callbackUrl;
+      if (oauth.credentials?.clientId) brunoOAuth.clientId = oauth.credentials.clientId;
+      if (oauth.credentials?.clientSecret) brunoOAuth.clientSecret = oauth.credentials.clientSecret;
+      if (oauth.credentials?.placement) brunoOAuth.credentialsPlacement = oauth.credentials.placement;
+      if (oauth.scope) brunoOAuth.scope = oauth.scope;
+      if (oauth.state) brunoOAuth.state = oauth.state;
+
+      // token config
+      if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.placement) {
+        if ('header' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'header';
+          brunoOAuth.tokenHeaderPrefix = oauth.tokenConfig.placement.header || '';
+        } else if ('query' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'url';
+          brunoOAuth.tokenQueryKey = oauth.tokenConfig.placement.query || '';
+        }
+      }
+
+      // additional parameters
+      if (oauth.additionalParameters) {
+        const tempParams: Record<string, any> = {};
+        if (oauth.additionalParameters.authorizationRequest) {
+          const authParams = reverseAdditionalParameters(oauth.additionalParameters.authorizationRequest);
+          if (authParams) {
+            tempParams.authorization = authParams;
+          }
+        }
+        if (oauth.additionalParameters.accessTokenRequest) {
+          const tokenParams = reverseAdditionalParameters(oauth.additionalParameters.accessTokenRequest);
+          if (tokenParams) {
+            tempParams.token = tokenParams;
+          }
+        }
+        if (oauth.additionalParameters.refreshTokenRequest) {
+          const refreshParams = reverseAdditionalParameters(oauth.additionalParameters.refreshTokenRequest);
+          if (refreshParams) {
+            tempParams.refresh = refreshParams;
+          }
+        }
+        // Only set additionalParameters if there are actual parameters
+        if (Object.keys(tempParams).length > 0) {
+          brunoOAuth.additionalParameters = tempParams;
+        }
+      }
+      break;
+
+    case 'implicit':
+      brunoOAuth.grantType = 'implicit';
+      if (oauth.authorizationUrl) brunoOAuth.authorizationUrl = oauth.authorizationUrl;
+      if (oauth.callbackUrl) brunoOAuth.callbackUrl = oauth.callbackUrl;
+      if (oauth.credentials?.clientId) brunoOAuth.clientId = oauth.credentials.clientId;
+      if (oauth.scope) brunoOAuth.scope = oauth.scope;
+      if (oauth.state) brunoOAuth.state = oauth.state;
+
+      // token config
+      if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.placement) {
+        if ('header' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'header';
+          brunoOAuth.tokenHeaderPrefix = oauth.tokenConfig.placement.header || '';
+        } else if ('query' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'url';
+          brunoOAuth.tokenQueryKey = oauth.tokenConfig.placement.query || '';
+        }
+      }
+
+      // additional parameters
+      if (oauth.additionalParameters) {
+        const tempParams: Record<string, any> = {};
+        if (oauth.additionalParameters.authorizationRequest) {
+          const authParams = reverseAdditionalParameters(oauth.additionalParameters.authorizationRequest);
+          if (authParams) {
+            tempParams.authorization = authParams;
+          }
+        }
+        // Only set additionalParameters if there are actual parameters
+        if (Object.keys(tempParams).length > 0) {
+          brunoOAuth.additionalParameters = tempParams;
+        }
+      }
+      break;
+
+    default:
+      return null;
+  }
+
+  if (oauth.settings?.autoFetchToken !== undefined) {
+    brunoOAuth.autoFetchToken = oauth.settings.autoFetchToken;
+  }
+  if (oauth.settings?.autoRefreshToken !== undefined) {
+    brunoOAuth.autoRefreshToken = oauth.settings.autoRefreshToken;
+  }
+
+  if (brunoOAuth.grantType === 'authorization_code' && oauth.flow === 'authorization_code') {
+    const authCodeFlow = oauth as OAuth2AuthorizationCodeFlow;
+    if (authCodeFlow.pkce?.enabled !== undefined) {
+      brunoOAuth.pkce = authCodeFlow.pkce.enabled;
+    }
+  }
+
+  if (brunoOAuth.additionalParameters === null) {
+    delete brunoOAuth.additionalParameters;
+  }
+
+  return brunoOAuth;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/auth.ts b/packages/bruno-filestore/src/formats/yml/common/auth.ts
new file mode 100644
index 000000000..72e054843
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/auth.ts
@@ -0,0 +1,245 @@
+import type {
+  Auth,
+  AuthApiKey,
+  AuthAwsV4,
+  AuthBasic,
+  AuthBearer,
+  AuthDigest,
+  AuthNTLM,
+  AuthWsse
+} from '@opencollection/types/common/auth';
+import type { Auth as BrunoAuth } from '@usebruno/schema-types/common/auth';
+import { isString } from '../../../utils';
+import { toOpenCollectionOAuth2, toBrunoOAuth2 } from './auth-oauth2';
+
+const buildAwsV4Auth = (config?: BrunoAuth['awsv4']): AuthAwsV4 => {
+  const auth: AuthAwsV4 = { type: 'awsv4' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.accessKeyId)) auth.accessKeyId = config.accessKeyId;
+  if (isString(config.secretAccessKey)) auth.secretAccessKey = config.secretAccessKey;
+  if (isString(config.sessionToken)) auth.sessionToken = config.sessionToken;
+  if (isString(config.service)) auth.service = config.service;
+  if (isString(config.region)) auth.region = config.region;
+  if (isString(config.profileName)) auth.profileName = config.profileName;
+
+  return auth;
+};
+
+const buildBasicAuth = (config?: BrunoAuth['basic']): AuthBasic => {
+  const auth: AuthBasic = { type: 'basic' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.username)) auth.username = config.username;
+  if (isString(config.password)) auth.password = config.password;
+
+  return auth;
+};
+
+const buildBearerAuth = (config?: BrunoAuth['bearer']): AuthBearer => {
+  const auth: AuthBearer = { type: 'bearer' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.token)) auth.token = config.token;
+
+  return auth;
+};
+
+const buildDigestAuth = (config?: BrunoAuth['digest']): AuthDigest => {
+  const auth: AuthDigest = { type: 'digest' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.username)) auth.username = config.username;
+  if (isString(config.password)) auth.password = config.password;
+
+  return auth;
+};
+
+const buildNtlmAuth = (config?: BrunoAuth['ntlm']): AuthNTLM => {
+  const auth: AuthNTLM = { type: 'ntlm' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.username)) auth.username = config.username;
+  if (isString(config.password)) auth.password = config.password;
+  if (isString(config.domain)) auth.domain = config.domain;
+
+  return auth;
+};
+
+const buildWsseAuth = (config?: BrunoAuth['wsse']): AuthWsse => {
+  const auth: AuthWsse = { type: 'wsse' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.username)) auth.username = config.username;
+  if (isString(config.password)) auth.password = config.password;
+
+  return auth;
+};
+
+const buildApiKeyAuth = (config?: BrunoAuth['apikey']): AuthApiKey => {
+  const auth: AuthApiKey = { type: 'apikey' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.key)) auth.key = config.key;
+  if (isString(config.value)) auth.value = config.value;
+
+  if (isString(config.placement)) {
+    if (config.placement === 'header') {
+      auth.placement = 'header';
+    } else if (config.placement === 'queryparams') {
+      auth.placement = 'query';
+    }
+  }
+
+  return auth;
+};
+
+export const toOpenCollectionAuth = (auth?: BrunoAuth | null): Auth | undefined => {
+  if (!auth || auth.mode === 'none') {
+    return undefined;
+  }
+
+  if (auth.mode === 'inherit') {
+    return 'inherit';
+  }
+
+  switch (auth.mode) {
+    case 'awsv4':
+      return buildAwsV4Auth(auth.awsv4);
+    case 'basic':
+      return buildBasicAuth(auth.basic);
+    case 'bearer':
+      return buildBearerAuth(auth.bearer);
+    case 'digest':
+      return buildDigestAuth(auth.digest);
+    case 'ntlm':
+      return buildNtlmAuth(auth.ntlm);
+    case 'wsse':
+      return buildWsseAuth(auth.wsse);
+    case 'apikey':
+      return buildApiKeyAuth(auth.apikey);
+    case 'oauth2':
+      return toOpenCollectionOAuth2(auth.oauth2);
+    default:
+      console.warn(`toOpenCollectionAuth failed: Unsupported auth mode "${auth.mode}".`);
+      return undefined;
+  }
+};
+
+export const toBrunoAuth = (auth: Auth | null | undefined): BrunoAuth | null => {
+  const brunoAuth: BrunoAuth = {
+    mode: 'none',
+    awsv4: null,
+    basic: null,
+    bearer: null,
+    digest: null,
+    ntlm: null,
+    oauth2: null,
+    wsse: null,
+    apikey: null
+  };
+
+  if (!auth) {
+    return brunoAuth;
+  }
+
+  if (auth === 'inherit') {
+    brunoAuth.mode = 'inherit';
+    return brunoAuth;
+  }
+
+  switch (auth.type) {
+    case 'awsv4':
+      brunoAuth.mode = 'awsv4';
+      brunoAuth.awsv4 = {
+        accessKeyId: auth.accessKeyId || null,
+        secretAccessKey: auth.secretAccessKey || null,
+        sessionToken: auth.sessionToken || null,
+        service: auth.service || null,
+        region: auth.region || null,
+        profileName: auth.profileName || null
+      };
+      break;
+
+    case 'basic':
+      brunoAuth.mode = 'basic';
+      brunoAuth.basic = {
+        username: auth.username || null,
+        password: auth.password || null
+      };
+      break;
+
+    case 'bearer':
+      brunoAuth.mode = 'bearer';
+      brunoAuth.bearer = {
+        token: auth.token || null
+      };
+      break;
+
+    case 'digest':
+      brunoAuth.mode = 'digest';
+      brunoAuth.digest = {
+        username: auth.username || null,
+        password: auth.password || null
+      };
+      break;
+
+    case 'ntlm':
+      brunoAuth.mode = 'ntlm';
+      brunoAuth.ntlm = {
+        username: auth.username || null,
+        password: auth.password || null,
+        domain: auth.domain || null
+      };
+      break;
+
+    case 'wsse':
+      brunoAuth.mode = 'wsse';
+      brunoAuth.wsse = {
+        username: auth.username || null,
+        password: auth.password || null
+      };
+      break;
+
+    case 'apikey':
+      brunoAuth.mode = 'apikey';
+      brunoAuth.apikey = {
+        key: auth.key || null,
+        value: auth.value || null,
+        placement: auth.placement === 'query' ? 'queryparams' : (auth.placement === 'header' ? 'header' : null)
+      };
+      break;
+
+    case 'oauth2':
+      brunoAuth.mode = 'oauth2';
+      brunoAuth.oauth2 = toBrunoOAuth2(auth);
+      break;
+
+    default:
+      console.warn('toBrunoAuth failed: Unsupported auth type');
+      break;
+  }
+
+  return brunoAuth;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/body.ts b/packages/bruno-filestore/src/formats/yml/common/body.ts
new file mode 100644
index 000000000..998de5f66
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/body.ts
@@ -0,0 +1,234 @@
+import type { HttpRequestBody as BrunoHttpRequestBody } from '@usebruno/schema-types/requests/http';
+import type {
+  HttpRequestBody,
+  RawBody,
+  FormUrlEncodedBody,
+  FormUrlEncodedEntry,
+  MultipartFormBody,
+  MultipartFormEntry,
+  FileBody,
+  FileBodyEntry
+} from '@opencollection/types/requests/http';
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import { uuid } from '../../../utils';
+
+export const toOpenCollectionBody = (body: BrunoHttpRequestBody | null | undefined): HttpRequestBody | undefined => {
+  if (!body) {
+    return undefined;
+  }
+
+  switch (body.mode) {
+    case 'none':
+      return undefined;
+
+    case 'json':
+      const rawBody: RawBody = {
+        type: 'json',
+        data: body.json || ''
+      };
+      return rawBody;
+
+    case 'text':
+      const textBody: RawBody = {
+        type: 'text',
+        data: body.text || ''
+      };
+      return textBody;
+
+    case 'xml':
+      const xmlBody: RawBody = {
+        type: 'xml',
+        data: body.xml || ''
+      };
+      return xmlBody;
+
+    case 'sparql':
+      const sparqlBody: RawBody = {
+        type: 'sparql',
+        data: body.sparql || ''
+      };
+      return sparqlBody;
+
+    case 'formUrlEncoded':
+      const formEntries: FormUrlEncodedEntry[] = body.formUrlEncoded?.map((entry: BrunoKeyValue): FormUrlEncodedEntry => {
+        const formEntry: FormUrlEncodedEntry = {
+          name: entry.name || '',
+          value: entry.value || ''
+        };
+
+        if (entry?.description?.trim().length) {
+          formEntry.description = entry.description;
+        }
+
+        if (entry.enabled === false) {
+          formEntry.disabled = true;
+        }
+
+        return formEntry;
+      }) || [];
+
+      const formBody: FormUrlEncodedBody = {
+        type: 'form-urlencoded',
+        ...(formEntries.length > 0 && { data: formEntries })
+      } as FormUrlEncodedBody;
+      return formBody;
+
+    case 'multipartForm':
+      const multipartEntries: MultipartFormEntry[] = body.multipartForm?.map((entry): MultipartFormEntry => {
+        const multipartEntry: MultipartFormEntry = {
+          name: entry.name || '',
+          type: entry.type,
+          value: entry.value || (entry.type === 'file' ? [] : '')
+        };
+
+        if (entry?.description?.trim().length) {
+          multipartEntry.description = entry.description;
+        }
+
+        if (entry.enabled === false) {
+          multipartEntry.disabled = true;
+        }
+
+        return multipartEntry;
+      }) || [];
+
+      const multipartBody: MultipartFormBody = {
+        type: 'multipart-form',
+        ...(multipartEntries.length > 0 && { data: multipartEntries })
+      } as MultipartFormBody;
+      return multipartBody;
+
+    case 'file':
+      const fileEntries: FileBodyEntry[] = body.file?.map((file): FileBodyEntry => {
+        return {
+          filePath: file.filePath || '',
+          contentType: file.contentType || '',
+          selected: file.selected ?? false
+        };
+      }) || [];
+
+      const fileBody: FileBody = {
+        type: 'file',
+        ...(fileEntries.length > 0 && { data: fileEntries })
+      } as FileBody;
+      return fileBody;
+
+    case 'graphql':
+      // GraphQL body is handled separately in GraphQL request stringify
+      return undefined;
+
+    default:
+      return undefined;
+  }
+};
+
+export const toBrunoBody = (body: HttpRequestBody | null | undefined): BrunoHttpRequestBody | undefined => {
+  if (!body) {
+    return {
+      mode: 'none',
+      json: null,
+      text: null,
+      xml: null,
+      sparql: null,
+      formUrlEncoded: [],
+      multipartForm: [],
+      graphql: null,
+      file: []
+    };
+  }
+
+  const brunoBody: BrunoHttpRequestBody = {
+    mode: 'none',
+    json: null,
+    text: null,
+    xml: null,
+    sparql: null,
+    formUrlEncoded: [],
+    multipartForm: [],
+    graphql: null,
+    file: []
+  };
+
+  switch (body.type) {
+    case 'json':
+      brunoBody.mode = 'json';
+      brunoBody.json = body.data || '';
+      break;
+
+    case 'text':
+      brunoBody.mode = 'text';
+      brunoBody.text = body.data || '';
+      break;
+
+    case 'xml':
+      brunoBody.mode = 'xml';
+      brunoBody.xml = body.data || '';
+      break;
+
+    case 'sparql':
+      brunoBody.mode = 'sparql';
+      brunoBody.sparql = body.data || '';
+      break;
+
+    case 'form-urlencoded':
+      brunoBody.mode = 'formUrlEncoded';
+      brunoBody.formUrlEncoded = body.data?.map((entry): BrunoKeyValue => {
+        const formEntry: BrunoKeyValue = {
+          uid: uuid(),
+          name: entry.name || '',
+          value: entry.value || '',
+          enabled: entry.disabled !== true
+        };
+
+        if (entry.description) {
+          if (typeof entry.description === 'string' && entry.description.trim().length) {
+            formEntry.description = entry.description;
+          } else if (typeof entry.description === 'object' && entry.description.content?.trim().length) {
+            formEntry.description = entry.description.content;
+          }
+        }
+
+        return formEntry;
+      }) || [];
+      break;
+
+    case 'multipart-form':
+      brunoBody.mode = 'multipartForm';
+      brunoBody.multipartForm = body.data?.map((entry): any => {
+        const multipartEntry: any = {
+          uid: uuid(),
+          type: entry.type,
+          name: entry.name || '',
+          value: entry.value || (entry.type === 'file' ? [] : ''),
+          contentType: null,
+          enabled: entry.disabled !== true
+        };
+
+        if (entry.description) {
+          if (typeof entry.description === 'string' && entry.description.trim().length) {
+            multipartEntry.description = entry.description;
+          } else if (typeof entry.description === 'object' && entry.description.content?.trim().length) {
+            multipartEntry.description = entry.description.content;
+          }
+        }
+
+        return multipartEntry;
+      }) || [];
+      break;
+
+    case 'file':
+      brunoBody.mode = 'file';
+      brunoBody.file = body.data?.map((file): any => ({
+        uid: uuid(),
+        filePath: file.filePath || '',
+        contentType: file.contentType || '',
+        selected: file.selected ?? false
+      })) || [];
+      break;
+
+    default:
+      break;
+  }
+
+  return brunoBody;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/headers.ts b/packages/bruno-filestore/src/formats/yml/common/headers.ts
new file mode 100644
index 000000000..7dac67c08
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/headers.ts
@@ -0,0 +1,45 @@
+import type { FolderRequest as BrunoFolderRequest } from '@usebruno/schema-types/collection/folder';
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import type { HttpHeader } from '@opencollection/types/requests/http';
+import { uuid } from '../../../utils';
+
+export const toOpenCollectionHttpHeaders = (headers: BrunoFolderRequest['headers']): HttpHeader[] | undefined => {
+  if (!headers?.length) {
+    return undefined;
+  }
+
+  const ocHeaders = headers.map((header: BrunoKeyValue): HttpHeader => {
+    const httpHeader: HttpHeader = {
+      name: header.name || '',
+      value: header.value || ''
+    };
+    if (header?.description?.trim().length) {
+      httpHeader.description = header.description;
+    }
+    if (header.enabled === false) {
+      httpHeader.disabled = true;
+    }
+    return httpHeader;
+  });
+
+  return ocHeaders.length ? ocHeaders : undefined;
+};
+
+export const toBrunoHttpHeaders = (headers: HttpHeader[] | null | undefined): BrunoKeyValue[] | undefined => {
+  if (!headers?.length) {
+    return undefined;
+  }
+
+  const brunoHeaders = headers.map((header: HttpHeader): BrunoKeyValue => {
+    const brunoHeader: BrunoKeyValue = {
+      uid: uuid(),
+      name: header.name || '',
+      value: header.value || '',
+      enabled: header.disabled !== true
+    };
+
+    return brunoHeader;
+  });
+
+  return brunoHeaders.length ? brunoHeaders : undefined;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/params.ts b/packages/bruno-filestore/src/formats/yml/common/params.ts
new file mode 100644
index 000000000..eefd755b0
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/params.ts
@@ -0,0 +1,57 @@
+import type { HttpRequestParam as BrunoHttpRequestParam } from '@usebruno/schema-types/requests/http';
+import type { HttpRequestParam } from '@opencollection/types/requests/http';
+import { uuid } from '../../../utils';
+
+export const toOpenCollectionParams = (params: BrunoHttpRequestParam[] | null | undefined): HttpRequestParam[] | undefined => {
+  if (!params?.length) {
+    return undefined;
+  }
+
+  const ocParams = params.map((param: BrunoHttpRequestParam): HttpRequestParam => {
+    const ocParam: HttpRequestParam = {
+      name: param.name || '',
+      value: param.value || '',
+      type: param.type
+    };
+
+    if (param?.description?.trim().length) {
+      ocParam.description = param.description;
+    }
+
+    if (param.enabled === false) {
+      ocParam.disabled = true;
+    }
+
+    return ocParam;
+  });
+
+  return ocParams.length ? ocParams : undefined;
+};
+
+export const toBrunoParams = (params: HttpRequestParam[] | null | undefined): BrunoHttpRequestParam[] | undefined => {
+  if (!params?.length) {
+    return undefined;
+  }
+
+  const brunoParams = params.map((param: HttpRequestParam): BrunoHttpRequestParam => {
+    const brunoParam: BrunoHttpRequestParam = {
+      uid: uuid(),
+      name: param.name || '',
+      value: param.value || '',
+      type: param.type,
+      enabled: param.disabled !== true
+    };
+
+    if (param.description) {
+      if (typeof param.description === 'string' && param.description.trim().length) {
+        brunoParam.description = param.description;
+      } else if (typeof param.description === 'object' && param.description.content?.trim().length) {
+        brunoParam.description = param.description.content;
+      }
+    }
+
+    return brunoParam;
+  });
+
+  return brunoParams.length ? brunoParams : undefined;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/scripts.ts b/packages/bruno-filestore/src/formats/yml/common/scripts.ts
new file mode 100644
index 000000000..694166691
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/scripts.ts
@@ -0,0 +1,51 @@
+import { Scripts } from '@opencollection/types/common/scripts';
+import { FolderRequest as BrunoFolderRequest } from '@usebruno/schema-types/collection/folder';
+import { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import { WebSocketRequest as BrunoWebSocketRequest } from '@usebruno/schema-types/requests/websocket';
+import { GrpcRequest as BrunoGrpcRequest } from '@usebruno/schema-types/requests/grpc';
+
+export const toOpenCollectionScripts = (request: BrunoFolderRequest | BrunoHttpRequest | BrunoWebSocketRequest | BrunoGrpcRequest | null | undefined): Scripts | undefined => {
+  const ocScripts: Scripts = {};
+
+  if (request?.script?.req?.trim().length) {
+    ocScripts.preRequest = request.script.req.trim();
+  }
+  if (request?.script?.res?.trim().length) {
+    ocScripts.postResponse = request.script.res.trim();
+  }
+  if (request?.tests?.trim().length) {
+    ocScripts.tests = request.tests.trim();
+  }
+
+  return Object.keys(ocScripts).length > 0 ? ocScripts : undefined;
+};
+
+export const toBrunoScripts = (scripts: Scripts | null | undefined): {
+  script?: { req?: string; res?: string };
+  tests?: string;
+} | undefined => {
+  if (!scripts) {
+    return undefined;
+  }
+
+  const brunoScripts: {
+    script?: { req?: string; res?: string };
+    tests?: string;
+  } = {};
+
+  if (scripts.preRequest || scripts.postResponse) {
+    brunoScripts.script = {};
+    if (scripts.preRequest) {
+      brunoScripts.script.req = scripts.preRequest;
+    }
+    if (scripts.postResponse) {
+      brunoScripts.script.res = scripts.postResponse;
+    }
+  }
+
+  if (scripts.tests) {
+    brunoScripts.tests = scripts.tests;
+  }
+
+  return Object.keys(brunoScripts).length > 0 ? brunoScripts : undefined;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/variables.ts b/packages/bruno-filestore/src/formats/yml/common/variables.ts
new file mode 100644
index 000000000..ad5856f63
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/variables.ts
@@ -0,0 +1,83 @@
+import { Variable } from '@opencollection/types/common/variables';
+import { FolderRequest as BrunoFolderRequest } from '@usebruno/schema-types/collection/folder';
+import { Variable as BrunoVariable, Variables as BrunoVariables } from '@usebruno/schema-types/common/variables';
+import { uuid } from '../../../utils';
+
+export const toOpenCollectionVariables = (variables: BrunoFolderRequest['vars'] | BrunoVariables | null | undefined): Variable[] | undefined => {
+  // Handle folder variables (has req/res structure)
+  const hasReqRes = variables && 'req' in variables;
+  const reqVars = hasReqRes ? variables.req : variables as BrunoVariables;
+  const resVars = hasReqRes && 'res' in variables ? variables.res : [];
+
+  const reqVarsArray = Array.isArray(reqVars) ? reqVars : [];
+  const resVarsArray = Array.isArray(resVars) ? resVars : [];
+
+  const allVars = [...reqVarsArray, ...resVarsArray];
+
+  if (!allVars.length) {
+    return undefined;
+  }
+
+  const ocVariables: Variable[] = allVars.map((v: BrunoVariable, index: number): Variable => {
+    const isResVar = index >= reqVarsArray.length;
+    const variable: Variable = {
+      name: v.name || '',
+      value: v.value || ''
+    };
+
+    if (isResVar) {
+      const scopeMarker = '[post-response]';
+      if (v?.description?.trim().length) {
+        variable.description = `${scopeMarker} ${v.description}`;
+      } else {
+        variable.description = scopeMarker;
+      }
+    } else if (v?.description?.trim().length) {
+      variable.description = v.description;
+    }
+
+    if (v.enabled === false) {
+      variable.disabled = true;
+    }
+    return variable;
+  });
+
+  return ocVariables.length > 0 ? ocVariables : undefined;
+};
+
+export const toBrunoVariables = (variables: Variable[] | null | undefined): { req: BrunoVariables; res: BrunoVariables } => {
+  if (!variables?.length) {
+    return { req: [], res: [] };
+  }
+
+  const scopeMarker = '[post-response]';
+  const reqVars: BrunoVariables = [];
+  const resVars: BrunoVariables = [];
+
+  variables.forEach((v: Variable) => {
+    const isPostResponse = typeof v.description === 'string' && v.description.startsWith(scopeMarker);
+
+    const variable: BrunoVariable = {
+      uid: uuid(),
+      name: v.name || '',
+      value: v.value as string || '',
+      enabled: v.disabled !== true,
+      local: false
+    };
+
+    if (isPostResponse) {
+      const cleanDesc = (v.description as string).substring(scopeMarker.length).trim();
+      if (cleanDesc) {
+        variable.description = cleanDesc;
+      }
+      resVars.push(variable);
+    } else {
+      if (v.description) {
+        variable.description = typeof v.description === 'string' ? v.description : (v.description as any)?.content || '';
+      }
+      reqVars.push(variable);
+    }
+  });
+
+  return { req: reqVars, res: resVars };
+};
diff --git a/packages/bruno-filestore/src/formats/yml/index.ts b/packages/bruno-filestore/src/formats/yml/index.ts
new file mode 100644
index 000000000..c66bab854
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/index.ts
@@ -0,0 +1,20 @@
+import parseYmlItem from './parseItem';
+import parseYmlFolder from './parseFolder';
+import parseYmlCollection from './parseCollection';
+import parseYmlEnvironment from './parseEnvironment';
+
+import stringifyYmlItem from './stringifyItem';
+import stringifyYmlFolder from './stringifyFolder';
+import stringifyYmlCollection from './stringifyCollection';
+import stringifyYmlEnvironment from './stringifyEnvironment';
+
+export {
+  parseYmlItem,
+  parseYmlFolder,
+  parseYmlCollection,
+  parseYmlEnvironment,
+  stringifyYmlItem,
+  stringifyYmlFolder,
+  stringifyYmlCollection,
+  stringifyYmlEnvironment
+};
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts
new file mode 100644
index 000000000..87529a686
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts
@@ -0,0 +1,128 @@
+import type { Item as BrunoItem, HttpItemSettings as BrunoHttpItemSettings } from '@usebruno/schema-types/collection/item';
+import type { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import type { GraphQLRequest, GraphQLRequestSettings, GraphQLBody } from '@opencollection/types/requests/graphql';
+import { toBrunoAuth } from '../common/auth';
+import { toBrunoHttpHeaders } from '../common/headers';
+import { toBrunoParams } from '../common/params';
+import { toBrunoVariables } from '../common/variables';
+import { toBrunoScripts } from '../common/scripts';
+import { toBrunoAssertions } from '../common/assertions';
+import { uuid } from '../../../utils';
+
+const parseGraphQLRequest = (ocRequest: GraphQLRequest): BrunoItem => {
+  const brunoRequest: BrunoHttpRequest = {
+    url: ocRequest.url || '',
+    method: ocRequest.method || 'POST',
+    headers: toBrunoHttpHeaders(ocRequest.headers) || [],
+    params: toBrunoParams(ocRequest.params) || [],
+    auth: toBrunoAuth(ocRequest.auth),
+    body: {
+      mode: 'graphql',
+      json: null,
+      text: null,
+      xml: null,
+      sparql: null,
+      formUrlEncoded: [],
+      multipartForm: [],
+      graphql: {
+        query: (ocRequest.body as GraphQLBody)?.query || null,
+        variables: (ocRequest.body as GraphQLBody)?.variables || null
+      },
+      file: []
+    },
+    script: {
+      req: null,
+      res: null
+    },
+    vars: {
+      req: [],
+      res: []
+    },
+    assertions: [],
+    tests: null,
+    docs: null
+  };
+
+  // scripts
+  const scripts = toBrunoScripts(ocRequest.scripts);
+  if (scripts?.script && brunoRequest.script) {
+    if (scripts.script.req) {
+      brunoRequest.script.req = scripts.script.req;
+    }
+    if (scripts.script.res) {
+      brunoRequest.script.res = scripts.script.res;
+    }
+  }
+  if (scripts?.tests) {
+    brunoRequest.tests = scripts.tests;
+  }
+
+  // variables
+  const variables = toBrunoVariables(ocRequest.variables);
+  brunoRequest.vars = variables;
+
+  // assertions
+  const assertions = toBrunoAssertions(ocRequest.assertions);
+  if (assertions) {
+    brunoRequest.assertions = assertions;
+  }
+
+  // docs
+  if (ocRequest.docs) {
+    brunoRequest.docs = ocRequest.docs;
+  }
+
+  // bruno item
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'graphql-request',
+    seq: ocRequest.seq || 1,
+    name: ocRequest.name || 'Untitled Request',
+    tags: ocRequest.tags || [],
+    request: brunoRequest,
+    settings: null,
+    fileContent: null,
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  // settings
+  if (ocRequest.settings) {
+    const settings: BrunoHttpItemSettings = {};
+
+    if (typeof ocRequest.settings.encodeUrl === 'boolean') {
+      settings.encodeUrl = ocRequest.settings.encodeUrl;
+    } else {
+      settings.encodeUrl = true;
+    }
+
+    if (typeof ocRequest.settings.timeout === 'number') {
+      settings.timeout = ocRequest.settings.timeout;
+    } else if (ocRequest.settings.timeout === 'inherit') {
+      settings.timeout = 'inherit';
+    } else {
+      settings.timeout = 0;
+    }
+
+    if (typeof ocRequest.settings.followRedirects === 'boolean') {
+      settings.followRedirects = ocRequest.settings.followRedirects;
+    } else {
+      settings.followRedirects = true;
+    }
+
+    if (typeof ocRequest.settings.maxRedirects === 'number') {
+      settings.maxRedirects = ocRequest.settings.maxRedirects;
+    } else {
+      settings.maxRedirects = 5;
+    }
+
+    brunoItem.settings = settings;
+  }
+
+  return brunoItem;
+};
+
+export default parseGraphQLRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseGrpcRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseGrpcRequest.ts
new file mode 100644
index 000000000..a9ef69a59
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseGrpcRequest.ts
@@ -0,0 +1,112 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { GrpcRequest as BrunoGrpcRequest } from '@usebruno/schema-types/requests/grpc';
+import type { GrpcRequest, GrpcMetadata } from '@opencollection/types/requests/grpc';
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import { toBrunoAuth } from '../common/auth';
+import { toBrunoVariables } from '../common/variables';
+import { toBrunoScripts } from '../common/scripts';
+import { toBrunoAssertions } from '../common/assertions';
+import { isNonEmptyString, uuid } from '../../../utils';
+
+const toBrunoGrpcMetadata = (metadata: GrpcMetadata[] | null | undefined): BrunoKeyValue[] | undefined => {
+  if (!metadata?.length) {
+    return undefined;
+  }
+
+  const brunoMetadata = metadata.map((meta: GrpcMetadata): BrunoKeyValue => {
+    const brunoMeta: BrunoKeyValue = {
+      uid: uuid(),
+      name: meta.name || '',
+      value: meta.value || '',
+      enabled: meta.disabled !== true
+    };
+
+    return brunoMeta;
+  });
+
+  return brunoMetadata.length ? brunoMetadata : undefined;
+};
+
+const parseGrpcRequest = (ocRequest: GrpcRequest): BrunoItem => {
+  const brunoRequest: BrunoGrpcRequest = {
+    url: ocRequest.url || '',
+    method: ocRequest.method || '',
+    methodType: ocRequest.methodType || '',
+    protoPath: ocRequest.protoFilePath || null,
+    headers: toBrunoGrpcMetadata(ocRequest.metadata) || [],
+    auth: toBrunoAuth(ocRequest.auth),
+    body: {
+      mode: 'grpc',
+      grpc: []
+    },
+    script: {
+      req: null,
+      res: null
+    },
+    vars: {
+      req: [],
+      res: []
+    },
+    assertions: [],
+    tests: null,
+    docs: null
+  };
+
+  // message
+  if (isNonEmptyString(ocRequest.message)) {
+    brunoRequest.body.grpc = [{
+      name: '',
+      content: ocRequest.message
+    }];
+  }
+
+  // scripts
+  const scripts = toBrunoScripts(ocRequest.scripts);
+  if (scripts?.script && brunoRequest.script) {
+    if (scripts.script.req) {
+      brunoRequest.script.req = scripts.script.req;
+    }
+    if (scripts.script.res) {
+      brunoRequest.script.res = scripts.script.res;
+    }
+  }
+  if (scripts?.tests) {
+    brunoRequest.tests = scripts.tests;
+  }
+
+  // variables
+  const variables = toBrunoVariables(ocRequest.variables);
+  brunoRequest.vars = variables;
+
+  // assertions
+  const assertions = toBrunoAssertions(ocRequest.assertions);
+  if (assertions) {
+    brunoRequest.assertions = assertions;
+  }
+
+  // docs
+  if (ocRequest.docs) {
+    brunoRequest.docs = ocRequest.docs;
+  }
+
+  // bruno item
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'grpc-request',
+    seq: ocRequest.seq || 1,
+    name: ocRequest.name || 'Untitled Request',
+    tags: ocRequest.tags || [],
+    request: brunoRequest,
+    settings: {},
+    fileContent: null,
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  return brunoItem;
+};
+
+export default parseGrpcRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseHttpRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseHttpRequest.ts
new file mode 100644
index 000000000..c902162d3
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseHttpRequest.ts
@@ -0,0 +1,186 @@
+import type { Item as BrunoItem, HttpItemSettings as BrunoHttpItemSettings } from '@usebruno/schema-types/collection/item';
+import type { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import type { HttpRequest, HttpRequestBody } from '@opencollection/types/requests/http';
+import { toBrunoAuth } from '../common/auth';
+import { toBrunoHttpHeaders } from '../common/headers';
+import { toBrunoParams } from '../common/params';
+import { toBrunoBody } from '../common/body';
+import { toBrunoVariables } from '../common/variables';
+import { toBrunoScripts } from '../common/scripts';
+import { toBrunoAssertions } from '../common/assertions';
+import { uuid } from '../../../utils';
+
+const parseHttpRequest = (ocRequest: HttpRequest): BrunoItem => {
+  const brunoRequest: BrunoHttpRequest = {
+    url: ocRequest.url || '',
+    method: ocRequest.method || 'GET',
+    headers: toBrunoHttpHeaders(ocRequest.headers) || [],
+    params: toBrunoParams(ocRequest.params) || [],
+    auth: toBrunoAuth(ocRequest.auth),
+    body: toBrunoBody(ocRequest.body as HttpRequestBody) || {
+      mode: 'none',
+      json: null,
+      text: null,
+      xml: null,
+      sparql: null,
+      formUrlEncoded: [],
+      multipartForm: [],
+      graphql: null,
+      file: []
+    },
+    script: {
+      req: null,
+      res: null
+    },
+    vars: {
+      req: [],
+      res: []
+    },
+    assertions: [],
+    tests: null,
+    docs: null
+  };
+
+  // scripts
+  const scripts = toBrunoScripts(ocRequest.scripts);
+  if (scripts?.script && brunoRequest.script) {
+    if (scripts.script.req) {
+      brunoRequest.script.req = scripts.script.req;
+    }
+    if (scripts.script.res) {
+      brunoRequest.script.res = scripts.script.res;
+    }
+  }
+  if (scripts?.tests) {
+    brunoRequest.tests = scripts.tests;
+  }
+
+  // variables
+  const variables = toBrunoVariables(ocRequest.variables);
+  brunoRequest.vars = variables;
+
+  // assertions
+  const assertions = toBrunoAssertions(ocRequest.assertions);
+  if (assertions) {
+    brunoRequest.assertions = assertions;
+  }
+
+  // docs
+  if (ocRequest.docs) {
+    brunoRequest.docs = ocRequest.docs;
+  }
+
+  // bruno item
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'http-request',
+    seq: ocRequest.seq || 1,
+    name: ocRequest.name || 'Untitled Request',
+    tags: ocRequest.tags || [],
+    request: brunoRequest,
+    settings: null,
+    fileContent: null,
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  // settings
+  if (ocRequest.settings) {
+    const settings: BrunoHttpItemSettings = {};
+
+    if (typeof ocRequest.settings.encodeUrl === 'boolean') {
+      settings.encodeUrl = ocRequest.settings.encodeUrl;
+    } else {
+      settings.encodeUrl = true;
+    }
+
+    if (typeof ocRequest.settings.timeout === 'number') {
+      settings.timeout = ocRequest.settings.timeout;
+    } else if (ocRequest.settings.timeout === 'inherit') {
+      settings.timeout = 'inherit';
+    } else {
+      settings.timeout = 0;
+    }
+
+    if (typeof ocRequest.settings.followRedirects === 'boolean') {
+      settings.followRedirects = ocRequest.settings.followRedirects;
+    } else {
+      settings.followRedirects = true;
+    }
+
+    if (typeof ocRequest.settings.maxRedirects === 'number') {
+      settings.maxRedirects = ocRequest.settings.maxRedirects;
+    } else {
+      settings.maxRedirects = 5;
+    }
+
+    brunoItem.settings = settings;
+  }
+
+  // examples
+  if (ocRequest.examples?.length) {
+    brunoItem.examples = ocRequest.examples.map((example) => {
+      const brunoExample: any = {
+        uid: uuid(),
+        itemUid: uuid(),
+        name: example.name || 'Untitled Example',
+        type: 'http-request',
+        request: null,
+        response: null
+      };
+
+      if (example.description) {
+        if (typeof example.description === 'string' && example.description.trim().length) {
+          brunoExample.description = example.description;
+        } else if (typeof example.description === 'object' && example.description.content?.trim().length) {
+          brunoExample.description = example.description.content;
+        }
+      }
+
+      if (example.request) {
+        brunoExample.request = {
+          url: example.request.url || '',
+          method: example.request.method || 'GET',
+          headers: toBrunoHttpHeaders(example.request.headers) || [],
+          params: toBrunoParams(example.request.params) || [],
+          body: toBrunoBody(example.request.body) || {
+            mode: 'none',
+            json: null,
+            text: null,
+            xml: null,
+            sparql: null,
+            formUrlEncoded: null,
+            multipartForm: null,
+            graphql: null,
+            file: null
+          }
+        };
+      }
+
+      if (example.response) {
+        brunoExample.response = {
+          status: example.response.status !== undefined ? String(example.response.status) : null,
+          statusText: example.response.statusText || null,
+          headers: toBrunoHttpHeaders(example.response.headers) || [],
+          body: null
+        };
+
+        if (example.response.body) {
+          brunoExample.response.body = {
+            type: example.response.body.type || 'text',
+            content: example.response.body.data || ''
+          };
+        }
+      }
+
+      return brunoExample;
+    });
+  }
+
+  return brunoItem;
+};
+
+export default parseHttpRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseScript.ts b/packages/bruno-filestore/src/formats/yml/items/parseScript.ts
new file mode 100644
index 000000000..f6fe8b1e7
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseScript.ts
@@ -0,0 +1,25 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { Script } from '@opencollection/types/collection/item';
+import { uuid } from '../../../utils';
+
+const parseScript = (ocScript: Script): BrunoItem => {
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'js',
+    seq: 1,
+    name: 'Script',
+    tags: [],
+    request: null,
+    settings: null,
+    fileContent: ocScript.script || '',
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  return brunoItem;
+};
+
+export default parseScript;
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseWebsocketRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseWebsocketRequest.ts
new file mode 100644
index 000000000..c0b642b01
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseWebsocketRequest.ts
@@ -0,0 +1,109 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { WebSocketRequest as BrunoWebSocketRequest } from '@usebruno/schema-types/requests/websocket';
+import type { WebSocketRequest, WebSocketMessage } from '@opencollection/types/requests/websocket';
+import { toBrunoAuth } from '../common/auth';
+import { toBrunoHttpHeaders } from '../common/headers';
+import { toBrunoVariables } from '../common/variables';
+import { toBrunoScripts } from '../common/scripts';
+import { uuid } from '../../../utils';
+
+interface WebSocketRequestWithSettings extends WebSocketRequest {
+  settings?: {
+    timeout?: number;
+    keepAliveInterval?: number;
+  };
+}
+
+const parseWebsocketRequest = (ocRequest: WebSocketRequestWithSettings): BrunoItem => {
+  const brunoRequest: BrunoWebSocketRequest = {
+    url: ocRequest.url || '',
+    headers: toBrunoHttpHeaders(ocRequest.headers) || [],
+    auth: toBrunoAuth(ocRequest.auth),
+    body: {
+      mode: 'ws',
+      ws: []
+    },
+    script: {
+      req: null,
+      res: null
+    },
+    vars: {
+      req: [],
+      res: []
+    },
+    assertions: [],
+    tests: null,
+    docs: null
+  };
+
+  // message
+  if (ocRequest.message) {
+    const message = ocRequest.message as WebSocketMessage;
+    if (message.data?.trim().length) {
+      brunoRequest.body.ws = [{
+        name: '',
+        type: message.type || 'text',
+        content: message.data
+      }];
+    }
+  }
+
+  // scripts
+  const scripts = toBrunoScripts(ocRequest.scripts);
+  if (scripts?.script && brunoRequest.script) {
+    if (scripts.script.req) {
+      brunoRequest.script.req = scripts.script.req;
+    }
+    if (scripts.script.res) {
+      brunoRequest.script.res = scripts.script.res;
+    }
+  }
+  if (scripts?.tests) {
+    brunoRequest.tests = scripts.tests;
+  }
+
+  // variables
+  const variables = toBrunoVariables(ocRequest.variables);
+  brunoRequest.vars = variables;
+
+  // docs
+  if (ocRequest.docs) {
+    brunoRequest.docs = ocRequest.docs;
+  }
+
+  // settings
+  const wsSettings: Record<string, number> = {
+    timeout: 0,
+    keepAliveInterval: 0
+  };
+
+  if (ocRequest.settings) {
+    if (typeof ocRequest.settings.timeout === 'number') {
+      wsSettings.timeout = ocRequest.settings.timeout;
+    }
+    if (typeof ocRequest.settings.keepAliveInterval === 'number') {
+      wsSettings.keepAliveInterval = ocRequest.settings.keepAliveInterval;
+    }
+  }
+
+  // bruno item
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'ws-request',
+    seq: ocRequest.seq || 1,
+    name: ocRequest.name || 'Untitled Request',
+    tags: ocRequest.tags || [],
+    request: brunoRequest,
+    settings: wsSettings as any,
+    fileContent: null,
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  return brunoItem;
+};
+
+export default parseWebsocketRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyGraphQLRequest.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyGraphQLRequest.ts
new file mode 100644
index 000000000..6f367237c
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyGraphQLRequest.ts
@@ -0,0 +1,150 @@
+import type { Item as BrunoItem, HttpItemSettings as BrunoHttpItemSettings } from '@usebruno/schema-types/collection/item';
+import type { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import type { GraphQLRequest, GraphQLRequestSettings, GraphQLBody } from '@opencollection/types/requests/graphql';
+import type { Auth } from '@opencollection/types/common/auth';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Assertion } from '@opencollection/types/common/assertions';
+import type { HttpRequestParam, HttpHeader } from '@opencollection/types/requests/http';
+import { stringifyYml } from '../utils';
+import { isNonEmptyString, isNumber } from '../../../utils';
+import { toOpenCollectionAuth } from '../common/auth';
+import { toOpenCollectionHttpHeaders } from '../common/headers';
+import { toOpenCollectionParams } from '../common/params';
+import { toOpenCollectionVariables } from '../common/variables';
+import { toOpenCollectionScripts } from '../common/scripts';
+import { toOpenCollectionAssertions } from '../common/assertions';
+
+const stringifyGraphQLRequest = (item: BrunoItem): string => {
+  try {
+    const ocRequest: GraphQLRequest = {
+      type: 'graphql'
+    };
+
+    ocRequest.name = isNonEmptyString(item.name) ? item.name : 'Untitled Request';
+
+    // sequence
+    if (item.seq) {
+      ocRequest.seq = item.seq;
+    }
+
+    const brunoRequest = item.request as BrunoHttpRequest;
+    // url and method
+    ocRequest.url = isNonEmptyString(brunoRequest.url) ? brunoRequest.url : '';
+    ocRequest.method = isNonEmptyString(brunoRequest.method) ? brunoRequest.method : 'POST';
+
+    // headers
+    const headers: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(brunoRequest.headers);
+    if (headers) {
+      ocRequest.headers = headers;
+    }
+
+    // params
+    const params: HttpRequestParam[] | undefined = toOpenCollectionParams(brunoRequest.params);
+    if (params) {
+      ocRequest.params = params;
+    }
+
+    // body
+    if (brunoRequest.body?.mode === 'graphql' && brunoRequest.body.graphql) {
+      const graphqlBody: GraphQLBody = {};
+      let hasBody = false;
+
+      if (isNonEmptyString(brunoRequest.body.graphql.query)) {
+        graphqlBody.query = brunoRequest.body.graphql.query;
+        hasBody = true;
+      }
+
+      if (isNonEmptyString(brunoRequest.body.graphql.variables)) {
+        graphqlBody.variables = brunoRequest.body.graphql.variables;
+        hasBody = true;
+      }
+
+      if (hasBody) {
+        ocRequest.body = graphqlBody;
+      }
+    }
+
+    // auth
+    const auth: Auth | undefined = toOpenCollectionAuth(brunoRequest.auth);
+    if (auth) {
+      ocRequest.auth = auth;
+    }
+
+    // scripts
+    const scripts: Scripts | undefined = toOpenCollectionScripts(brunoRequest);
+    if (scripts) {
+      ocRequest.scripts = scripts;
+    }
+
+    // variables
+    const variables: Variable[] | undefined = toOpenCollectionVariables(brunoRequest.vars);
+    if (variables) {
+      ocRequest.variables = variables;
+    }
+
+    // assertions
+    const assertions: Assertion[] | undefined = toOpenCollectionAssertions(brunoRequest.assertions);
+    if (assertions) {
+      ocRequest.assertions = assertions;
+    }
+
+    // docs
+    if (isNonEmptyString(brunoRequest.docs)) {
+      ocRequest.docs = brunoRequest.docs;
+    }
+
+    // settings
+    const httpSettings = item.settings as BrunoHttpItemSettings | undefined;
+    ocRequest.settings = {} as GraphQLRequestSettings;
+    if (httpSettings?.encodeUrl === true) {
+      ocRequest.settings.encodeUrl = true;
+    } else if (httpSettings?.encodeUrl === false) {
+      ocRequest.settings.encodeUrl = false;
+    } else {
+      // todo: we are defaulting to true for now as bruno config does not yet support inherit for encodeUrl
+      // update this when bruno config supports inherit for encodeUrl
+      ocRequest.settings.encodeUrl = true;
+    }
+
+    const timeout = httpSettings?.timeout;
+    if (isNumber(timeout)) {
+      ocRequest.settings.timeout = timeout;
+    } else {
+      // todo: we are defaulting to 0 for now as bruno config does not yet support inherit for timeout
+      // update this when bruno config supports inherit for timeout
+      ocRequest.settings.timeout = 0;
+    }
+
+    if (httpSettings?.followRedirects === true) {
+      ocRequest.settings.followRedirects = true;
+    } else if (httpSettings?.followRedirects === false) {
+      ocRequest.settings.followRedirects = false;
+    } else {
+      // todo: we are defaulting to true for now as bruno config does not yet support inherit for followRedirects
+      // update this when bruno config supports inherit for followRedirects
+      ocRequest.settings.followRedirects = true;
+    }
+
+    const maxRedirects = httpSettings?.maxRedirects;
+    if (isNumber(maxRedirects)) {
+      ocRequest.settings.maxRedirects = maxRedirects;
+    } else {
+      // todo: we are defaulting to 5 for now as bruno config does not yet support inherit for maxRedirects
+      // update this when bruno config supports inherit for maxRedirects
+      ocRequest.settings.maxRedirects = 5;
+    }
+
+    // tags
+    if (item.tags?.length) {
+      ocRequest.tags = item.tags;
+    }
+
+    return stringifyYml(ocRequest);
+  } catch (error) {
+    console.error('Error stringifying GraphQL request:', error);
+    throw error;
+  }
+};
+
+export default stringifyGraphQLRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyGrpcRequest.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyGrpcRequest.ts
new file mode 100644
index 000000000..a0557eba7
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyGrpcRequest.ts
@@ -0,0 +1,123 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import type { GrpcRequest as BrunoGrpcRequest } from '@usebruno/schema-types/requests/grpc';
+import type { GrpcRequest, GrpcMetadata, GrpcMessage, GrpcMessageVariant } from '@opencollection/types/requests/grpc';
+import type { Auth } from '@opencollection/types/common/auth';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Assertion } from '@opencollection/types/common/assertions';
+import { stringifyYml } from '../utils';
+import { isNonEmptyString } from '../../../utils';
+import { toOpenCollectionAuth } from '../common/auth';
+import { toOpenCollectionVariables } from '../common/variables';
+import { toOpenCollectionScripts } from '../common/scripts';
+import { toOpenCollectionAssertions } from '../common/assertions';
+
+const stringifyGrpcRequest = (item: BrunoItem): string => {
+  try {
+    const ocRequest: GrpcRequest = {
+      type: 'grpc'
+    };
+
+    ocRequest.name = isNonEmptyString(item.name) ? item.name : 'Untitled Request';
+
+    // sequence
+    if (item.seq) {
+      ocRequest.seq = item.seq;
+    }
+
+    const brunoRequest = item.request as BrunoGrpcRequest;
+    // url and method
+    ocRequest.url = isNonEmptyString(brunoRequest.url) ? brunoRequest.url : '';
+    ocRequest.method = isNonEmptyString(brunoRequest.method) ? brunoRequest.method : '';
+
+    // method type
+    if (brunoRequest.methodType) {
+      ocRequest.methodType = brunoRequest.methodType;
+    }
+
+    // proto file path
+    if (isNonEmptyString(brunoRequest.protoPath)) {
+      ocRequest.protoFilePath = brunoRequest.protoPath;
+    }
+
+    // metadata
+    if (brunoRequest.headers?.length) {
+      const metadata: GrpcMetadata[] = brunoRequest.headers.map((header: BrunoKeyValue) => {
+        const metadataItem: GrpcMetadata = {
+          name: header.name || '',
+          value: header.value || ''
+        };
+
+        if (header?.description?.trim().length) {
+          metadataItem.description = header.description;
+        }
+
+        if (header.enabled === false) {
+          metadataItem.disabled = true;
+        }
+
+        return metadataItem;
+      });
+
+      if (metadata.length) {
+        ocRequest.metadata = metadata;
+      }
+    }
+
+    // message
+    if (brunoRequest.body?.mode === 'grpc' && brunoRequest.body.grpc?.length) {
+      const messages = brunoRequest.body.grpc;
+
+      // todo: bruno app supports only one message for now
+      // update this when bruno app supports multiple messages
+      if (messages.length) {
+        const message: GrpcMessage = messages[0].content || '';
+        if (message.trim().length) {
+          ocRequest.message = message;
+        }
+      }
+    }
+
+    // auth
+    const auth: Auth | undefined = toOpenCollectionAuth(brunoRequest.auth);
+    if (auth) {
+      ocRequest.auth = auth;
+    }
+
+    // scripts
+    const scripts: Scripts | undefined = toOpenCollectionScripts(brunoRequest);
+    if (scripts) {
+      ocRequest.scripts = scripts;
+    }
+
+    // variables
+    const variables: Variable[] | undefined = toOpenCollectionVariables(brunoRequest.vars);
+    if (variables) {
+      ocRequest.variables = variables;
+    }
+
+    // assertions
+    const assertions: Assertion[] | undefined = toOpenCollectionAssertions(brunoRequest.assertions);
+    if (assertions) {
+      ocRequest.assertions = assertions;
+    }
+
+    // docs
+    if (isNonEmptyString(brunoRequest.docs)) {
+      ocRequest.docs = brunoRequest.docs;
+    }
+
+    // tags
+    if (item.tags?.length) {
+      ocRequest.tags = item.tags;
+    }
+
+    return stringifyYml(ocRequest);
+  } catch (error) {
+    console.error('Error stringifying gRPC request:', error);
+    throw error;
+  }
+};
+
+export default stringifyGrpcRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyHttpRequest.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyHttpRequest.ts
new file mode 100644
index 000000000..c743f3527
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyHttpRequest.ts
@@ -0,0 +1,201 @@
+import type { Item as BrunoItem, HttpItemSettings as BrunoHttpItemSettings } from '@usebruno/schema-types/collection/item';
+import type { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import type { HttpRequest, HttpRequestSettings, HttpRequestExample } from '@opencollection/types/requests/http';
+import type { Auth } from '@opencollection/types/common/auth';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Assertion } from '@opencollection/types/common/assertions';
+import type { HttpRequestParam, HttpHeader, HttpRequestBody } from '@opencollection/types/requests/http';
+import { stringifyYml } from '../utils';
+import { toOpenCollectionAuth } from '../common/auth';
+import { toOpenCollectionHttpHeaders } from '../common/headers';
+import { toOpenCollectionParams } from '../common/params';
+import { toOpenCollectionBody } from '../common/body';
+import { toOpenCollectionVariables } from '../common/variables';
+import { toOpenCollectionScripts } from '../common/scripts';
+import { toOpenCollectionAssertions } from '../common/assertions';
+import { isNumber, isNonEmptyString } from '../../../utils';
+
+const stringifyHttpRequest = (item: BrunoItem): string => {
+  try {
+    const ocRequest: HttpRequest = {
+      type: 'http'
+    };
+
+    ocRequest.name = isNonEmptyString(item.name) ? item.name : 'Untitled Request';
+
+    // sequence
+    if (item.seq) {
+      ocRequest.seq = item.seq;
+    }
+
+    const brunoRequest = item.request as BrunoHttpRequest;
+    // url and method
+    ocRequest.url = isNonEmptyString(brunoRequest.url) ? brunoRequest.url : '';
+    ocRequest.method = isNonEmptyString(brunoRequest.method) ? brunoRequest.method : 'GET';
+
+    // headers
+    const headers: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(brunoRequest.headers);
+    if (headers) {
+      ocRequest.headers = headers;
+    }
+
+    // params
+    const params: HttpRequestParam[] | undefined = toOpenCollectionParams(brunoRequest.params);
+    if (params) {
+      ocRequest.params = params;
+    }
+
+    // body
+    const body: HttpRequestBody | undefined = toOpenCollectionBody(brunoRequest.body);
+    if (body) {
+      ocRequest.body = body;
+    }
+
+    // auth
+    const auth: Auth | undefined = toOpenCollectionAuth(brunoRequest.auth);
+    if (auth) {
+      ocRequest.auth = auth;
+    }
+
+    // scripts
+    const scripts: Scripts | undefined = toOpenCollectionScripts(brunoRequest);
+    if (scripts) {
+      ocRequest.scripts = scripts;
+    }
+
+    // variables
+    const variables: Variable[] | undefined = toOpenCollectionVariables(brunoRequest.vars);
+    if (variables) {
+      ocRequest.variables = variables;
+    }
+
+    // assertions
+    const assertions: Assertion[] | undefined = toOpenCollectionAssertions(brunoRequest.assertions);
+    if (assertions) {
+      ocRequest.assertions = assertions;
+    }
+
+    // docs
+    if (isNonEmptyString(brunoRequest.docs)) {
+      ocRequest.docs = brunoRequest.docs;
+    }
+
+    // settings
+    const httpSettings = item.settings as BrunoHttpItemSettings | undefined;
+    ocRequest.settings = {} as HttpRequestSettings;
+    if (httpSettings?.encodeUrl === true) {
+      ocRequest.settings.encodeUrl = true;
+    } else if (httpSettings?.encodeUrl === false) {
+      ocRequest.settings.encodeUrl = false;
+    } else {
+      // todo: we are defaulting to true for now as bruno config does not yet support inherit for encodeUrl
+      // update this when bruno config supports inherit for encodeUrl
+      ocRequest.settings.encodeUrl = true;
+    }
+
+    const timeout = httpSettings?.timeout;
+    if (isNumber(timeout)) {
+      ocRequest.settings.timeout = timeout;
+    } else {
+      // todo: we are defaulting to 0 for now as bruno config does not yet support inherit for timeout
+      // update this when bruno config supports inherit for timeout
+      ocRequest.settings.timeout = 0;
+    }
+
+    if (httpSettings?.followRedirects === true) {
+      ocRequest.settings.followRedirects = true;
+    } else if (httpSettings?.followRedirects === false) {
+      ocRequest.settings.followRedirects = false;
+    } else {
+      // todo: we are defaulting to true for now as bruno config does not yet support inherit for followRedirects
+      // update this when bruno config supports inherit for followRedirects
+      ocRequest.settings.followRedirects = true;
+    }
+
+    const maxRedirects = httpSettings?.maxRedirects;
+    if (isNumber(maxRedirects)) {
+      ocRequest.settings.maxRedirects = maxRedirects;
+    } else {
+      // todo: we are defaulting to 5 for now as bruno config does not yet support inherit for maxRedirects
+      // update this when bruno config supports inherit for maxRedirects
+      ocRequest.settings.maxRedirects = 5;
+    }
+
+    // tags
+    if (item.tags?.length) {
+      ocRequest.tags = item.tags;
+    }
+
+    // examples
+    if (item.examples?.length) {
+      const examples: HttpRequestExample[] = item.examples.map((example) => {
+        const ocExample: HttpRequestExample = {};
+        ocExample.name = example?.name || 'Untitled Example';
+
+        if (isNonEmptyString(example.description)) {
+          ocExample.description = example.description;
+        }
+
+        if (example.request) {
+          ocExample.request = {};
+          ocExample.request.url = example.request.url || '';
+          ocExample.request.method = example.request.method || 'GET';
+
+          const exampleHeaders = toOpenCollectionHttpHeaders(example.request.headers);
+          if (exampleHeaders) {
+            ocExample.request.headers = exampleHeaders;
+          }
+
+          const exampleParams = toOpenCollectionParams(example.request.params);
+          if (exampleParams) {
+            ocExample.request.params = exampleParams;
+          }
+
+          const exampleBody = toOpenCollectionBody(example.request.body);
+          if (exampleBody !== undefined) {
+            ocExample.request.body = exampleBody;
+          }
+        }
+
+        if (example.response) {
+          ocExample.response = {};
+
+          if (example.response.status !== undefined && example.response.status !== null && isNumber(example.response.status)) {
+            ocExample.response.status = Number(example.response.status);
+          }
+
+          if (isNonEmptyString(example.response.statusText)) {
+            ocExample.response.statusText = example.response.statusText;
+          }
+
+          const responseHeaders = toOpenCollectionHttpHeaders(example.response.headers);
+          if (responseHeaders) {
+            ocExample.response.headers = responseHeaders;
+          }
+
+          if (example.response.body && example.response.body.type && example.response.body.content !== undefined) {
+            ocExample.response.body = {
+              type: example.response.body.type as 'json' | 'text' | 'xml' | 'html' | 'binary',
+              data: String(example.response.body.content || '')
+            };
+          }
+        }
+
+        return ocExample;
+      });
+
+      // examples
+      if (examples?.length) {
+        ocRequest.examples = examples;
+      }
+    }
+
+    return stringifyYml(ocRequest);
+  } catch (error) {
+    console.error('Error stringifying HTTP request:', error);
+    throw error;
+  }
+};
+
+export default stringifyHttpRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyScript.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyScript.ts
new file mode 100644
index 000000000..c56e838d7
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyScript.ts
@@ -0,0 +1,22 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { Script } from '@opencollection/types/collection/item';
+import { stringifyYml } from '../utils';
+
+const stringifyScript = (item: BrunoItem): string => {
+  try {
+    const ocScript: Script = {
+      type: 'script'
+    };
+
+    if (item.fileContent?.trim().length) {
+      ocScript.script = item.fileContent;
+    }
+
+    return stringifyYml(ocScript);
+  } catch (error) {
+    console.error('Error stringifying script:', error);
+    throw error;
+  }
+};
+
+export default stringifyScript;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyWebsocketRequest.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyWebsocketRequest.ts
new file mode 100644
index 000000000..ab45a3e91
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyWebsocketRequest.ts
@@ -0,0 +1,108 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { WebSocketRequest as BrunoWebSocketRequest } from '@usebruno/schema-types/requests/websocket';
+import type { WebSocketRequest, WebSocketMessage, WebSocketMessageVariant } from '@opencollection/types/requests/websocket';
+import type { Auth } from '@opencollection/types/common/auth';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { HttpHeader } from '@opencollection/types/requests/http';
+import { stringifyYml } from '../utils';
+import { isNonEmptyString } from '../../../utils';
+import { toOpenCollectionAuth } from '../common/auth';
+import { toOpenCollectionHttpHeaders } from '../common/headers';
+import { toOpenCollectionVariables } from '../common/variables';
+import { toOpenCollectionScripts } from '../common/scripts';
+
+interface WebSocketRequestWithSettings extends WebSocketRequest {
+  settings?: {
+    timeout?: number;
+    keepAliveInterval?: number;
+  };
+}
+
+const stringifyWebsocketRequest = (item: BrunoItem): string => {
+  try {
+    const ocRequest: WebSocketRequestWithSettings = {
+      type: 'websocket'
+    };
+
+    ocRequest.name = isNonEmptyString(item.name) ? item.name : 'Untitled Request';
+
+    // sequence
+    if (item.seq) {
+      ocRequest.seq = item.seq;
+    }
+
+    const brunoRequest = item.request as BrunoWebSocketRequest;
+    // url
+    ocRequest.url = isNonEmptyString(brunoRequest.url) ? brunoRequest.url : '';
+
+    // headers
+    const headers: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(brunoRequest.headers);
+    if (headers) {
+      ocRequest.headers = headers;
+    }
+
+    // message
+    if (brunoRequest.body?.mode === 'ws' && brunoRequest.body.ws?.length) {
+      const messages = brunoRequest.body.ws;
+
+      // todo: bruno app supports only one message for now
+      // update this when bruno app supports multiple messages
+      if (messages.length) {
+        const msg = messages[0];
+        const message: WebSocketMessage = {
+          type: (msg.type as 'text' | 'json' | 'xml' | 'binary') || 'text',
+          data: msg.content || ''
+        };
+        if (message.data.trim().length) {
+          ocRequest.message = message;
+        }
+      }
+    }
+
+    // auth
+    const auth: Auth | undefined = toOpenCollectionAuth(brunoRequest.auth);
+    if (auth) {
+      ocRequest.auth = auth;
+    }
+
+    // scripts
+    const scripts: Scripts | undefined = toOpenCollectionScripts(brunoRequest);
+    if (scripts) {
+      ocRequest.scripts = scripts;
+    }
+
+    // variables
+    const variables: Variable[] | undefined = toOpenCollectionVariables(brunoRequest.vars);
+    if (variables) {
+      ocRequest.variables = variables;
+    }
+
+    // docs
+    if (isNonEmptyString(brunoRequest.docs)) {
+      ocRequest.docs = brunoRequest.docs;
+    }
+
+    // tags
+    if (item.tags?.length) {
+      ocRequest.tags = item.tags;
+    }
+
+    // settings
+    const wsSettings = item.settings as Record<string, number | string | undefined> | undefined;
+    if (wsSettings) {
+      ocRequest.settings = {};
+      const timeout = Number(wsSettings.timeout);
+      ocRequest.settings.timeout = !isNaN(timeout) ? timeout : 0;
+      const keepAliveInterval = Number(wsSettings.keepAliveInterval);
+      ocRequest.settings.keepAliveInterval = !isNaN(keepAliveInterval) ? keepAliveInterval : 0;
+    }
+
+    return stringifyYml(ocRequest);
+  } catch (error) {
+    console.error('Error stringifying WebSocket request:', error);
+    throw error;
+  }
+};
+
+export default stringifyWebsocketRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/parseCollection.ts b/packages/bruno-filestore/src/formats/yml/parseCollection.ts
new file mode 100644
index 000000000..6c411fb6c
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/parseCollection.ts
@@ -0,0 +1,177 @@
+import type { OpenCollection } from '@opencollection/types';
+import type { FolderRoot } from '@usebruno/schema-types/collection/folder';
+import { parseYml } from './utils';
+import { toBrunoAuth } from './common/auth';
+import { toBrunoHttpHeaders } from './common/headers';
+import { toBrunoVariables } from './common/variables';
+import { toBrunoScripts } from './common/scripts';
+
+interface ParsedCollection {
+  collectionRoot: FolderRoot;
+  brunoConfig: Record<string, any>;
+}
+
+const parseCollection = (ymlString: string): ParsedCollection => {
+  try {
+    const oc: OpenCollection = parseYml(ymlString);
+
+    // bruno config
+    const brunoConfig: Record<string, any> = {
+      opencollection: oc.opencollection || '1.0.0',
+      name: oc.info?.name || 'Untitled Collection',
+      type: 'collection',
+      ignore: []
+    };
+    if (oc.extensions?.ignore && Array.isArray(oc.extensions.ignore)) {
+      brunoConfig.ignore = oc.extensions.ignore;
+    }
+
+    // protobuf
+    if (oc.config?.protobuf) {
+      brunoConfig.protobuf = {
+        protofFiles: oc.config.protobuf.protoFiles?.map((protoFile: any) => ({
+          path: protoFile.path
+        })) || [],
+        importPaths: oc.config.protobuf.importPaths?.map((importPath: any) => ({
+          path: importPath.path,
+          disabled: importPath.disabled || false
+        })) || []
+      };
+    }
+
+    // proxy
+    brunoConfig.proxy = {
+      enabled: false,
+      protocol: '',
+      hostname: '',
+      port: '',
+      auth: {
+        enabled: false,
+        username: '',
+        password: ''
+      }
+    };
+
+    if (oc.config?.proxy) {
+      if (oc.config.proxy === 'inherit') {
+        brunoConfig.proxy.enabled = 'global';
+      } else if (typeof oc.config.proxy === 'object') {
+        brunoConfig.proxy = {
+          enabled: true,
+          protocol: oc.config.proxy.protocol || '',
+          hostname: oc.config.proxy.hostname || '',
+          port: oc.config.proxy.port || '',
+          auth: {
+            enabled: false,
+            username: '',
+            password: ''
+          }
+        };
+
+        if (oc.config.proxy.auth && typeof oc.config.proxy.auth === 'object') {
+          brunoConfig.proxy.auth = {
+            enabled: true,
+            username: oc.config.proxy.auth.username || '',
+            password: oc.config.proxy.auth.password || ''
+          };
+        }
+      }
+    }
+
+    // client certificates
+    if (oc.config?.clientCertificates?.length) {
+      brunoConfig.clientCertificates = {
+        certs: oc.config.clientCertificates.map((cert: any) => {
+          if (cert.type === 'pem') {
+            return {
+              domain: cert.domain,
+              type: 'cert',
+              certFilePath: cert.certificateFilePath,
+              keyFilePath: cert.privateKeyFilePath,
+              passphrase: cert.passphrase || ''
+            };
+          } else if (cert.type === 'pkcs12') {
+            return {
+              domain: cert.domain,
+              type: 'pfx',
+              pfxFilePath: cert.pkcs12FilePath,
+              passphrase: cert.passphrase || ''
+            };
+          }
+          return null;
+        }).filter((cert: any) => cert !== null)
+      };
+    }
+
+    // collection root
+    const collectionRoot: FolderRoot = {
+      meta: null,
+      request: null,
+      docs: null
+    };
+
+    // request defaults
+    if (oc.request) {
+      collectionRoot.request = {
+        headers: null,
+        auth: null,
+        script: {
+          req: null,
+          res: null
+        },
+        vars: {
+          req: [],
+          res: []
+        },
+        tests: null
+      };
+
+      // headers
+      const headers = toBrunoHttpHeaders(oc.request.headers);
+      collectionRoot.request.headers = headers || [];
+
+      // auth
+      const auth = toBrunoAuth(oc.request.auth);
+      if (auth) {
+        collectionRoot.request.auth = auth;
+      }
+
+      // variables
+      const variables = toBrunoVariables(oc.request.variables);
+      collectionRoot.request.vars = variables;
+
+      // scripts
+      const scripts = toBrunoScripts(oc.request.scripts);
+      if (scripts?.script && collectionRoot.request.script) {
+        if (scripts.script.req) {
+          collectionRoot.request.script.req = scripts.script.req;
+        }
+        if (scripts.script.res) {
+          collectionRoot.request.script.res = scripts.script.res;
+        }
+      }
+      if (scripts?.tests) {
+        collectionRoot.request.tests = scripts.tests;
+      }
+    }
+
+    // docs
+    if (oc.docs) {
+      if (typeof oc.docs === 'string') {
+        collectionRoot.docs = oc.docs;
+      } else if (typeof oc.docs === 'object' && oc.docs.content) {
+        collectionRoot.docs = oc.docs.content;
+      }
+    }
+
+    return {
+      collectionRoot,
+      brunoConfig
+    };
+  } catch (error) {
+    console.error('Error parsing collection:', error);
+    throw error;
+  }
+};
+
+export default parseCollection;
diff --git a/packages/bruno-filestore/src/formats/yml/parseEnvironment.ts b/packages/bruno-filestore/src/formats/yml/parseEnvironment.ts
new file mode 100644
index 000000000..412a0bc2f
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/parseEnvironment.ts
@@ -0,0 +1,42 @@
+import type { Environment as BrunoEnvironment, EnvironmentVariable as BrunoEnvironmentVariable } from '@usebruno/schema-types/collection/environment';
+import type { Environment } from '@opencollection/types/config/environments';
+import type { Variable } from '@opencollection/types/common/variables';
+import { parseYml } from './utils';
+import { uuid } from '../../utils';
+
+const toBrunoEnvironmentVariables = (variables: Variable[] | null | undefined): BrunoEnvironmentVariable[] => {
+  if (!variables?.length) {
+    return [];
+  }
+
+  return variables.map((v: Variable): BrunoEnvironmentVariable => {
+    const variable: BrunoEnvironmentVariable = {
+      uid: uuid(),
+      name: v.name || '',
+      value: v.value as string || '',
+      type: 'text',
+      enabled: v.disabled !== true,
+      secret: v.transient === true
+    };
+    return variable;
+  });
+};
+
+const parseEnvironment = (ymlString: string): BrunoEnvironment => {
+  try {
+    const ocEnvironment: Environment = parseYml(ymlString);
+
+    const brunoEnvironment: BrunoEnvironment = {
+      uid: uuid(),
+      name: ocEnvironment.name || 'Untitled Environment',
+      variables: toBrunoEnvironmentVariables(ocEnvironment.variables)
+    };
+
+    return brunoEnvironment;
+  } catch (error) {
+    console.error('Error parsing environment:', error);
+    throw error;
+  }
+};
+
+export default parseEnvironment;
diff --git a/packages/bruno-filestore/src/formats/yml/parseFolder.ts b/packages/bruno-filestore/src/formats/yml/parseFolder.ts
new file mode 100644
index 000000000..40858c5cc
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/parseFolder.ts
@@ -0,0 +1,82 @@
+import type { FolderRoot } from '@usebruno/schema-types/collection/folder';
+import type { Folder } from '@opencollection/types/collection/item';
+import { parseYml } from './utils';
+import { toBrunoAuth } from './common/auth';
+import { toBrunoHttpHeaders } from './common/headers';
+import { toBrunoVariables } from './common/variables';
+import { toBrunoScripts } from './common/scripts';
+import { isNonEmptyString } from '../../utils';
+
+const parseFolder = (ymlString: string): FolderRoot => {
+  try {
+    const ocFolder: Folder = parseYml(ymlString);
+
+    const folderRoot: FolderRoot = {
+      meta: {
+        name: ocFolder.name || 'Untitled Folder',
+        seq: ocFolder.seq || 1
+      },
+      request: null,
+      docs: null
+    };
+
+    // request defaults
+    if (ocFolder.request) {
+      folderRoot.request = {
+        headers: [],
+        auth: null,
+        script: {
+          req: null,
+          res: null
+        },
+        vars: {
+          req: [],
+          res: []
+        },
+        tests: null
+      };
+
+      // headers
+      const headers = toBrunoHttpHeaders(ocFolder.request.headers);
+      if (headers) {
+        folderRoot.request.headers = headers;
+      }
+
+      // auth
+      const auth = toBrunoAuth(ocFolder.request.auth);
+      if (auth) {
+        folderRoot.request.auth = auth;
+      }
+
+      // variables
+      const variables = toBrunoVariables(ocFolder.request.variables);
+      folderRoot.request.vars = variables;
+
+      // scripts
+      const scripts = toBrunoScripts(ocFolder.request.scripts);
+      if (scripts?.script && folderRoot.request.script) {
+        if (scripts.script.req) {
+          folderRoot.request.script.req = scripts.script.req;
+        }
+        if (scripts.script.res) {
+          folderRoot.request.script.res = scripts.script.res;
+        }
+      }
+      if (scripts?.tests) {
+        folderRoot.request.tests = scripts.tests;
+      }
+    }
+
+    // docs
+    if (isNonEmptyString(ocFolder.docs)) {
+      folderRoot.docs = ocFolder.docs;
+    }
+
+    return folderRoot;
+  } catch (error) {
+    console.error('Error parsing folder:', error);
+    throw error;
+  }
+};
+
+export default parseFolder;
diff --git a/packages/bruno-filestore/src/formats/yml/parseItem.ts b/packages/bruno-filestore/src/formats/yml/parseItem.ts
new file mode 100644
index 000000000..db70a6a92
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/parseItem.ts
@@ -0,0 +1,46 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { Item } from '@opencollection/types/collection/item';
+import { parseYml } from './utils';
+import parseHttpRequest from './items/parseHttpRequest';
+import parseGraphQLRequest from './items/parseGraphQLRequest';
+import parseGrpcRequest from './items/parseGrpcRequest';
+import parseWebsocketRequest from './items/parseWebsocketRequest';
+import parseScript from './items/parseScript';
+
+const parseItem = (ymlString: string): BrunoItem => {
+  try {
+    const ocItem: Item = parseYml(ymlString);
+
+    if (!ocItem || !ocItem.type) {
+      throw new Error('Invalid item: missing type');
+    }
+
+    switch (ocItem.type) {
+      case 'http':
+        return parseHttpRequest(ocItem);
+
+      case 'graphql':
+        return parseGraphQLRequest(ocItem);
+
+      case 'grpc':
+        return parseGrpcRequest(ocItem);
+
+      case 'websocket':
+        return parseWebsocketRequest(ocItem);
+
+      case 'script':
+        return parseScript(ocItem);
+
+      case 'folder':
+        throw new Error('Folder items should be handled separately using parseFolder');
+
+      default:
+        throw new Error(`Unsupported item type: ${(ocItem as any).type}`);
+    }
+  } catch (error) {
+    console.error('Error parsing item:', error);
+    throw error;
+  }
+};
+
+export default parseItem;
diff --git a/packages/bruno-filestore/src/formats/yml/stringifyCollection.ts b/packages/bruno-filestore/src/formats/yml/stringifyCollection.ts
new file mode 100644
index 000000000..2c08446e9
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/stringifyCollection.ts
@@ -0,0 +1,190 @@
+import type { OpenCollection } from '@opencollection/types';
+import type { ProtoFileItem, ProtoFileImportPath } from '@opencollection/types/config/protobuf';
+import type { HttpHeader } from '@opencollection/types/requests/http';
+import type { ClientCertificate, PemCertificate, Pkcs12Certificate } from '@opencollection/types/config/certificates';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import { stringifyYml } from './utils';
+import { toOpenCollectionAuth } from './common/auth';
+import { toOpenCollectionHttpHeaders } from './common/headers';
+import { toOpenCollectionVariables } from './common/variables';
+import { toOpenCollectionScripts } from './common/scripts';
+import type { Auth } from '@opencollection/types/common/auth';
+
+const hasCollectionConfig = (brunoConfig: any): boolean => {
+  // protobuf
+  const hasProtobuf = (
+    brunoConfig.protobuf?.protofFiles?.length > 0
+    || brunoConfig.protobuf?.importPaths?.length > 0
+  );
+
+  // proxy
+  const hasProxy = !!brunoConfig.proxy?.enabled;
+
+  // client certificates
+  const hasClientCertificates = brunoConfig.clientCertificates?.certs?.length > 0;
+
+  return hasProtobuf || hasProxy || hasClientCertificates;
+};
+
+const hasRequestDefaults = (collectionRoot: any): boolean => {
+  const requestRoot = collectionRoot?.request;
+
+  return Boolean((requestRoot?.headers?.length)
+    || (requestRoot?.vars?.req?.length)
+    || hasRequestScripts(collectionRoot)
+    || hasRequestAuth(collectionRoot));
+};
+
+const hasRequestAuth = (collectionRoot: any): boolean => {
+  return Boolean((collectionRoot.request?.auth?.mode !== 'none'));
+};
+
+const hasRequestScripts = (collectionRoot: any): boolean => {
+  return (collectionRoot.request?.script?.req)
+    || (collectionRoot.request?.script?.res)
+    || (collectionRoot.request?.tests);
+};
+
+const stringifyCollection = (collectionRoot: any, brunoConfig: any): string => {
+  try {
+    const oc: OpenCollection = {};
+
+    oc.info = {
+      name: brunoConfig.name || 'Untitled Collection'
+    };
+    oc.opencollection = '1.0.0';
+
+    // collection config
+    if (hasCollectionConfig(brunoConfig)) {
+      oc.config = {};
+
+      if (brunoConfig.protobuf?.protofFiles?.length) {
+        oc.config.protobuf = {
+          protoFiles: brunoConfig.protobuf.protofFiles.map((protoFile: any): ProtoFileItem => ({
+            type: 'file' as const,
+            path: protoFile.path
+          })),
+          importPaths: brunoConfig.protobuf.importPaths.map((importPath: any): ProtoFileImportPath => ({
+            path: importPath.path,
+            disabled: importPath.disabled
+          }))
+        };
+      }
+
+      // proxy
+      if (brunoConfig.proxy?.enabled) {
+        if (brunoConfig.proxy.enabled === 'global') {
+          oc.config.proxy = 'inherit';
+        } else {
+          oc.config.proxy = {
+            protocol: brunoConfig.proxy.protocol,
+            hostname: brunoConfig.proxy.hostname,
+            port: brunoConfig.proxy.port
+          };
+
+          if (brunoConfig.proxy.auth?.enabled) {
+            oc.config.proxy.auth = {
+              username: brunoConfig.proxy.auth.username,
+              password: brunoConfig.proxy.auth.password
+            };
+          }
+        }
+      }
+
+      // client certificates
+      if (brunoConfig.clientCertificates?.certs?.length) {
+        oc.config.clientCertificates = brunoConfig.clientCertificates.certs
+          .map((cert: any): ClientCertificate | null => {
+            if (cert.type === 'pem') {
+              const pemCert: PemCertificate = {
+                domain: cert.domain,
+                type: 'pem',
+                certificateFilePath: cert.certFilePath,
+                privateKeyFilePath: cert.keyFilePath,
+                ...(cert.passphrase && { passphrase: cert.passphrase })
+              };
+              return pemCert;
+            } else if (cert.type === 'pkcs12') {
+              const pkcs12Cert: Pkcs12Certificate = {
+                domain: cert.domain,
+                type: 'pkcs12',
+                pkcs12FilePath: cert.pfxFilePath,
+                ...(cert.passphrase && { passphrase: cert.passphrase })
+              };
+              return pkcs12Cert;
+            } else {
+              // Unsupported certificate type - ignore silently
+              return null;
+            }
+          })
+          .filter((cert: ClientCertificate | null): cert is ClientCertificate => cert !== null);
+      }
+    }
+
+    // request defaults
+    if (hasRequestDefaults(collectionRoot)) {
+      oc.request = {};
+
+      // headers
+      if (collectionRoot.request?.headers?.length) {
+        const ocHeaders: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(collectionRoot.request?.headers);
+        if (ocHeaders) {
+          oc.request.headers = ocHeaders;
+        }
+      }
+
+      // auth
+      if (hasRequestAuth(collectionRoot)) {
+        const ocAuth: Auth | undefined = toOpenCollectionAuth(collectionRoot.request?.auth);
+        if (ocAuth) {
+          oc.request.auth = ocAuth;
+        }
+      }
+
+      // variables
+      if (collectionRoot.request?.vars?.req?.length) {
+        const ocVariables: Variable[] | undefined = toOpenCollectionVariables(collectionRoot.request?.vars);
+        if (ocVariables) {
+          oc.request.variables = ocVariables;
+        }
+      }
+
+      // scripts
+      if (hasRequestScripts(collectionRoot)) {
+        const ocScripts: Scripts | undefined = toOpenCollectionScripts(collectionRoot.request);
+        if (ocScripts) {
+          oc.request.scripts = ocScripts;
+        }
+      }
+    }
+
+    // docs
+    if (collectionRoot.docs?.trim().length) {
+      oc.docs = {
+        content: collectionRoot.docs,
+        type: 'text/markdown'
+      };
+    }
+
+    // bundled
+    oc.bundled = false;
+
+    // extensions
+    oc.extensions = {};
+    if (brunoConfig.ignore?.length) {
+      const ignoreList: string[] = [];
+      brunoConfig.ignore.forEach((ignore: string) => {
+        ignoreList.push(ignore);
+      });
+      oc.extensions.ignore = ignoreList;
+    }
+
+    return stringifyYml(oc);
+  } catch (error) {
+    console.error('Error stringifying opencollection.yml:', error);
+    throw error;
+  }
+};
+
+export default stringifyCollection;
diff --git a/packages/bruno-filestore/src/formats/yml/stringifyEnvironment.ts b/packages/bruno-filestore/src/formats/yml/stringifyEnvironment.ts
new file mode 100644
index 000000000..9486656ec
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/stringifyEnvironment.ts
@@ -0,0 +1,57 @@
+import type { Environment as BrunoEnvironment, EnvironmentVariable as BrunoEnvironmentVariable } from '@usebruno/schema-types/collection/environment';
+import type { Environment } from '@opencollection/types/config/environments';
+import type { Variable } from '@opencollection/types/common/variables';
+import { stringifyYml } from './utils';
+
+const toOpenCollectionEnvironmentVariables = (variables: BrunoEnvironmentVariable[]): Variable[] | undefined => {
+  if (!variables?.length) {
+    return undefined;
+  }
+
+  const ocVariables: Variable[] = variables
+    .filter((v: BrunoEnvironmentVariable) => {
+      // todo: currently neithwe bru lang nor bruno app supports non-string values
+      // update this when bruno app supports non-string values
+      return typeof v.value === 'string';
+    })
+    .map((v: BrunoEnvironmentVariable): Variable => {
+      const variable: Variable = {
+        name: v.name || '',
+        value: v.value as string
+      };
+
+      if (v.enabled === false) {
+        variable.disabled = true;
+      }
+
+      if (v.secret === true) {
+        variable.transient = true;
+      }
+
+      return variable;
+    });
+
+  return ocVariables.length > 0 ? ocVariables : undefined;
+};
+
+const stringifyEnvironment = (environment: BrunoEnvironment): string => {
+  try {
+    const ocEnvironment: Environment = {
+      name: environment.name
+    };
+
+    // Convert variables if they exist
+    if (environment.variables?.length) {
+      const ocVariables = toOpenCollectionEnvironmentVariables(environment.variables);
+      if (ocVariables) {
+        ocEnvironment.variables = ocVariables;
+      }
+    }
+
+    return stringifyYml(ocEnvironment);
+  } catch (error) {
+    console.error('Error stringifying environment:', error);
+    throw error;
+  }
+};
+export default stringifyEnvironment;
diff --git a/packages/bruno-filestore/src/formats/yml/stringifyFolder.ts b/packages/bruno-filestore/src/formats/yml/stringifyFolder.ts
new file mode 100644
index 000000000..2210551e1
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/stringifyFolder.ts
@@ -0,0 +1,92 @@
+import type { FolderRoot } from '@usebruno/schema-types/collection/folder';
+import type { Folder } from '@opencollection/types/collection/item';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Auth, HttpHeader } from '@opencollection/types/requests/http';
+import type { RequestDefaults } from '@opencollection/types/common/request-defaults';
+import { toOpenCollectionAuth } from './common/auth';
+import { toOpenCollectionHttpHeaders } from './common/headers';
+import { toOpenCollectionVariables } from './common/variables';
+import { toOpenCollectionScripts } from './common/scripts';
+import { stringifyYml } from './utils';
+
+const hasRequestDefaults = (folderRoot: FolderRoot): boolean => {
+  const requestDefaults = folderRoot?.request;
+
+  return Boolean((requestDefaults?.headers?.length)
+    || (requestDefaults?.vars?.req?.length)
+    || hasRequestScripts(folderRoot)
+    || hasRequestAuth(folderRoot));
+};
+
+const hasRequestAuth = (folderRoot: FolderRoot): boolean => {
+  return Boolean((folderRoot.request?.auth?.mode !== 'none'));
+};
+
+const hasRequestScripts = (folderRoot: FolderRoot): boolean => {
+  return Boolean((folderRoot.request?.script?.req)
+    || (folderRoot.request?.script?.res)
+    || (folderRoot.request?.tests));
+};
+
+const stringifyFolder = (folderRoot: FolderRoot): string => {
+  try {
+    const ocFolder: Folder = {
+      type: 'folder'
+    };
+
+    ocFolder.name = folderRoot.meta?.name || 'Untitled Folder';
+    ocFolder.seq = folderRoot.meta?.seq || 1;
+
+    // request defaults
+    if (hasRequestDefaults(folderRoot)) {
+      ocFolder.request = {} as RequestDefaults;
+
+      // headers
+      if (folderRoot.request?.headers?.length) {
+        const ocHeaders: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(folderRoot.request?.headers);
+        if (ocHeaders) {
+          ocFolder.request.headers = ocHeaders;
+        }
+      }
+
+      // auth
+      if (hasRequestAuth(folderRoot)) {
+        const ocAuth: Auth | undefined = toOpenCollectionAuth(folderRoot.request?.auth);
+        if (ocAuth) {
+          ocFolder.request.auth = ocAuth;
+        }
+      }
+
+      // variables
+      if (folderRoot.request?.vars?.req?.length) {
+        const ocVariables: Variable[] | undefined = toOpenCollectionVariables(folderRoot.request?.vars);
+        if (ocVariables) {
+          ocFolder.request.variables = ocVariables;
+        }
+      }
+
+      // scripts
+      if (hasRequestScripts(folderRoot)) {
+        const ocScripts: Scripts | undefined = toOpenCollectionScripts(folderRoot?.request);
+        if (ocScripts) {
+          ocFolder.request.scripts = ocScripts;
+        }
+      }
+    }
+
+    // docs
+    if (folderRoot.docs?.trim().length) {
+      ocFolder.docs = {
+        content: folderRoot.docs,
+        type: 'text/markdown'
+      };
+    }
+
+    return stringifyYml(ocFolder);
+  } catch (error) {
+    console.error('Error stringifying folder.yml:', error);
+    throw error;
+  }
+};
+export default stringifyFolder;
diff --git a/packages/bruno-filestore/src/formats/yml/stringifyItem.ts b/packages/bruno-filestore/src/formats/yml/stringifyItem.ts
new file mode 100644
index 000000000..8d8bfec17
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/stringifyItem.ts
@@ -0,0 +1,37 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import stringifyHttpRequest from './items/stringifyHttpRequest';
+import stringifyGraphqlRequest from './items/stringifyGraphQLRequest';
+import stringifyGrpcRequest from './items/stringifyGrpcRequest';
+import stringifyWebsocketRequest from './items/stringifyWebsocketRequest';
+import stringifyScript from './items/stringifyScript';
+
+const stringifyItem = (item: BrunoItem): string => {
+  try {
+    switch (item.type) {
+      case 'http-request':
+        return stringifyHttpRequest(item);
+
+      case 'graphql-request':
+        return stringifyGraphqlRequest(item);
+
+      case 'grpc-request':
+        return stringifyGrpcRequest(item);
+
+      case 'ws-request':
+        return stringifyWebsocketRequest(item);
+
+      case 'js':
+        return stringifyScript(item);
+
+      case 'folder':
+        throw new Error('Folder items should be handled separately using stringifyFolder');
+
+      default:
+        throw new Error(`Unsupported item type: ${item.type}`);
+    }
+  } catch (error) {
+    console.error('Error stringifying item:', error);
+    throw error;
+  }
+};
+export default stringifyItem;
diff --git a/packages/bruno-filestore/src/formats/yml/utils.ts b/packages/bruno-filestore/src/formats/yml/utils.ts
new file mode 100644
index 000000000..71011a283
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/utils.ts
@@ -0,0 +1,14 @@
+import * as YAML from 'yaml';
+
+export const stringifyYml = (obj: any): string => {
+  return YAML.stringify(obj, {
+    lineWidth: 0,
+    indent: 2,
+    minContentWidth: 0,
+    defaultStringType: 'PLAIN'
+  });
+};
+
+export const parseYml = (ymlString: string): any => {
+  return YAML.parse(ymlString);
+};
diff --git a/packages/bruno-filestore/src/index.ts b/packages/bruno-filestore/src/index.ts
index 2e1ec26d5..b76ab102e 100644
--- a/packages/bruno-filestore/src/index.ts
+++ b/packages/bruno-filestore/src/index.ts
@@ -1,25 +1,38 @@
+import type { BrunoCollection, BrunoItem, BrunoEnvironment } from '@usebruno/schema-types';
+
 import {
-  bruRequestToJson,
-  jsonRequestToBru,
-  bruCollectionToJson,
-  jsonCollectionToBru,
-  bruEnvironmentToJson,
-  jsonEnvironmentToBru
+  parseBruRequest,
+  parseBruCollection,
+  parseBruEnvironment,
+  stringifyBruRequest,
+  stringifyBruCollection,
+  stringifyBruEnvironment
 } from './formats/bru';
+import {
+  parseYmlItem,
+  parseYmlCollection,
+  parseYmlFolder,
+  parseYmlEnvironment,
+  stringifyYmlItem,
+  stringifyYmlFolder,
+  stringifyYmlCollection,
+  stringifyYmlEnvironment
+} from './formats/yml';
 import { dotenvToJson } from '@usebruno/lang';
 import BruParserWorker from './workers';
 import {
   ParseOptions,
   StringifyOptions,
-  ParsedRequest,
-  ParsedCollection,
-  ParsedEnvironment
+  CollectionFormat
 } from './types';
 import { bruRequestParseAndRedactBodyData } from './formats/bru/utils/request-parse-and-redact-body-data';
 
+// request
 export const parseRequest = (content: string, options: ParseOptions = { format: 'bru' }): any => {
   if (options.format === 'bru') {
-    return bruRequestToJson(content);
+    return parseBruRequest(content);
+  } else if (options.format === 'yml') {
+    return parseYmlItem(content);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
@@ -31,15 +44,17 @@ export const parseRequestAndRedactBody = (content: string, options: ParseOptions
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
-export const stringifyRequest = (requestObj: ParsedRequest, options: StringifyOptions = { format: 'bru' }): string => {
+export const stringifyRequest = (requestObj: BrunoItem, options: StringifyOptions = { format: 'bru' }): string => {
   if (options.format === 'bru') {
-    return jsonRequestToBru(requestObj);
+    return stringifyBruRequest(requestObj);
+  } else if (options.format === 'yml') {
+    return stringifyYmlItem(requestObj);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
+// request via worker
 let globalWorkerInstance: BruParserWorker | null = null;
-
 const getWorkerInstance = (): BruParserWorker => {
   if (!globalWorkerInstance) {
     globalWorkerInstance = new BruParserWorker();
@@ -47,62 +62,77 @@ const getWorkerInstance = (): BruParserWorker => {
   return globalWorkerInstance;
 };
 
-export const parseRequestViaWorker = async (content: string): Promise<any> => {
+export const parseRequestViaWorker = async (content: string, options: { format: CollectionFormat; filename?: string }): Promise<any> => {
   const fileParserWorker = getWorkerInstance();
-  return await fileParserWorker.parseRequest(content);
+
+  return await fileParserWorker.parseRequest(content, options.format);
 };
 
-export const stringifyRequestViaWorker = async (requestObj: any): Promise<string> => {
+export const stringifyRequestViaWorker = async (requestObj: any, options: { format: CollectionFormat }): Promise<string> => {
   const fileParserWorker = getWorkerInstance();
-  return await fileParserWorker.stringifyRequest(requestObj);
+  return await fileParserWorker.stringifyRequest(requestObj, options.format);
 };
 
+// collection
 export const parseCollection = (content: string, options: ParseOptions = { format: 'bru' }): any => {
   if (options.format === 'bru') {
-    return bruCollectionToJson(content);
+    return parseBruCollection(content);
+  } else if (options.format === 'yml') {
+    return parseYmlCollection(content);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
-export const stringifyCollection = (collectionObj: ParsedCollection, options: StringifyOptions = { format: 'bru' }): string => {
+export const stringifyCollection = (collectionObj: BrunoCollection, brunoConfig: any, options: StringifyOptions = { format: 'bru' }): string => {
   if (options.format === 'bru') {
-    return jsonCollectionToBru(collectionObj, false);
+    return stringifyBruCollection(collectionObj, false);
+  } else if (options.format === 'yml') {
+    return stringifyYmlCollection(collectionObj, brunoConfig);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
+// folder
 export const parseFolder = (content: string, options: ParseOptions = { format: 'bru' }): any => {
   if (options.format === 'bru') {
-    return bruCollectionToJson(content);
+    return parseBruCollection(content);
+  } else if (options.format === 'yml') {
+    return parseYmlFolder(content);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
 export const stringifyFolder = (folderObj: any, options: StringifyOptions = { format: 'bru' }): string => {
   if (options.format === 'bru') {
-    return jsonCollectionToBru(folderObj, true);
+    return stringifyBruCollection(folderObj, true);
+  } else if (options.format === 'yml') {
+    return stringifyYmlFolder(folderObj);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
+// environment
 export const parseEnvironment = (content: string, options: ParseOptions = { format: 'bru' }): any => {
   if (options.format === 'bru') {
-    return bruEnvironmentToJson(content);
+    return parseBruEnvironment(content);
+  } else if (options.format === 'yml') {
+    return parseYmlEnvironment(content);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
-export const stringifyEnvironment = (envObj: ParsedEnvironment, options: StringifyOptions = { format: 'bru' }): string => {
+export const stringifyEnvironment = (envObj: BrunoEnvironment, options: StringifyOptions = { format: 'bru' }): string => {
   if (options.format === 'bru') {
-    return jsonEnvironmentToBru(envObj);
+    return stringifyBruEnvironment(envObj);
+  } else if (options.format === 'yml') {
+    return stringifyYmlEnvironment(envObj);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
-
 export const parseDotEnv = (content: string): Record<string, string> => {
   return dotenvToJson(content);
 };
 
 export { BruParserWorker };
-export * from './types';
\ No newline at end of file
+export * from './types';
diff --git a/packages/bruno-filestore/src/types.ts b/packages/bruno-filestore/src/types.ts
index 6c0564b4e..41246cd50 100644
--- a/packages/bruno-filestore/src/types.ts
+++ b/packages/bruno-filestore/src/types.ts
@@ -1,130 +1,11 @@
+export type CollectionFormat = 'bru' | 'yml';
+
 export interface ParseOptions {
-  format?: 'bru' | 'yaml';
+  format?: CollectionFormat;
 }
 
 export interface StringifyOptions {
-  format?: 'bru' | 'yaml';
-}
-
-export interface RequestBody {
-  mode?: string;
-  raw?: string;
-  formUrlEncoded?: Array<{ name: string; value: string; enabled: boolean }>;
-  multipartForm?: Array<{ name: string; value: string; type: string; enabled: boolean }>;
-  json?: string;
-  xml?: string;
-  sparql?: string;
-  graphql?: {
-    query?: string;
-    variables?: string;
-  };
-}
-
-export interface AuthConfig {
-  mode?: string;
-  basic?: {
-    username?: string;
-    password?: string;
-  };
-  bearer?: {
-    token?: string;
-  };
-  apikey?: {
-    key?: string;
-    value?: string;
-    placement?: string;
-  };
-  awsv4?: {
-    accessKeyId?: string;
-    secretAccessKey?: string;
-    sessionToken?: string;
-    service?: string;
-    region?: string;
-    profileName?: string;
-  };
-  oauth2?: {
-    grantType?: string;
-    callbackUrl?: string;
-    authorizationUrl?: string;
-    accessTokenUrl?: string;
-    clientId?: string;
-    clientSecret?: string;
-    scope?: string;
-    state?: string;
-    pkce?: boolean;
-  };
-}
-
-export interface RequestParam {
-  name: string;
-  value: string;
-  enabled: boolean;
-}
-
-export interface RequestHeader {
-  name: string;
-  value: string;
-  enabled: boolean;
-}
-
-export interface RequestAssertion {
-  name: string;
-  value: string;
-  enabled: boolean;
-}
-
-export interface RequestVars {
-  req?: Array<{ name: string; value: string; enabled: boolean }>;
-  res?: Array<{ name: string; value: string; enabled: boolean }>;
-}
-
-export interface RequestScript {
-  req?: string;
-  res?: string;
-}
-
-export interface RequestSettings {
-  [key: string]: any;
-}
-
-export interface RequestData {
-  method: string;
-  url: string;
-  params: RequestParam[];
-  headers: RequestHeader[];
-  auth: AuthConfig;
-  body: RequestBody;
-  script: RequestScript;
-  vars: RequestVars;
-  assertions: RequestAssertion[];
-  tests: string;
-  docs: string;
-}
-
-export interface ParsedRequest {
-  type: 'http-request' | 'graphql-request';
-  name: string;
-  seq: number;
-  settings: RequestSettings;
-  tags: string[];
-  request: RequestData;
-}
-
-export interface ParsedCollection {
-  name: string;
-  type?: string;
-  version?: string;
-  [key: string]: any;
-}
-
-export interface EnvironmentVariable {
-  name: string;
-  value: string;
-  enabled: boolean;
-}
-
-export interface ParsedEnvironment {
-  variables: EnvironmentVariable[];
+  format?: CollectionFormat;
 }
 
 export interface WorkerTask {
@@ -138,4 +19,4 @@ export interface WorkerTask {
 
 export interface Lane {
   maxSize: number;
-} 
\ No newline at end of file
+}
diff --git a/packages/bruno-filestore/src/types/bruno-lang.d.ts b/packages/bruno-filestore/src/types/bruno-lang.d.ts
index 257d6e8a0..a04dccb76 100644
--- a/packages/bruno-filestore/src/types/bruno-lang.d.ts
+++ b/packages/bruno-filestore/src/types/bruno-lang.d.ts
@@ -6,4 +6,4 @@ declare module '@usebruno/lang' {
   export function collectionBruToJson(bruContent: string): any;
   export function jsonToCollectionBru(jsonData: any): string;
   export function dotenvToJson(envContent: string): Record<string, string>;
-} 
\ No newline at end of file
+}
diff --git a/packages/bruno-filestore/src/utils/index.ts b/packages/bruno-filestore/src/utils/index.ts
new file mode 100644
index 000000000..590bd3140
--- /dev/null
+++ b/packages/bruno-filestore/src/utils/index.ts
@@ -0,0 +1,15 @@
+const { customAlphabet } = require('nanoid');
+
+export const isString = (value: unknown): value is string => typeof value === 'string';
+
+export const isNumber = (value: unknown): value is number => typeof value === 'number';
+
+export const isNonEmptyString = (value: unknown): value is string => isString(value) && value.trim().length > 0;
+
+export const uuid = () => {
+  // https://github.com/ai/nanoid/blob/main/url-alphabet/index.js
+  const urlAlphabet = 'useandom26T198340PX75pxJACKVERYMINDBUSHWOLFGQZbfghjklqvwyzrict';
+  const customNanoId = customAlphabet(urlAlphabet, 21);
+
+  return customNanoId();
+};
diff --git a/packages/bruno-filestore/src/workers/WorkerQueue/index.ts b/packages/bruno-filestore/src/workers/WorkerQueue/index.ts
index bb248ee3f..1751505b0 100644
--- a/packages/bruno-filestore/src/workers/WorkerQueue/index.ts
+++ b/packages/bruno-filestore/src/workers/WorkerQueue/index.ts
@@ -21,14 +21,14 @@ class WorkerQueue {
   }
 
   async getWorkerForScriptPath(scriptPath: string) {
-    if (!this.workers) this.workers = {}; 
+    if (!this.workers) this.workers = {};
     let worker = this.workers[scriptPath];
     if (!worker || worker.threadId === -1) {
       this.workers[scriptPath] = worker = new Worker(scriptPath);
     }
     return worker;
   }
-  
+
   async enqueue(task: QueuedTask) {
     const { priority, scriptPath, data, taskType } = task;
 
@@ -40,9 +40,9 @@ class WorkerQueue {
   }
 
   async processQueue() {
-    if (this.isProcessing || this.queue.length === 0){
+    if (this.isProcessing || this.queue.length === 0) {
       return;
-    } 
+    }
 
     this.isProcessing = true;
     const { scriptPath, data, taskType, resolve, reject } = this.queue.shift() as QueuedTask;
@@ -61,12 +61,12 @@ class WorkerQueue {
   async runWorker({ scriptPath, data, taskType }: { scriptPath: string; data: any; taskType: 'parse' | 'stringify' }) {
     return new Promise(async (resolve, reject) => {
       let worker = await this.getWorkerForScriptPath(scriptPath);
-      
+
       const messageHandler = (data: any) => {
         worker.off('message', messageHandler);
         worker.off('error', errorHandler);
         worker.off('exit', exitHandler);
-        
+
         if (data?.error) {
           reject(new Error(data?.error));
         } else {
@@ -89,7 +89,7 @@ class WorkerQueue {
         delete this.workers[scriptPath];
         reject(new Error(`Worker stopped with exit code ${code}`));
       };
-      
+
       worker.on('message', messageHandler);
       worker.on('error', errorHandler);
       worker.on('exit', exitHandler);
@@ -99,16 +99,16 @@ class WorkerQueue {
   }
 
   async cleanup() {
-    const promises = Object.values(this.workers).map(worker => {
+    const promises = Object.values(this.workers).map((worker) => {
       if (worker.threadId !== -1) {
         return worker.terminate();
       }
       return Promise.resolve();
     });
-    
+
     await Promise.allSettled(promises);
     this.workers = {};
   }
 }
 
-export default WorkerQueue;
\ No newline at end of file
+export default WorkerQueue;
diff --git a/packages/bruno-filestore/src/workers/index.ts b/packages/bruno-filestore/src/workers/index.ts
index af66ea107..126039e19 100644
--- a/packages/bruno-filestore/src/workers/index.ts
+++ b/packages/bruno-filestore/src/workers/index.ts
@@ -1,30 +1,30 @@
 import WorkerQueue from './WorkerQueue';
-import { Lane } from '../types';
+import { Lane, CollectionFormat } from '../types';
 import path from 'node:path';
 
 const sizeInMB = (size: number): number => {
   return size / (1024 * 1024);
-}
+};
 
 const getSize = (data: any): number => {
   return sizeInMB(typeof data === 'string' ? Buffer.byteLength(data, 'utf8') : Buffer.byteLength(JSON.stringify(data), 'utf8'));
-}
+};
 
 /**
  * Lanes are used to determine which worker queue to use based on the size of the data.
- * 
+ *
  * The first lane is for smaller files (<0.1MB), the second lane is for larger files (>=0.1MB).
  * This helps with parsing performance.
  */
 const LANES: Lane[] = [{
   maxSize: 0.005
-},{
+}, {
   maxSize: 0.1
-},{
+}, {
   maxSize: 1
-},{
+}, {
   maxSize: 10
-},{
+}, {
   maxSize: 100
 }];
 
@@ -38,7 +38,7 @@ class BruParserWorker {
   private workerQueues: WorkerQueueWithSize[];
 
   constructor() {
-    this.workerQueues = LANES?.map(lane => ({
+    this.workerQueues = LANES?.map((lane) => ({
       maxSize: lane?.maxSize,
       workerQueue: new WorkerQueue()
     }));
@@ -47,40 +47,40 @@ class BruParserWorker {
   private getWorkerQueue(size: number): WorkerQueue {
     // Find the first queue that can handle the given size
     // or fallback to the last queue for largest files
-    const queueForSize = this.workerQueues.find((queue) => 
+    const queueForSize = this.workerQueues.find((queue) =>
       queue.maxSize >= size
     );
 
     return queueForSize?.workerQueue ?? this.workerQueues[this.workerQueues.length - 1].workerQueue;
   }
 
-  private async enqueueTask({ data, taskType }: { data: any; taskType: 'parse' | 'stringify' }): Promise<any> {
+  private async enqueueTask({ data, taskType, format = 'bru' }: { data: any; taskType: 'parse' | 'stringify'; format?: CollectionFormat }): Promise<any> {
     const size = getSize(data);
     const workerQueue = this.getWorkerQueue(size);
     const workerScriptPath = path.join(__dirname, './workers/worker-script.js');
-    
+
     return workerQueue.enqueue({
-      data,
+      data: { data, format },
       priority: size,
       scriptPath: workerScriptPath,
-      taskType,
+      taskType
     });
   }
 
-  async parseRequest(data: any): Promise<any> {
-    return this.enqueueTask({ data, taskType: 'parse' });
+  async parseRequest(data: any, format: CollectionFormat = 'bru'): Promise<any> {
+    return this.enqueueTask({ data, taskType: 'parse', format });
   }
 
-  async stringifyRequest(data: any): Promise<any> {
-    return this.enqueueTask({ data, taskType: 'stringify' });
+  async stringifyRequest(data: any, format: CollectionFormat = 'bru'): Promise<any> {
+    return this.enqueueTask({ data, taskType: 'stringify', format });
   }
 
   async cleanup(): Promise<void> {
-    const cleanupPromises = this.workerQueues.map(({ workerQueue }) => 
+    const cleanupPromises = this.workerQueues.map(({ workerQueue }) =>
       workerQueue.cleanup()
     );
     await Promise.allSettled(cleanupPromises);
   }
 }
 
-export default BruParserWorker; 
\ No newline at end of file
+export default BruParserWorker;
diff --git a/packages/bruno-filestore/src/workers/worker-script.ts b/packages/bruno-filestore/src/workers/worker-script.ts
index 7a6529aab..84c26f604 100644
--- a/packages/bruno-filestore/src/workers/worker-script.ts
+++ b/packages/bruno-filestore/src/workers/worker-script.ts
@@ -1,20 +1,34 @@
 import { parentPort } from 'node:worker_threads';
-import { bruRequestToJson, jsonRequestToBru } from '../formats/bru';
+import { parseBruRequest, stringifyBruRequest } from '../formats/bru';
+import { parseYmlItem, stringifyYmlItem } from '../formats/yml';
+import { CollectionFormat } from '../types';
 
 interface WorkerMessage {
   taskType: 'parse' | 'stringify';
-  data: any;
+  data: {
+    data: any;
+    format?: CollectionFormat;
+  };
 }
 
 parentPort?.on('message', async (message: WorkerMessage) => {
   try {
-    const { taskType, data } = message;
+    const { taskType, data: messageData } = message;
+    const { data, format = 'bru' } = messageData;
     let result: any;
 
     if (taskType === 'parse') {
-      result = bruRequestToJson(data);
+      if (format === 'yml') {
+        result = parseYmlItem(data);
+      } else {
+        result = parseBruRequest(data);
+      }
     } else if (taskType === 'stringify') {
-      result = jsonRequestToBru(data);
+      if (format === 'yml') {
+        result = stringifyYmlItem(data);
+      } else {
+        result = stringifyBruRequest(data);
+      }
     } else {
       throw new Error(`Unknown task type: ${taskType}`);
     }
@@ -24,4 +38,4 @@ parentPort?.on('message', async (message: WorkerMessage) => {
     console.error('Worker error:', error);
     parentPort?.postMessage({ error: error?.message });
   }
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-filestore/tsconfig.json b/packages/bruno-filestore/tsconfig.json
index 22385164b..53a360ba2 100644
--- a/packages/bruno-filestore/tsconfig.json
+++ b/packages/bruno-filestore/tsconfig.json
@@ -12,12 +12,19 @@
     "allowSyntheticDefaultImports": true,
     "moduleResolution": "node",
     "declaration": true,
-    "declarationDir": "./dist/types",
+    "declarationMap": true,
     "allowJs": true,
     "checkJs": false,
     "types": ["node"],
     "lib": ["ES2020"],
-    "typeRoots": ["./node_modules/@types", "./src/types"]
+    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "./src/types"],
+    "baseUrl": "../..",
+    "paths": {
+      "@usebruno/schema-types": ["packages/bruno-schema-types/dist/index.d.ts"],
+      "@usebruno/schema-types/*": ["packages/bruno-schema-types/dist/*"],
+      "@opencollection/types": ["node_modules/@opencollection/types/dist/opencollection.d.ts"],
+      "@opencollection/types/*": ["node_modules/@opencollection/types/dist/*"]
+    }
   },
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.js", "src/**/*.d.ts"],
   "exclude": ["node_modules", "dist"]
diff --git a/packages/bruno-js/package.json b/packages/bruno-js/package.json
index 627024242..4519adaea 100644
--- a/packages/bruno-js/package.json
+++ b/packages/bruno-js/package.json
@@ -7,9 +7,6 @@
     "src",
     "package.json"
   ],
-  "peerDependencies": {
-    "@usebruno/vm2": "^3.9.13"
-  },
   "scripts": {
     "test": "node --experimental-vm-modules $(npx which jest) --testPathIgnorePatterns test.js",
     "sandbox:bundle-libraries": "node ./src/sandbox/bundle-libraries.js"
diff --git a/packages/bruno-js/src/bru.js b/packages/bruno-js/src/bru.js
index 9e66ef654..27c00da33 100644
--- a/packages/bruno-js/src/bru.js
+++ b/packages/bruno-js/src/bru.js
@@ -7,9 +7,10 @@ const { jar: createCookieJar } = require('@usebruno/requests').cookies;
 const variableNameRegex = /^[\w-.]*$/;
 
 class Bru {
-  constructor(envVariables, runtimeVariables, processEnvVars, collectionPath, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, oauth2CredentialVariables, collectionName) {
+  constructor(envVariables, runtimeVariables, processEnvVars, collectionPath, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, oauth2CredentialVariables, collectionName, promptVariables) {
     this.envVariables = envVariables || {};
     this.runtimeVariables = runtimeVariables || {};
+    this.promptVariables = promptVariables || {};
     this.processEnvVars = cloneDeep(processEnvVars || {});
     this.collectionVariables = collectionVariables || {};
     this.folderVariables = folderVariables || {};
@@ -22,7 +23,7 @@ class Bru {
     this.cookies = {
       jar: () => {
         const cookieJar = createCookieJar();
-                
+
         return {
           getCookie: (url, cookieName, callback) => {
             const interpolatedUrl = this.interpolate(url);
@@ -134,6 +135,7 @@ class Bru {
       ...this.requestVariables,
       ...this.oauth2CredentialVariables,
       ...this.runtimeVariables,
+      ...this.promptVariables,
       process: {
         env: {
           ...this.processEnvVars
@@ -223,8 +225,8 @@ class Bru {
 
     if (variableNameRegex.test(key) === false) {
       throw new Error(
-        `Variable name: "${key}" contains invalid characters!` +
-          ' Names must only contain alpha-numeric characters, "-", "_", "."'
+        `Variable name: "${key}" contains invalid characters!`
+        + ' Names must only contain alpha-numeric characters, "-", "_", "."'
       );
     }
 
@@ -234,8 +236,8 @@ class Bru {
   getVar(key) {
     if (variableNameRegex.test(key) === false) {
       throw new Error(
-        `Variable name: "${key}" contains invalid characters!` +
-          ' Names must only contain alpha-numeric characters, "-", "_", "."'
+        `Variable name: "${key}" contains invalid characters!`
+        + ' Names must only contain alpha-numeric characters, "-", "_", "."'
       );
     }
 
diff --git a/packages/bruno-js/src/bruno-request.js b/packages/bruno-js/src/bruno-request.js
index 9738ada1f..12275fd53 100644
--- a/packages/bruno-js/src/bruno-request.js
+++ b/packages/bruno-js/src/bruno-request.js
@@ -6,7 +6,7 @@ class BrunoRequest {
    * - req.headers
    * - req.timeout
    * - req.body
-   * 
+   *
    * Above shorthands are useful for accessing the request properties directly in the scripts
    * It must be noted that the user cannot set these properties directly.
    * They should use the respective setter methods to set these properties.
@@ -22,9 +22,9 @@ class BrunoRequest {
     /**
      * We automatically parse the JSON body if the content type is JSON
      * This is to make it easier for the user to access the body directly
-     * 
+     *
      * It must be noted that the request data is always a string and is what gets sent over the network
-     * If the user wants to access the raw data, they can use getBody({raw: true}) method 
+     * If the user wants to access the raw data, they can use getBody({raw: true}) method
      */
     const isJson = this.hasJSONContentType(this.req.headers);
     if (isJson) {
@@ -44,6 +44,7 @@ class BrunoRequest {
   getMethod() {
     return this.req.method;
   }
+
   getAuthMode() {
     if (this.req?.oauth2) {
       return 'oauth2';
@@ -92,7 +93,7 @@ class BrunoRequest {
 
   /**
    * Get the body of the request
-   * 
+   *
    * We automatically parse and return the JSON body if the content type is JSON
    * If the user wants the raw body, they can pass the raw option as true
    */
@@ -116,7 +117,7 @@ class BrunoRequest {
    * Otherwise
    *  - We set the request data as the data itself
    *  - We set the body property as the data itself
-   * 
+   *
    * If the user wants to override this behavior, they can pass the raw option as true
    */
   setBody(data, options = {}) {
@@ -149,7 +150,7 @@ class BrunoRequest {
     this.timeout = timeout;
     this.req.timeout = timeout;
   }
-  
+
   onFail(callback) {
     if (typeof callback === 'function') {
       this.req.onFailHandler = callback;
@@ -177,7 +178,6 @@ class BrunoRequest {
   __isObject(obj) {
     return obj !== null && typeof obj === 'object';
   }
-  
 
   disableParsingResponseJson() {
     this.req.__brunoDisableParsingResponseJson = true;
diff --git a/packages/bruno-js/src/bruno-response.js b/packages/bruno-js/src/bruno-response.js
index 2a482c5e7..bdd091153 100644
--- a/packages/bruno-js/src/bruno-response.js
+++ b/packages/bruno-js/src/bruno-response.js
@@ -65,7 +65,7 @@ class BrunoResponse {
 
     const { data, dataBuffer, headers } = this.res;
     let bodySize = 0;
-    
+
     // Use raw received bytes
     if (Buffer.isBuffer(dataBuffer)) {
       bodySize = dataBuffer.length;
@@ -94,7 +94,6 @@ class BrunoResponse {
     const headerSize = Buffer.byteLength(headerLines.join('\r\n'));
 
     return { header: headerSize, body: bodySize, total: headerSize + bodySize };
-    
   }
 
   getDataBuffer() {
diff --git a/packages/bruno-js/src/runtime/assert-runtime.js b/packages/bruno-js/src/runtime/assert-runtime.js
index 4e997d314..8639ee11e 100644
--- a/packages/bruno-js/src/runtime/assert-runtime.js
+++ b/packages/bruno-js/src/runtime/assert-runtime.js
@@ -241,7 +241,7 @@ const evaluateRhsOperand = (rhsOperand, operator, context, runtime) => {
 
 class AssertRuntime {
   constructor(props) {
-    this.runtime = props?.runtime || 'vm2';
+    this.runtime = props?.runtime || 'quickjs';
   }
 
   runAssertions(assertions, request, response, envVariables, runtimeVariables, processEnvVars) {
@@ -255,6 +255,7 @@ class AssertRuntime {
       return [];
     }
 
+    const promptVariables = request?.promptVariables || {};
     const bru = new Bru(
       envVariables,
       runtimeVariables,
@@ -263,7 +264,10 @@ class AssertRuntime {
       collectionVariables,
       folderVariables,
       requestVariables,
-      globalEnvironmentVariables
+      globalEnvironmentVariables,
+      {},
+      undefined,
+      promptVariables
     );
     const req = new BrunoRequest(request);
     const res = createResponseParser(response);
diff --git a/packages/bruno-js/src/runtime/script-runtime.js b/packages/bruno-js/src/runtime/script-runtime.js
index 1c7b5aeb9..27aa7d35e 100644
--- a/packages/bruno-js/src/runtime/script-runtime.js
+++ b/packages/bruno-js/src/runtime/script-runtime.js
@@ -1,45 +1,15 @@
-const { NodeVM } = require('@usebruno/vm2');
-const path = require('path');
-const http = require('http');
-const https = require('https');
-const stream = require('stream');
-const util = require('util');
-const zlib = require('zlib');
-const url = require('url');
-const punycode = require('punycode');
-const fs = require('fs');
-const { get } = require('lodash');
+const chai = require('chai');
 const Bru = require('../bru');
 const BrunoRequest = require('../bruno-request');
 const BrunoResponse = require('../bruno-response');
 const { cleanJson } = require('../utils');
 const { createBruTestResultMethods } = require('../utils/results');
 const { runScriptInNodeVm } = require('../sandbox/node-vm');
-
-// Inbuilt Library Support
-const ajv = require('ajv');
-const addFormats = require('ajv-formats');
-const atob = require('atob');
-const btoa = require('btoa');
-const lodash = require('lodash');
-const moment = require('moment');
-const uuid = require('uuid');
-const nanoid = require('nanoid');
-const axios = require('axios');
-const fetch = require('node-fetch');
-const chai = require('chai');
-const CryptoJS = require('crypto-js');
-const NodeVault = require('node-vault');
-const xml2js = require('xml2js');
-const cheerio = require('cheerio');
-const tv4 = require('tv4');
-const jsonwebtoken = require('jsonwebtoken');
 const { executeQuickJsVmAsync } = require('../sandbox/quickjs');
-const { mixinTypedArrays } = require('../sandbox/mixins/typed-arrays');
 
 class ScriptRuntime {
   constructor(props) {
-    this.runtime = props?.runtime || 'vm2';
+    this.runtime = props?.runtime || 'quickjs';
   }
 
   // This approach is getting out of hand
@@ -61,27 +31,10 @@ class ScriptRuntime {
     const collectionVariables = request?.collectionVariables || {};
     const folderVariables = request?.folderVariables || {};
     const requestVariables = request?.requestVariables || {};
+    const promptVariables = request?.promptVariables || {};
     const assertionResults = request?.assertionResults || [];
-    const bru = new Bru(envVariables, runtimeVariables, processEnvVars, collectionPath, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, oauth2CredentialVariables, collectionName);
+    const bru = new Bru(envVariables, runtimeVariables, processEnvVars, collectionPath, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, oauth2CredentialVariables, collectionName, promptVariables);
     const req = new BrunoRequest(request);
-    const allowScriptFilesystemAccess = get(scriptingConfig, 'filesystemAccess.allow', false);
-    const moduleWhitelist = get(scriptingConfig, 'moduleWhitelist', []);
-    const additionalContextRoots = get(scriptingConfig, 'additionalContextRoots', []);
-    const additionalContextRootsAbsolute = lodash
-      .chain(additionalContextRoots)
-      .map((acr) => (acr.startsWith('/') ? acr : path.join(collectionPath, acr)))
-      .value();
-
-    const whitelistedModules = {};
-
-    for (let module of moduleWhitelist) {
-      try {
-        whitelistedModules[module] = require(module);
-      } catch (e) {
-        // Ignore
-        console.warn(e);
-      }
-    }
 
     // extend bru with result getter methods
     const { __brunoTestResults, test } = createBruTestResultMethods(bru, assertionResults, chai);
@@ -95,10 +48,6 @@ class ScriptRuntime {
       __brunoTestResults: __brunoTestResults
     };
 
-    if (this.runtime === 'vm2') {
-      mixinTypedArrays(context);
-    }
-
     if (onConsoleLog && typeof onConsoleLog === 'function') {
       const customLogger = (type) => {
         return (...args) => {
@@ -139,69 +88,12 @@ class ScriptRuntime {
       };
     }
 
-    if (this.runtime === 'quickjs') {
-      await executeQuickJsVmAsync({
-        script: script,
-        context: context,
-        collectionPath
-      });
-
-      return {
-        request,
-        envVariables: cleanJson(envVariables),
-        runtimeVariables: cleanJson(runtimeVariables),
-        persistentEnvVariables: bru.persistentEnvVariables,
-        globalEnvironmentVariables: cleanJson(globalEnvironmentVariables),
-        results: cleanJson(__brunoTestResults.getResults()),
-        nextRequestName: bru.nextRequest,
-        skipRequest: bru.skipRequest,
-        stopExecution: bru.stopExecution
-      };
-    }
-
-    // default runtime is vm2
-    const vm = new NodeVM({
-      sandbox: context,
-      require: {
-        context: 'sandbox',
-        builtin: [ "*" ],
-        external: true,
-        root: [collectionPath, ...additionalContextRootsAbsolute],
-        mock: {
-          // node libs
-          path,
-          stream,
-          util,
-          url,
-          http,
-          https,
-          punycode,
-          zlib,
-          // 3rd party libs
-          ajv,
-          'ajv-formats': addFormats,
-          atob,
-          btoa,
-          lodash,
-          moment,
-          uuid,
-          nanoid,
-          axios,
-          chai,
-          'node-fetch': fetch,
-          'crypto-js': CryptoJS,
-          xml2js: xml2js,
-          jsonwebtoken,
-          cheerio,
-          tv4,
-          ...whitelistedModules,
-          fs: allowScriptFilesystemAccess ? fs : undefined,
-          'node-vault': NodeVault
-        }
-      }
+    // default runtime is `quickjs`
+    await executeQuickJsVmAsync({
+      script: script,
+      context: context,
+      collectionPath
     });
-    const asyncVM = vm.run(`module.exports = async () => { ${script} }`, path.join(collectionPath, 'vm.js'));
-    await asyncVM();
 
     return {
       request,
@@ -234,28 +126,11 @@ class ScriptRuntime {
     const collectionVariables = request?.collectionVariables || {};
     const folderVariables = request?.folderVariables || {};
     const requestVariables = request?.requestVariables || {};
-    const assertionResults = request?.assertionResults || [];
-    const bru = new Bru(envVariables, runtimeVariables, processEnvVars, collectionPath, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, oauth2CredentialVariables, collectionName);
+    const promptVariables = request?.promptVariables || {};
+    const assertionResults = request?.assertionResults || {};
+    const bru = new Bru(envVariables, runtimeVariables, processEnvVars, collectionPath, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, oauth2CredentialVariables, collectionName, promptVariables);
     const req = new BrunoRequest(request);
     const res = new BrunoResponse(response);
-    const allowScriptFilesystemAccess = get(scriptingConfig, 'filesystemAccess.allow', false);
-    const moduleWhitelist = get(scriptingConfig, 'moduleWhitelist', []);
-    const additionalContextRoots = get(scriptingConfig, 'additionalContextRoots', []);
-    const additionalContextRootsAbsolute = lodash
-      .chain(additionalContextRoots)
-      .map((acr) => (acr.startsWith('/') ? acr : path.join(collectionPath, acr)))
-      .value();
-
-    const whitelistedModules = {};
-
-    for (let module of moduleWhitelist) {
-      try {
-        whitelistedModules[module] = require(module);
-      } catch (e) {
-        // Ignore
-        console.warn(e);
-      }
-    }
 
     // extend bru with result getter methods
     const { __brunoTestResults, test } = createBruTestResultMethods(bru, assertionResults, chai);
@@ -270,10 +145,6 @@ class ScriptRuntime {
       __brunoTestResults: __brunoTestResults
     };
 
-    if (this.runtime === 'vm2') {
-      mixinTypedArrays(context);
-    }
-
     if (onConsoleLog && typeof onConsoleLog === 'function') {
       const customLogger = (type) => {
         return (...args) => {
@@ -314,70 +185,13 @@ class ScriptRuntime {
       };
     }
 
-    if (this.runtime === 'quickjs') {
-      await executeQuickJsVmAsync({
-        script: script,
-        context: context,
-        collectionPath
-      });
-
-      return {
-        response,
-        envVariables: cleanJson(envVariables),
-        persistentEnvVariables: cleanJson(bru.persistentEnvVariables),
-        runtimeVariables: cleanJson(runtimeVariables),
-        globalEnvironmentVariables: cleanJson(globalEnvironmentVariables),
-        results: cleanJson(__brunoTestResults.getResults()),
-        nextRequestName: bru.nextRequest,
-        skipRequest: bru.skipRequest,
-        stopExecution: bru.stopExecution
-      };
-    }
-
-    // default runtime is vm2
-    const vm = new NodeVM({
-      sandbox: context,
-      require: {
-        context: 'sandbox',
-        builtin: [ "*" ],
-        external: true,
-        root: [collectionPath, ...additionalContextRootsAbsolute],
-        mock: {
-          // node libs
-          path,
-          stream,
-          util,
-          url,
-          http,
-          https,
-          punycode,
-          zlib,
-          // 3rd party libs
-          ajv,
-          'ajv-formats': addFormats,
-          atob,
-          btoa,
-          lodash,
-          moment,
-          uuid,
-          nanoid,
-          axios,
-          'node-fetch': fetch,
-          'crypto-js': CryptoJS,
-          'xml2js': xml2js,
-          jsonwebtoken,
-          cheerio,
-          tv4,
-          ...whitelistedModules,
-          fs: allowScriptFilesystemAccess ? fs : undefined,
-          'node-vault': NodeVault
-        }
-      }
+    // default runtime is `quickjs`
+    await executeQuickJsVmAsync({
+      script: script,
+      context: context,
+      collectionPath
     });
 
-    const asyncVM = vm.run(`module.exports = async () => { ${script} }`, path.join(collectionPath, 'vm.js'));
-    await asyncVM();
-
     return {
       response,
       envVariables: cleanJson(envVariables),
diff --git a/packages/bruno-js/src/runtime/test-runtime.js b/packages/bruno-js/src/runtime/test-runtime.js
index 6f42d1b5b..f2d1764ab 100644
--- a/packages/bruno-js/src/runtime/test-runtime.js
+++ b/packages/bruno-js/src/runtime/test-runtime.js
@@ -1,47 +1,16 @@
-const { NodeVM } = require('@usebruno/vm2');
-const { runScriptInNodeVm } = require('../sandbox/node-vm');
 const chai = require('chai');
-const path = require('path');
-const http = require('http');
-const https = require('https');
-const stream = require('stream');
-const util = require('util');
-const zlib = require('zlib');
-const url = require('url');
-const punycode = require('punycode');
-const fs = require('fs');
-const { get } = require('lodash');
 const Bru = require('../bru');
 const BrunoRequest = require('../bruno-request');
 const BrunoResponse = require('../bruno-response');
-const Test = require('../test');
-const TestResults = require('../test-results');
 const { cleanJson } = require('../utils');
 const { createBruTestResultMethods } = require('../utils/results');
-
-// Inbuilt Library Support
-const ajv = require('ajv');
-const addFormats = require('ajv-formats');
-const atob = require('atob');
-const btoa = require('btoa');
-const lodash = require('lodash');
-const moment = require('moment');
-const uuid = require('uuid');
-const nanoid = require('nanoid');
-const axios = require('axios');
-const fetch = require('node-fetch');
-const CryptoJS = require('crypto-js');
-const NodeVault = require('node-vault');
-const xml2js = require('xml2js');
-const cheerio = require('cheerio');
-const tv4 = require('tv4');
+const { runScriptInNodeVm } = require('../sandbox/node-vm');
 const jsonwebtoken = require('jsonwebtoken');
 const { executeQuickJsVmAsync } = require('../sandbox/quickjs');
-const { mixinTypedArrays } = require('../sandbox/mixins/typed-arrays');
 
 class TestRuntime {
   constructor(props) {
-    this.runtime = props?.runtime || 'vm2';
+    this.runtime = props?.runtime || 'quickjs';
   }
 
   async runTests(
@@ -61,28 +30,11 @@ class TestRuntime {
     const collectionVariables = request?.collectionVariables || {};
     const folderVariables = request?.folderVariables || {};
     const requestVariables = request?.requestVariables || {};
+    const promptVariables = request?.promptVariables || {};
     const assertionResults = request?.assertionResults || [];
-    const bru = new Bru(envVariables, runtimeVariables, processEnvVars, collectionPath, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, {}, collectionName);
+    const bru = new Bru(envVariables, runtimeVariables, processEnvVars, collectionPath, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, {}, collectionName, promptVariables);
     const req = new BrunoRequest(request);
     const res = new BrunoResponse(response);
-    const allowScriptFilesystemAccess = get(scriptingConfig, 'filesystemAccess.allow', false);
-    const moduleWhitelist = get(scriptingConfig, 'moduleWhitelist', []);
-    const additionalContextRoots = get(scriptingConfig, 'additionalContextRoots', []);
-    const additionalContextRootsAbsolute = lodash
-      .chain(additionalContextRoots)
-      .map((acr) => (acr.startsWith('/') ? acr : path.join(collectionPath, acr)))
-      .value();
-
-    const whitelistedModules = {};
-
-    for (let module of moduleWhitelist) {
-      try {
-        whitelistedModules[module] = require(module);
-      } catch (e) {
-        // Ignore
-        console.warn(e);
-      }
-    }
 
     // extend bru with result getter methods
     const { __brunoTestResults, test } = createBruTestResultMethods(bru, assertionResults, chai);
@@ -109,10 +61,6 @@ class TestRuntime {
       jwt: jsonwebtoken
     };
 
-    if (this.runtime === 'vm2') {
-      mixinTypedArrays(context);
-    }
-
     if (onConsoleLog && typeof onConsoleLog === 'function') {
       const customLogger = (type) => {
         return (...args) => {
@@ -128,20 +76,14 @@ class TestRuntime {
       };
     }
 
-    if(runRequestByItemPathname) {
+    if (runRequestByItemPathname) {
       context.bru.runRequest = runRequestByItemPathname;
     }
 
     let scriptError = null;
 
     try {
-      if (this.runtime === 'quickjs') {
-        await executeQuickJsVmAsync({
-          script: testsFile,
-          context: context,
-          collectionPath
-        });
-      } else if (this.runtime === 'nodevm') {
+      if (this.runtime === 'nodevm') {
         await runScriptInNodeVm({
           script: testsFile,
           context,
@@ -149,49 +91,12 @@ class TestRuntime {
           scriptingConfig
         });
       } else {
-        // default runtime is vm2
-        const vm = new NodeVM({
-          sandbox: context,
-          require: {
-            context: 'sandbox',
-            external: true,
-            builtin: ['*'],
-            root: [collectionPath, ...additionalContextRootsAbsolute],
-            mock: {
-              // node libs
-              path,
-              stream,
-              util,
-              url,
-              http,
-              https,
-              punycode,
-              zlib,
-              // 3rd party libs
-              ajv,
-              'ajv-formats': addFormats,
-              btoa,
-              atob,
-              lodash,
-              moment,
-              uuid,
-              nanoid,
-              axios,
-              chai,
-              'node-fetch': fetch,
-              'crypto-js': CryptoJS,
-              'xml2js': xml2js,
-              cheerio,
-              tv4,
-              'jsonwebtoken': jsonwebtoken,
-              ...whitelistedModules,
-              fs: allowScriptFilesystemAccess ? fs : undefined,
-              'node-vault': NodeVault
-            }
-          }
+        // default runtime is `quickjs`
+        await executeQuickJsVmAsync({
+          script: testsFile,
+          context: context,
+          collectionPath
         });
-        const asyncVM = vm.run(`module.exports = async () => { ${testsFile}}`, path.join(collectionPath, 'vm.js'));
-        await asyncVM();
       }
     } catch (error) {
       scriptError = error;
diff --git a/packages/bruno-js/src/runtime/vars-runtime.js b/packages/bruno-js/src/runtime/vars-runtime.js
index 05f502c2d..c5ff72925 100644
--- a/packages/bruno-js/src/runtime/vars-runtime.js
+++ b/packages/bruno-js/src/runtime/vars-runtime.js
@@ -20,7 +20,7 @@ const evaluateJsExpressionBasedOnRuntime = (expr, context, runtime, mode) => {
 
 class VarsRuntime {
   constructor(props) {
-    this.runtime = props?.runtime || 'vm2';
+    this.runtime = props?.runtime || 'quickjs';
     this.mode = props?.mode || 'developer';
   }
 
@@ -35,7 +35,8 @@ class VarsRuntime {
       return;
     }
 
-    const bru = new Bru(envVariables, runtimeVariables, processEnvVars, undefined, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, oauth2CredentialVariables);
+    const promptVariables = request?.promptVariables || {};
+    const bru = new Bru(envVariables, runtimeVariables, processEnvVars, undefined, collectionVariables, folderVariables, requestVariables, globalEnvironmentVariables, oauth2CredentialVariables, undefined, promptVariables);
     const req = new BrunoRequest(request);
     const res = createResponseParser(response);
 
diff --git a/packages/bruno-js/src/sandbox/node-vm/index.js b/packages/bruno-js/src/sandbox/node-vm/index.js
index 990474ac6..aecfd9d8b 100644
--- a/packages/bruno-js/src/sandbox/node-vm/index.js
+++ b/packages/bruno-js/src/sandbox/node-vm/index.js
@@ -3,7 +3,6 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { get } = require('lodash');
 const lodash = require('lodash');
-const { cleanJson } = require('../../utils');
 const { mixinTypedArrays } = require('../mixins/typed-arrays');
 
 class ScriptError extends Error {
@@ -37,6 +36,8 @@ async function runScriptInNodeVm({
   }
 
   try {
+    const allowScriptFilesystemAccess = get(scriptingConfig, 'filesystemAccess.allow', false);
+
     // Create script context with all necessary variables
     const scriptContext = {
       // Bruno context
@@ -58,7 +59,12 @@ async function runScriptInNodeVm({
       clearTimeout: global.clearTimeout,
       clearInterval: global.clearInterval,
       setImmediate: global.setImmediate,
-      clearImmediate: global.clearImmediate
+      clearImmediate: global.clearImmediate,
+      Error: global.Error,
+      TypeError: global.TypeError,
+      ReferenceError: global.ReferenceError,
+      SyntaxError: global.SyntaxError,
+      RangeError: global.RangeError
     };
 
     mixinTypedArrays(scriptContext);
@@ -72,7 +78,8 @@ async function runScriptInNodeVm({
       collectionPath,
       scriptContext,
       currentModuleDir: collectionPath,
-      localModuleCache
+      localModuleCache,
+      allowScriptFilesystemAccess
     });
 
     // Execute the script in an isolated VM context
@@ -91,7 +98,6 @@ async function runScriptInNodeVm({
   return;
 }
 
-
 /**
  * Creates a custom require function with enhanced security and local module support
  * @param {Object} options - Configuration options
@@ -100,6 +106,7 @@ async function runScriptInNodeVm({
  * @param {Object} options.scriptContext - Script execution context
  * @param {string} options.currentModuleDir - Current module directory for relative imports
  * @param {Map} options.localModuleCache - Cache for loaded local modules
+ * @param {boolean} options.allowScriptFilesystemAccess - Whether to allow fs module access
  * @returns {Function} Custom require function
  */
 function createCustomRequire({
@@ -107,7 +114,8 @@ function createCustomRequire({
   collectionPath,
   scriptContext,
   currentModuleDir = collectionPath,
-  localModuleCache = new Map()
+  localModuleCache = new Map(),
+  allowScriptFilesystemAccess = false
 }) {
   const additionalContextRoots = get(scriptingConfig, 'additionalContextRoots', []);
   const additionalContextRootsAbsolute = lodash
@@ -122,17 +130,42 @@ function createCustomRequire({
       return loadLocalModule({ moduleName, collectionPath, scriptContext, localModuleCache, currentModuleDir });
     }
 
+    // Helper function to check if a module is the fs module or a submodule
+    const isFsModule = (module) => {
+      if (!module) return false;
+      const fsModule = require('fs');
+      // Check if it's the fs module itself
+      if (module === fsModule) return true;
+      // Check if it's fs/promises submodule
+      if (module === fsModule.promises) return true;
+      // Check if it's fs/promises by comparing with require('fs/promises')
+      try {
+        if (module === require('fs/promises')) return true;
+      } catch {
+        // fs/promises might not be available in all Node versions
+      }
+      return false;
+    };
+
     // First try to require as a native/npm module
     try {
-      return require(moduleName);
-    } catch {
-      // If that fails, try to resolve from additionalContextRoots
-      try {
-        const modulePath = require.resolve(moduleName, { paths: additionalContextRootsAbsolute });
-        return require(modulePath);
-      } catch (error) {
-        throw new Error(`Could not resolve module "${moduleName}": ${error.message}\n\nThis most likely means you did not install the module under "additionalContextRoots" using a package manager like npm.\n\nThese are your current "additionalContextRoots":\n${additionalContextRootsAbsolute.map(root => `  - ${root}`).join('\n') || '  - No "additionalContextRoots" defined'}`);
+      const requiredModulePath = require.resolve(moduleName, { paths: [...additionalContextRootsAbsolute, ...module.paths] });
+      const requiredModule = require(requiredModulePath);
+
+      // Block filesystem module access if filesystem access is not allowed
+      if (!allowScriptFilesystemAccess && isFsModule(requiredModule)) {
+        throw new Error('Filesystem access is not allowed. Enable "filesystemAccess.allow" in scripting config to use the fs module.');
       }
+
+      return requiredModule;
+    } catch (requireError) {
+      // Re-throw if it's our filesystem access error
+      if (requireError.message && requireError.message.includes('Enable "filesystemAccess.allow"')) {
+        throw requireError;
+      }
+
+      // If that fails, try to resolve from additionalContextRoots
+      throw new Error(`Could not resolve module "${moduleName}": ${requireError.message}\n\nThis most likely means you did not install the module under the collection or the "additionalContextRoots" using a package manager like npm.\n\nThese are your current "additionalContextRoots":\n${additionalContextRootsAbsolute.map((root) => `  - ${root}`).join('\n') || '  - No "additionalContextRoots" defined'}`);
     }
   };
 }
@@ -197,11 +230,12 @@ function loadLocalModule({
     __dirname: moduleDir,
     // Create a custom require function for this module that resolves relative to its directory
     require: createCustomRequire({
-      scriptingConfig: scriptContext.scriptingConfig || {}, 
-      collectionPath, 
-      scriptContext, 
-      currentModuleDir: moduleDir, 
-      localModuleCache
+      scriptingConfig: scriptContext.scriptingConfig || {},
+      collectionPath,
+      scriptContext,
+      currentModuleDir: moduleDir,
+      localModuleCache,
+      allowScriptFilesystemAccess: get(scriptContext.scriptingConfig, 'filesystemAccess.allow', false)
     })
   };
 
diff --git a/packages/bruno-js/src/sandbox/quickjs/index.js b/packages/bruno-js/src/sandbox/quickjs/index.js
index c95381a15..ebe42bb83 100644
--- a/packages/bruno-js/src/sandbox/quickjs/index.js
+++ b/packages/bruno-js/src/sandbox/quickjs/index.js
@@ -24,7 +24,7 @@ const toNumber = (value) => {
 };
 
 const removeQuotes = (str) => {
-  if ((str.startsWith('"') && str.endsWith('"')) || (str.startsWith("'") && str.endsWith("'"))) {
+  if ((str.startsWith('"') && str.endsWith('"')) || (str.startsWith('\'') && str.endsWith('\''))) {
     return str.slice(1, -1);
   }
   return str;
@@ -36,7 +36,7 @@ const executeQuickJsVm = ({ script: externalScript, context: externalContext, sc
   }
   externalScript = externalScript?.trim();
 
-  if(scriptType === 'template-literal') {
+  if (scriptType === 'template-literal') {
     if (!isNaN(Number(externalScript))) {
       const number = Number(externalScript);
 
diff --git a/packages/bruno-js/src/sandbox/quickjs/shims/bru.js b/packages/bruno-js/src/sandbox/quickjs/shims/bru.js
index 4a67a80f8..0029c3b59 100644
--- a/packages/bruno-js/src/sandbox/quickjs/shims/bru.js
+++ b/packages/bruno-js/src/sandbox/quickjs/shims/bru.js
@@ -296,7 +296,7 @@ const addBruShimToContext = (vm, bru) => {
       const promise = vm.newPromise();
       const dumpedUrl = vm.dump(url);
       const dumpedNameOrObj = vm.dump(nameOrCookieObj);
-      
+
       // Check if the second argument is an object (cookie object case)
       if (typeof dumpedNameOrObj === 'object' && dumpedNameOrObj !== null) {
         // Cookie object case: setCookie(url, cookieObject, callback)
@@ -318,7 +318,7 @@ const addBruShimToContext = (vm, bru) => {
           }
         });
       }
-      
+
       promise.settled.then(vm.runtime.executePendingJobs);
       return promise.handle;
     });
@@ -326,7 +326,7 @@ const addBruShimToContext = (vm, bru) => {
 
     const _setCookiesFn = vm.newFunction('_setCookies', (url, cookiesArray) => {
       const promise = vm.newPromise();
-      
+
       nativeJar.setCookies(vm.dump(url), vm.dump(cookiesArray), (err) => {
         if (err) {
           promise.reject(marshallToVm(cleanJson(err), vm));
diff --git a/packages/bruno-js/src/sandbox/quickjs/shims/lib/crypto-utils.js b/packages/bruno-js/src/sandbox/quickjs/shims/lib/crypto-utils.js
index 50933d5fe..3dc8d8b4e 100644
--- a/packages/bruno-js/src/sandbox/quickjs/shims/lib/crypto-utils.js
+++ b/packages/bruno-js/src/sandbox/quickjs/shims/lib/crypto-utils.js
@@ -10,7 +10,7 @@ const addCryptoUtilsShimToContext = async (vm) => {
   let randomBytesHandle = vm.newFunction('randomBytes', function (sizeHandle) {
     try {
       let size = vm.dump(sizeHandle);
-      
+
       if (typeof size !== 'number') {
         throw new TypeError('The "size" argument must be of type number');
       }
@@ -30,15 +30,14 @@ const addCryptoUtilsShimToContext = async (vm) => {
       }
 
       const buffer = crypto.randomBytes(size);
-      
+
       const byteArray = Array.from(buffer);
-      
+
       return marshallToVm(byteArray, vm);
-      
     } catch (error) {
       const vmError = vm.newError(error.message);
       vm.setProp(vmError, 'name', vm.newString(error.name));
-      
+
       throw vmError;
     }
   });
@@ -48,7 +47,7 @@ const addCryptoUtilsShimToContext = async (vm) => {
       // Receive the serialized array data directly
       const serializedArray = vm.dump(arrayHandle);
       const typedArray = deserializeTypedArray(serializedArray);
-      
+
       if (typedArray.length === 0) {
         return marshallToVm([], vm);
       }
@@ -62,11 +61,10 @@ const addCryptoUtilsShimToContext = async (vm) => {
       const byteArray = Array.from(typedArray);
 
       return marshallToVm(byteArray, vm);
-      
     } catch (error) {
       const vmError = vm.newError(error.message);
       vm.setProp(vmError, 'name', vm.newString(error.name));
-      
+
       throw vmError;
     }
   });
@@ -101,4 +99,4 @@ const addCryptoUtilsShimToContext = async (vm) => {
   `);
 };
 
-module.exports = addCryptoUtilsShimToContext;
\ No newline at end of file
+module.exports = addCryptoUtilsShimToContext;
diff --git a/packages/bruno-js/src/sandbox/quickjs/shims/lib/crypto-utils.spec.js b/packages/bruno-js/src/sandbox/quickjs/shims/lib/crypto-utils.spec.js
index 969ef514d..822a60264 100644
--- a/packages/bruno-js/src/sandbox/quickjs/shims/lib/crypto-utils.spec.js
+++ b/packages/bruno-js/src/sandbox/quickjs/shims/lib/crypto-utils.spec.js
@@ -27,7 +27,7 @@ describe('crypto-utils shims tests', () => {
     const handle = vm.unwrapResult(result);
     const type = vm.dump(handle);
     handle.dispose();
-  
+
     expect(type).toBe('function');
   });
 
@@ -36,7 +36,7 @@ describe('crypto-utils shims tests', () => {
     const handle = vm.unwrapResult(result);
     const type = vm.dump(handle);
     handle.dispose();
-    
+
     expect(type).toBe('function');
   });
 
@@ -45,7 +45,7 @@ describe('crypto-utils shims tests', () => {
     const handle = vm.unwrapResult(result);
     const length = vm.dump(handle);
     handle.dispose();
-    
+
     expect(length).toBe(8);
   });
 
@@ -54,7 +54,7 @@ describe('crypto-utils shims tests', () => {
     const handle = vm.unwrapResult(result);
     const hexLength = vm.dump(handle);
     handle.dispose();
-    
+
     expect(hexLength).toBe(8); // 4 bytes = 8 hex chars
   });
 
@@ -67,7 +67,7 @@ describe('crypto-utils shims tests', () => {
     const handle = vm.unwrapResult(result);
     const length = vm.dump(handle);
     handle.dispose();
-    
+
     expect(length).toBe(5);
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-js/src/sandbox/quickjs/shims/lib/utils.js b/packages/bruno-js/src/sandbox/quickjs/shims/lib/utils.js
index 757d14c52..dae5b2c38 100644
--- a/packages/bruno-js/src/sandbox/quickjs/shims/lib/utils.js
+++ b/packages/bruno-js/src/sandbox/quickjs/shims/lib/utils.js
@@ -45,4 +45,4 @@ function deserializeTypedArray(obj) {
 module.exports = {
   serializeTypedArray,
   deserializeTypedArray
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-js/src/utils.js b/packages/bruno-js/src/utils.js
index e5fdddd33..e92ea5653 100644
--- a/packages/bruno-js/src/utils.js
+++ b/packages/bruno-js/src/utils.js
@@ -89,7 +89,7 @@ const evaluateJsTemplateLiteral = (templateLiteral, context) => {
     return templateLiteral.slice(1, -1);
   }
 
-  if (templateLiteral.startsWith("'") && templateLiteral.endsWith("'")) {
+  if (templateLiteral.startsWith('\'') && templateLiteral.endsWith('\'')) {
     return templateLiteral.slice(1, -1);
   }
 
@@ -128,7 +128,7 @@ const createResponseParser = (response = {}) => {
 };
 
 /**
- * Objects that are created inside vm2 execution context result in an serialization error when sent to the renderer process
+ * Objects that are created inside developer mode execution context result in an serialization error when sent to the renderer process
  * Error sending from webFrameMain:  Error: Failed to serialize arguments
  *    at s.send (node:electron/js2c/browser_init:169:631)
  *    at g.send (node:electron/js2c/browser_init:165:2156)
@@ -197,18 +197,18 @@ const cleanCircularJson = (data) => {
   try {
     // Handle circular references by keeping track of seen objects
     const seen = new WeakSet();
-    
+
     const replacer = (key, value) => {
       // Skip non-objects and null
       if (typeof value !== 'object' || value === null) {
         return value;
       }
-      
+
       // Detect circular reference
       if (seen.has(value)) {
         return '[Circular Reference]';
       }
-      
+
       seen.add(value);
       return value;
     };
diff --git a/packages/bruno-js/src/utils/results.js b/packages/bruno-js/src/utils/results.js
index 0ed38638a..d59d81d25 100644
--- a/packages/bruno-js/src/utils/results.js
+++ b/packages/bruno-js/src/utils/results.js
@@ -7,7 +7,7 @@ const getResultsSummary = (results) => {
     total: results.length,
     passed: 0,
     failed: 0,
-    skipped: 0,
+    skipped: 0
   };
 
   results.forEach((r) => {
@@ -34,7 +34,7 @@ const setupBruTestMethods = (bru, __brunoTestResults, assertionResults) => {
     const summary = getResultsSummary(results);
     return {
       summary,
-      results: results.map(r => ({
+      results: results.map((r) => ({
         status: r.status,
         description: r.description,
         expected: r.expected,
@@ -49,7 +49,7 @@ const setupBruTestMethods = (bru, __brunoTestResults, assertionResults) => {
     const summary = getResultsSummary(results);
     return {
       summary,
-      results: results.map(r => ({
+      results: results.map((r) => ({
         status: r.status,
         lhsExpr: r.lhsExpr,
         rhsExpr: r.rhsExpr,
@@ -77,4 +77,4 @@ module.exports = {
   getResultsSummary,
   createBruTestResultMethods,
   setupBruTestMethods
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-js/tests/runtime.spec.js b/packages/bruno-js/tests/runtime.spec.js
index 3e4bbc7a0..352be604f 100644
--- a/packages/bruno-js/tests/runtime.spec.js
+++ b/packages/bruno-js/tests/runtime.spec.js
@@ -37,7 +37,7 @@ describe('runtime', () => {
                 })
             `;
 
-      const runtime = new TestRuntime({ runtime: 'vm2' });
+      const runtime = new TestRuntime({ runtime: 'nodevm' });
       const result = await runtime.runTests(
         testFile,
         { ...baseRequest },
@@ -73,7 +73,7 @@ describe('runtime', () => {
                 })
             `;
 
-      const runtime = new TestRuntime({ runtime: 'vm2' });
+      const runtime = new TestRuntime({ runtime: 'nodevm' });
       const result = await runtime.runTests(
         testFile,
         { ...baseRequest },
@@ -116,7 +116,7 @@ describe('runtime', () => {
                   bru.setVar('validation', validate(new Date().toISOString()))
               `;
 
-        const runtime = new ScriptRuntime({ runtime: 'vm2' });
+        const runtime = new ScriptRuntime({ runtime: 'nodevm' });
         const result = await runtime.runRequestScript(script, { ...baseRequest }, {}, {}, '.', null, process.env);
         expect(result.runtimeVariables.validation).toBeTruthy();
       });
@@ -162,7 +162,7 @@ describe('runtime', () => {
                   bru.setVar('validation', validate(new Date().toISOString()))
               `;
 
-        const runtime = new ScriptRuntime({ runtime: 'vm2' });
+        const runtime = new ScriptRuntime({ runtime: 'nodevm' });
         const result = await runtime.runResponseScript(
           script,
           { ...baseRequest },
@@ -181,42 +181,42 @@ describe('runtime', () => {
   describe('persistent environment variables validation', () => {
     it('should throw error when trying to persist non-string values', async () => {
       const script = `bru.setEnvVar('number', 42, {persist: true});`;
-      const runtime = new ScriptRuntime({ runtime: 'vm2' });
-      
+      const runtime = new ScriptRuntime({ runtime: 'nodevm' });
+
       await expect(runtime.runRequestScript(script, {}, {}, {}, '.', null, process.env))
         .rejects.toThrow('Persistent environment variables must be strings. Received number for key "number".');
     });
 
     it('should throw error when trying to persist boolean values', async () => {
       const script = `bru.setEnvVar('isActive', true, {persist: true});`;
-      const runtime = new ScriptRuntime({ runtime: 'vm2' });
-      
+      const runtime = new ScriptRuntime({ runtime: 'nodevm' });
+
       await expect(runtime.runRequestScript(script, {}, {}, {}, '.', null, process.env))
         .rejects.toThrow('Persistent environment variables must be strings. Received boolean for key "isActive".');
     });
 
     it('should throw error when trying to persist object values', async () => {
       const script = `bru.setEnvVar('config', {port: 3000}, {persist: true});`;
-      const runtime = new ScriptRuntime({ runtime: 'vm2' });
-      
+      const runtime = new ScriptRuntime({ runtime: 'nodevm' });
+
       await expect(runtime.runRequestScript(script, {}, {}, {}, '.', null, process.env))
         .rejects.toThrow('Persistent environment variables must be strings. Received object for key "config".');
     });
 
     it('should throw error when trying to persist array values', async () => {
       const script = `bru.setEnvVar('items', ['item1', 'item2'], {persist: true});`;
-      const runtime = new ScriptRuntime({ runtime: 'vm2' });
-      
+      const runtime = new ScriptRuntime({ runtime: 'nodevm' });
+
       await expect(runtime.runRequestScript(script, {}, {}, {}, '.', null, process.env))
         .rejects.toThrow('Persistent environment variables must be strings. Received object for key "items".');
     });
 
     it('should allow string values when persist is true', async () => {
       const script = `bru.setEnvVar('api_key', 'abc123', {persist: true});`;
-      const runtime = new ScriptRuntime({ runtime: 'vm2' });
-      
+      const runtime = new ScriptRuntime({ runtime: 'nodevm' });
+
       const result = await runtime.runRequestScript(script, {}, {}, {}, '.', null, process.env);
-      
+
       expect(result.envVariables.api_key).toBe('abc123');
     });
 
@@ -227,22 +227,22 @@ describe('runtime', () => {
         bru.setEnvVar('object', {key: 'value'}, {persist: false});
         bru.setEnvVar('array', [1, 2, 3], {persist: false});
       `;
-      const runtime = new ScriptRuntime({ runtime: 'vm2' });
-      
+      const runtime = new ScriptRuntime({ runtime: 'nodevm' });
+
       const result = await runtime.runRequestScript(script, {}, {}, {}, '.', null, process.env);
 
       expect(result.envVariables.number).toBe(42);
       expect(result.envVariables.boolean).toBe(true);
-      expect(result.envVariables.object).toEqual({key: 'value'});
+      expect(result.envVariables.object).toEqual({ key: 'value' });
       expect(result.envVariables.array).toEqual([1, 2, 3]);
     });
 
     it('should allow non-string values when persist is not specified', async () => {
       const script = `bru.setEnvVar('number', 42);`;
-      const runtime = new ScriptRuntime({ runtime: 'vm2' });
-      
+      const runtime = new ScriptRuntime({ runtime: 'nodevm' });
+
       const result = await runtime.runRequestScript(script, {}, {}, {}, '.', null, process.env);
-      
+
       expect(result.envVariables.number).toBe(42);
     });
   });
@@ -251,7 +251,7 @@ describe('runtime', () => {
     it('should not be equal to {{$randomFirstName}}', async () => {
       const script = `bru.setVar('title', '{{$randomFirstName}}')`;
 
-      const runtime = new ScriptRuntime({ runtime: 'vm2' });
+      const runtime = new ScriptRuntime({ runtime: 'nodevm' });
 
       const result = await runtime.runRequestScript(script, {}, {}, {}, '.', null, process.env);
 
diff --git a/packages/bruno-js/tests/utils.spec.js b/packages/bruno-js/tests/utils.spec.js
index b7c6e6022..6d1fa070d 100644
--- a/packages/bruno-js/tests/utils.spec.js
+++ b/packages/bruno-js/tests/utils.spec.js
@@ -76,7 +76,7 @@ describe('utils', () => {
     });
 
     it('should be ok picking extra vars from strings', () => {
-      const expr = "'hello' + ' ' + res.data.pets[0]";
+      const expr = '\'hello\' + \' \' + res.data.pets[0]';
       const result = evaluateJsExpression(expr, context);
       expect(result).toBe('hello bruno');
       // extra var hello is harmless
@@ -125,7 +125,7 @@ describe('utils', () => {
       const expr = 'res["__bruno__functionInnerContext"].toUpperCase()';
       expect(() => evaluateJsExpression(expr, context)).toThrow(SyntaxError);
       expect(() => evaluateJsExpression(expr, context)).toThrow(
-        "Identifier '__bruno__functionInnerContext' has already been declared"
+        'Identifier \'__bruno__functionInnerContext\' has already been declared'
       );
     });
   });
diff --git a/packages/bruno-lang/v1/tests/bru-to-json.spec.js b/packages/bruno-lang/v1/tests/bru-to-json.spec.js
index b2d48d21a..b14d8f411 100644
--- a/packages/bruno-lang/v1/tests/bru-to-json.spec.js
+++ b/packages/bruno-lang/v1/tests/bru-to-json.spec.js
@@ -82,8 +82,8 @@ describe('bruToJson', () => {
             }
           ]
         },
-        script: "const foo='bar';",
-        tests: "bruno.test('200 ok', () => {});"
+        script: 'const foo=\'bar\';',
+        tests: 'bruno.test(\'200 ok\', () => {});'
       }
     });
   });
diff --git a/packages/bruno-lang/v1/tests/json-to-bru.spec.js b/packages/bruno-lang/v1/tests/json-to-bru.spec.js
index 9b2b71356..b432148fa 100644
--- a/packages/bruno-lang/v1/tests/json-to-bru.spec.js
+++ b/packages/bruno-lang/v1/tests/json-to-bru.spec.js
@@ -79,8 +79,8 @@ describe('bruToJson', () => {
             }
           ]
         },
-        script: "const foo='bar';",
-        tests: "bruno.test('200 ok', () => {});"
+        script: 'const foo=\'bar\';',
+        tests: 'bruno.test(\'200 ok\', () => {});'
       }
     };
 
diff --git a/packages/bruno-lang/v2/src/bruToJson.js b/packages/bruno-lang/v2/src/bruToJson.js
index b97d9068c..17c9bf97d 100644
--- a/packages/bruno-lang/v2/src/bruToJson.js
+++ b/packages/bruno-lang/v2/src/bruToJson.js
@@ -233,7 +233,6 @@ const fileExtractContentType = (pair) => {
   }
 };
 
-
 const mapPairListToKeyValPairsMultipart = (pairList = [], parseEnabled = true) => {
   const pairs = mapPairListToKeyValPairs(pairList, parseEnabled);
 
@@ -257,10 +256,10 @@ const mapPairListToKeyValPairsFile = (pairList = [], parseEnabled = true) => {
     fileExtractContentType(pair);
 
     if (pair.value.startsWith('@file(') && pair.value.endsWith(')')) {
-      let filePath = pair.value.replace(/^@file\(/, '').replace(/\)$/, '');      
+      let filePath = pair.value.replace(/^@file\(/, '').replace(/\)$/, '');
       pair.filePath = filePath;
-      pair.selected = pair.enabled
-      
+      pair.selected = pair.enabled;
+
       // Remove pair.value as it only contains the file path reference
       delete pair.value;
       // Remove pair.name as it is auto-generated (e.g., file1, file2, file3, etc.)
@@ -365,7 +364,7 @@ const sem = grammar.createSemantics().addAttribute('ast', {
   },
   quoted_key(disabled, _1, chars, _2) {
     // unquote
-    return (disabled? disabled.sourceString : "") + chars.ast.join("");
+    return (disabled ? disabled.sourceString : '') + chars.ast.join('');
   },
   key(chars) {
     return chars.sourceString ? chars.sourceString.trim() : '';
@@ -404,10 +403,10 @@ const sem = grammar.createSemantics().addAttribute('ast', {
     return chars.sourceString ? chars.sourceString.trim() : '';
   },
   list(_1, _2, _3, listitems, _4, _5, _6, _7) {
-    return listitems.ast.flat()
+    return listitems.ast.flat();
   },
   listitems(listitem, _1, rest) {
-    return [listitem.ast, ...rest.ast]
+    return [listitem.ast, ...rest.ast];
   },
   listitem(_1, textchar, _2) {
     return textchar.sourceString;
@@ -430,7 +429,7 @@ const sem = grammar.createSemantics().addAttribute('ast', {
   tagend(_1, _2) {
     return '';
   },
-  _terminal(){
+  _terminal() {
     return this.sourceString;
   },
   multilinetextblockdelimiter(_) {
@@ -717,7 +716,7 @@ const sem = grammar.createSemantics().addAttribute('ast', {
         }
       }
     };
-  },  
+  },
   authOAuth2(_1, dictionary) {
     const auth = mapPairListToKeyValPairs(dictionary.ast, false);
     const grantTypeKey = _.find(auth, { name: 'grant_type' });
@@ -761,56 +760,56 @@ const sem = grammar.createSemantics().addAttribute('ast', {
                 autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
               }
             : grantTypeKey?.value && grantTypeKey?.value == 'authorization_code'
-            ? {
-                grantType: grantTypeKey ? grantTypeKey.value : '',
-                callbackUrl: callbackUrlKey ? callbackUrlKey.value : '',
-                authorizationUrl: authorizationUrlKey ? authorizationUrlKey.value : '',
-                accessTokenUrl: accessTokenUrlKey ? accessTokenUrlKey.value : '',
-                refreshTokenUrl: refreshTokenUrlKey ? refreshTokenUrlKey.value : '',
-                clientId: clientIdKey ? clientIdKey.value : '',
-                clientSecret: clientSecretKey ? clientSecretKey.value : '',
-                scope: scopeKey ? scopeKey.value : '',
-                state: stateKey ? stateKey.value : '',
-                pkce: pkceKey ? safeParseJson(pkceKey?.value) ?? false : false,
-                credentialsPlacement: credentialsPlacementKey?.value ? credentialsPlacementKey.value : 'body',
-                credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
-                tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
-                tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
-                tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
-                autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
-                autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
-              }
-            : grantTypeKey?.value && grantTypeKey?.value == 'client_credentials'
-            ? {
-                grantType: grantTypeKey ? grantTypeKey.value : '',
-                accessTokenUrl: accessTokenUrlKey ? accessTokenUrlKey.value : '',
-                refreshTokenUrl: refreshTokenUrlKey ? refreshTokenUrlKey.value : '',
-                clientId: clientIdKey ? clientIdKey.value : '',
-                clientSecret: clientSecretKey ? clientSecretKey.value : '',
-                scope: scopeKey ? scopeKey.value : '',
-                credentialsPlacement: credentialsPlacementKey?.value ? credentialsPlacementKey.value : 'body',
-                credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
-                tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
-                tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
-                tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
-                autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
-                autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
-              }
-            : grantTypeKey?.value && grantTypeKey?.value == 'implicit'
-            ? {
-                grantType: grantTypeKey ? grantTypeKey.value : '',
-                callbackUrl: callbackUrlKey ? callbackUrlKey.value : '',
-                authorizationUrl: authorizationUrlKey ? authorizationUrlKey.value : '',
-                clientId: clientIdKey ? clientIdKey.value : '',
-                scope: scopeKey ? scopeKey.value : '',
-                state: stateKey ? stateKey.value : '',
-                credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
-                tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
-                tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
-                tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
-                autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
-              }
-            : {}
+              ? {
+                  grantType: grantTypeKey ? grantTypeKey.value : '',
+                  callbackUrl: callbackUrlKey ? callbackUrlKey.value : '',
+                  authorizationUrl: authorizationUrlKey ? authorizationUrlKey.value : '',
+                  accessTokenUrl: accessTokenUrlKey ? accessTokenUrlKey.value : '',
+                  refreshTokenUrl: refreshTokenUrlKey ? refreshTokenUrlKey.value : '',
+                  clientId: clientIdKey ? clientIdKey.value : '',
+                  clientSecret: clientSecretKey ? clientSecretKey.value : '',
+                  scope: scopeKey ? scopeKey.value : '',
+                  state: stateKey ? stateKey.value : '',
+                  pkce: pkceKey ? safeParseJson(pkceKey?.value) ?? false : false,
+                  credentialsPlacement: credentialsPlacementKey?.value ? credentialsPlacementKey.value : 'body',
+                  credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
+                  tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
+                  tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
+                  tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
+                  autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
+                  autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
+                }
+              : grantTypeKey?.value && grantTypeKey?.value == 'client_credentials'
+                ? {
+                    grantType: grantTypeKey ? grantTypeKey.value : '',
+                    accessTokenUrl: accessTokenUrlKey ? accessTokenUrlKey.value : '',
+                    refreshTokenUrl: refreshTokenUrlKey ? refreshTokenUrlKey.value : '',
+                    clientId: clientIdKey ? clientIdKey.value : '',
+                    clientSecret: clientSecretKey ? clientSecretKey.value : '',
+                    scope: scopeKey ? scopeKey.value : '',
+                    credentialsPlacement: credentialsPlacementKey?.value ? credentialsPlacementKey.value : 'body',
+                    credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
+                    tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
+                    tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
+                    tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
+                    autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
+                    autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
+                  }
+                : grantTypeKey?.value && grantTypeKey?.value == 'implicit'
+                  ? {
+                      grantType: grantTypeKey ? grantTypeKey.value : '',
+                      callbackUrl: callbackUrlKey ? callbackUrlKey.value : '',
+                      authorizationUrl: authorizationUrlKey ? authorizationUrlKey.value : '',
+                      clientId: clientIdKey ? clientIdKey.value : '',
+                      scope: scopeKey ? scopeKey.value : '',
+                      state: stateKey ? stateKey.value : '',
+                      credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
+                      tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
+                      tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
+                      tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
+                      autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true
+                    }
+                  : {}
       }
     };
   },
@@ -1039,26 +1038,10 @@ const sem = grammar.createSemantics().addAttribute('ast', {
     const pairs = mapPairListToKeyValPairs(dictionary.ast, false);
     const namePair = _.find(pairs, { name: 'name' });
     const contentPair = _.find(pairs, { name: 'content' });
-    
+
     const messageName = namePair ? namePair.value : '';
     const messageContent = contentPair ? contentPair.value : '';
-    
-    try {
-      // Validate JSON by parsing (but don't modify the original string)
-      JSON.parse(messageContent);
-    } catch (error) {
-      console.error("Error validating gRPC message JSON:", error);
-      return {
-        body: {
-          mode: 'grpc',
-          grpc: [{
-            name: messageName,
-            content: '{}'
-          }]
-        }
-      };
-    }
-    
+
     return {
       body: {
         mode: 'grpc',
@@ -1108,7 +1091,7 @@ const parser = (input) => {
   const match = grammar.match(input);
 
   if (match.succeeded()) {
-    let ast = sem(match).ast
+    let ast = sem(match).ast;
 
     return ast;
   } else {
diff --git a/packages/bruno-lang/v2/src/collectionBruToJson.js b/packages/bruno-lang/v2/src/collectionBruToJson.js
index f3925ad62..8fe6eced4 100644
--- a/packages/bruno-lang/v2/src/collectionBruToJson.js
+++ b/packages/bruno-lang/v2/src/collectionBruToJson.js
@@ -20,12 +20,22 @@ const grammar = ohm.grammar(`Bru {
   keychar = ~(tagend | st | nl | ":") any
   valuechar = ~(nl | tagend) any
 
+  // Multiline text block surrounded by '''
+  multilinetextblockdelimiter = "'''"
+  multilinetextblock = multilinetextblockdelimiter (~multilinetextblockdelimiter any)* multilinetextblockdelimiter
+
   // Dictionary Blocks
   dictionary = st* "{" pairlist? tagend
   pairlist = optionalnl* pair (~tagend stnl* pair)* (~tagend space)*
-  pair = st* key st* ":" st* value st*
+  pair = st* (quoted_key | key) st* ":" st* value st*
+  disable_char = "~"
+  quote_char = "\\""
+  esc_char = "\\\\"
+  esc_quote_char = esc_char quote_char
+  quoted_key_char = ~(quote_char | esc_quote_char | nl) any
+  quoted_key = disable_char? quote_char (esc_quote_char | quoted_key_char)* quote_char
   key = keychar*
-  value = valuechar*
+  value = multilinetextblock | valuechar*
 
   // Text Blocks
   textblock = textline (~tagend nl textline)*
@@ -137,10 +147,38 @@ const sem = grammar.createSemantics().addAttribute('ast', {
     res[key.ast] = value.ast ? value.ast.trim() : '';
     return res;
   },
+  quoted_key(disabled, _1, chars, _2) {
+    // unquote and handle disabled prefix
+    return (disabled ? disabled.sourceString : '') + chars.ast.join('');
+  },
+  esc_quote_char(_1, quote) {
+    // unescape
+    return quote.sourceString;
+  },
+  quoted_key_char(char) {
+    // return the character itself
+    return char.sourceString;
+  },
   key(chars) {
     return chars.sourceString ? chars.sourceString.trim() : '';
   },
   value(chars) {
+    if (chars.ctorName === 'list') {
+      return chars.ast;
+    }
+    try {
+      let isMultiline = chars.sourceString?.startsWith(`'''`) && chars.sourceString?.endsWith(`'''`);
+      if (isMultiline) {
+        const multilineString = chars.sourceString?.replace(/^'''|'''$/g, '');
+        return multilineString
+          .split('\n')
+          .map((line) => line.slice(4))
+          .join('\n');
+      }
+      return chars.sourceString ? chars.sourceString.trim() : '';
+    } catch (err) {
+      console.error(err);
+    }
     return chars.sourceString ? chars.sourceString.trim() : '';
   },
   textblock(line, _1, rest) {
@@ -152,6 +190,10 @@ const sem = grammar.createSemantics().addAttribute('ast', {
   textchar(char) {
     return char.sourceString;
   },
+  multilinetextblock(_1, content, _2) {
+    // Join all the content between the triple quotes and trim it
+    return content.sourceString.trim();
+  },
   nl(_1, _2) {
     return '';
   },
@@ -324,56 +366,56 @@ const sem = grammar.createSemantics().addAttribute('ast', {
                 autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
               }
             : grantTypeKey?.value && grantTypeKey?.value == 'authorization_code'
-            ? {
-                grantType: grantTypeKey ? grantTypeKey.value : '',
-                callbackUrl: callbackUrlKey ? callbackUrlKey.value : '',
-                authorizationUrl: authorizationUrlKey ? authorizationUrlKey.value : '',
-                accessTokenUrl: accessTokenUrlKey ? accessTokenUrlKey.value : '',
-                refreshTokenUrl: refreshTokenUrlKey ? refreshTokenUrlKey.value : '',
-                clientId: clientIdKey ? clientIdKey.value : '',
-                clientSecret: clientSecretKey ? clientSecretKey.value : '',
-                scope: scopeKey ? scopeKey.value : '',
-                state: stateKey ? stateKey.value : '',
-                pkce: pkceKey ? safeParseJson(pkceKey?.value) ?? false : false,
-                credentialsPlacement: credentialsPlacementKey?.value ? credentialsPlacementKey.value : 'body',
-                credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
-                tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
-                tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
-                tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
-                autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
-                autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
-              }
-            : grantTypeKey?.value && grantTypeKey?.value == 'implicit'
-            ? {
-                grantType: grantTypeKey ? grantTypeKey.value : '',
-                callbackUrl: callbackUrlKey ? callbackUrlKey.value : '',
-                authorizationUrl: authorizationUrlKey ? authorizationUrlKey.value : '',
-                clientId: clientIdKey ? clientIdKey.value : '',
-                scope: scopeKey ? scopeKey.value : '',
-                state: stateKey ? stateKey.value : '',
-                credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
-                tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
-                tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
-                tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
-                autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
-              }
-            : grantTypeKey?.value && grantTypeKey?.value == 'client_credentials'
-            ? {
-                grantType: grantTypeKey ? grantTypeKey.value : '',
-                accessTokenUrl: accessTokenUrlKey ? accessTokenUrlKey.value : '',
-                refreshTokenUrl: refreshTokenUrlKey ? refreshTokenUrlKey.value : '',
-                clientId: clientIdKey ? clientIdKey.value : '',
-                clientSecret: clientSecretKey ? clientSecretKey.value : '',
-                scope: scopeKey ? scopeKey.value : '',
-                credentialsPlacement: credentialsPlacementKey?.value ? credentialsPlacementKey.value : 'body',
-                credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
-                tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
-                tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
-                tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
-                autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
-                autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
-              }
-            : {}
+              ? {
+                  grantType: grantTypeKey ? grantTypeKey.value : '',
+                  callbackUrl: callbackUrlKey ? callbackUrlKey.value : '',
+                  authorizationUrl: authorizationUrlKey ? authorizationUrlKey.value : '',
+                  accessTokenUrl: accessTokenUrlKey ? accessTokenUrlKey.value : '',
+                  refreshTokenUrl: refreshTokenUrlKey ? refreshTokenUrlKey.value : '',
+                  clientId: clientIdKey ? clientIdKey.value : '',
+                  clientSecret: clientSecretKey ? clientSecretKey.value : '',
+                  scope: scopeKey ? scopeKey.value : '',
+                  state: stateKey ? stateKey.value : '',
+                  pkce: pkceKey ? safeParseJson(pkceKey?.value) ?? false : false,
+                  credentialsPlacement: credentialsPlacementKey?.value ? credentialsPlacementKey.value : 'body',
+                  credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
+                  tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
+                  tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
+                  tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
+                  autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
+                  autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
+                }
+              : grantTypeKey?.value && grantTypeKey?.value == 'implicit'
+                ? {
+                    grantType: grantTypeKey ? grantTypeKey.value : '',
+                    callbackUrl: callbackUrlKey ? callbackUrlKey.value : '',
+                    authorizationUrl: authorizationUrlKey ? authorizationUrlKey.value : '',
+                    clientId: clientIdKey ? clientIdKey.value : '',
+                    scope: scopeKey ? scopeKey.value : '',
+                    state: stateKey ? stateKey.value : '',
+                    credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
+                    tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
+                    tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
+                    tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
+                    autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true
+                  }
+                : grantTypeKey?.value && grantTypeKey?.value == 'client_credentials'
+                  ? {
+                      grantType: grantTypeKey ? grantTypeKey.value : '',
+                      accessTokenUrl: accessTokenUrlKey ? accessTokenUrlKey.value : '',
+                      refreshTokenUrl: refreshTokenUrlKey ? refreshTokenUrlKey.value : '',
+                      clientId: clientIdKey ? clientIdKey.value : '',
+                      clientSecret: clientSecretKey ? clientSecretKey.value : '',
+                      scope: scopeKey ? scopeKey.value : '',
+                      credentialsPlacement: credentialsPlacementKey?.value ? credentialsPlacementKey.value : 'body',
+                      credentialsId: credentialsIdKey?.value ? credentialsIdKey.value : 'credentials',
+                      tokenPlacement: tokenPlacementKey?.value ? tokenPlacementKey.value : 'header',
+                      tokenHeaderPrefix: tokenHeaderPrefixKey?.value ? tokenHeaderPrefixKey.value : '',
+                      tokenQueryKey: tokenQueryKeyKey?.value ? tokenQueryKeyKey.value : 'access_token',
+                      autoFetchToken: autoFetchTokenKey ? safeParseJson(autoFetchTokenKey?.value) ?? true : true,
+                      autoRefreshToken: autoRefreshTokenKey ? safeParseJson(autoRefreshTokenKey?.value) ?? false : false
+                    }
+                  : {}
       }
     };
   },
@@ -430,8 +472,8 @@ const sem = grammar.createSemantics().addAttribute('ast', {
           password
         }
       }
-    }
-  }, 
+    };
+  },
   authapikey(_1, dictionary) {
     const auth = mapPairListToKeyValPairs(dictionary.ast, false);
 
diff --git a/packages/bruno-lang/v2/src/jsonToBru.js b/packages/bruno-lang/v2/src/jsonToBru.js
index 9258be11b..420ca90d7 100644
--- a/packages/bruno-lang/v2/src/jsonToBru.js
+++ b/packages/bruno-lang/v2/src/jsonToBru.js
@@ -1,14 +1,10 @@
 const _ = require('lodash');
 
-const { indentString, getValueString } = require('./utils');
+const { indentString, getValueString, getKeyString, getValueUrl } = require('./utils');
 const jsonToExampleBru = require('./example/jsonToBru');
 
-const enabled = (items = [], key = "enabled") => items.filter((item) => item[key]);
-const disabled = (items = [], key = "enabled") => items.filter((item) => !item[key]);
-const quoteKey = (key) => {
-  const quotableChars = [':', '"', '{', '}', ' '];
-  return quotableChars.some(char => key.includes(char)) ? ('"' + key.replaceAll('"', '\\"') + '"') : key;
-}
+const enabled = (items = [], key = 'enabled') => items.filter((item) => item[key]);
+const disabled = (items = [], key = 'enabled') => items.filter((item) => !item[key]);
 
 // remove the last line if two new lines are found
 const stripLastLine = (text) => {
@@ -50,7 +46,7 @@ const jsonToBru = (json) => {
     const isStandard = standardMethods.has(method);
 
     bru += isStandard ? `${method} {` : `http {\n  method: ${method}`;
-    bru += `\n  url: ${url}`;
+    bru += `\n  url: ${getValueUrl(url)}`;
 
     if (body?.length) {
       bru += `\n  body: ${body}`;
@@ -63,21 +59,21 @@ const jsonToBru = (json) => {
     bru += `\n}\n\n`;
   }
 
-  if(grpc && grpc.url) {
-      bru += `grpc {
+  if (grpc && grpc.url) {
+    bru += `grpc {
   url: ${grpc.url}`;
 
-    if(grpc.method && grpc.method.length) {
+    if (grpc.method && grpc.method.length) {
       bru += `
   method: ${grpc.method}`;
     }
 
-    if(grpc.body && grpc.body.length) {
+    if (grpc.body && grpc.body.length) {
       bru += `
   body: ${grpc.body}`;
     }
 
-    if(grpc.protoPath && grpc.protoPath.length) {
+    if (grpc.protoPath && grpc.protoPath.length) {
       bru += `
   protoPath: ${grpc.protoPath}`;
     }
@@ -123,7 +119,6 @@ const jsonToBru = (json) => {
 `;
   }
 
-
   if (params && params.length) {
     const queryParams = params.filter((param) => param.type === 'query');
     const pathParams = params.filter((param) => param.type === 'path');
@@ -133,7 +128,7 @@ const jsonToBru = (json) => {
       if (enabled(queryParams).length) {
         bru += `\n${indentString(
           enabled(queryParams)
-            .map((item) => `${quoteKey(item.name)}: ${item.value}`)
+            .map((item) => `${getKeyString(item.name)}: ${getValueString(item.value)}`)
             .join('\n')
         )}`;
       }
@@ -141,7 +136,7 @@ const jsonToBru = (json) => {
       if (disabled(queryParams).length) {
         bru += `\n${indentString(
           disabled(queryParams)
-            .map((item) => `~${quoteKey(item.name)}: ${item.value}`)
+            .map((item) => `~${getKeyString(item.name)}: ${getValueString(item.value)}`)
             .join('\n')
         )}`;
       }
@@ -152,7 +147,7 @@ const jsonToBru = (json) => {
     if (pathParams.length) {
       bru += 'params:path {';
 
-      bru += `\n${indentString(pathParams.map((item) => `${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(pathParams.map((item) => `${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
 
       bru += '\n}\n\n';
     }
@@ -163,7 +158,7 @@ const jsonToBru = (json) => {
     if (enabled(headers).length) {
       bru += `\n${indentString(
         enabled(headers)
-          .map((item) => `${quoteKey(item.name)}: ${item.value}`)
+          .map((item) => `${getKeyString(item.name)}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -171,7 +166,7 @@ const jsonToBru = (json) => {
     if (disabled(headers).length) {
       bru += `\n${indentString(
         disabled(headers)
-          .map((item) => `~${quoteKey(item.name)}: ${item.value}`)
+          .map((item) => `~${getKeyString(item.name)}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -184,7 +179,7 @@ const jsonToBru = (json) => {
     if (enabled(metadata).length) {
       bru += `\n${indentString(
         enabled(metadata)
-          .map((item) => `${item.name}: ${item.value}`)
+          .map((item) => `${item.name}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -192,7 +187,7 @@ const jsonToBru = (json) => {
     if (disabled(metadata).length) {
       bru += `\n${indentString(
         disabled(metadata)
-          .map((item) => `~${item.name}: ${item.value}`)
+          .map((item) => `~${item.name}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -248,7 +243,6 @@ ${indentString(`password: ${auth?.digest?.password || ''}`)}
 `;
   }
 
-
   if (auth && auth.ntlm) {
     bru += `auth:ntlm {
 ${indentString(`username: ${auth?.ntlm?.username || ''}`)}
@@ -354,106 +348,106 @@ ${indentString(`auto_fetch_token: ${(auth?.oauth2?.autoFetchToken ?? true).toStr
 
     if (auth?.oauth2?.additionalParameters) {
       const { authorization: authorizationParams, token: tokenParams, refresh: refreshParams } = auth?.oauth2?.additionalParameters;
-      const authorizationHeaders = authorizationParams?.filter(p => p?.sendIn == 'headers');
+      const authorizationHeaders = authorizationParams?.filter((p) => p?.sendIn == 'headers');
       if (authorizationHeaders?.length) {
         bru += `auth:oauth2:additional_params:auth_req:headers {
 ${indentString(
   authorizationHeaders
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const authorizationQueryParams = authorizationParams?.filter(p => p?.sendIn == 'queryparams');
+      const authorizationQueryParams = authorizationParams?.filter((p) => p?.sendIn == 'queryparams');
       if (authorizationQueryParams?.length) {
         bru += `auth:oauth2:additional_params:auth_req:queryparams {
 ${indentString(
   authorizationQueryParams
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const tokenHeaders = tokenParams?.filter(p => p?.sendIn == 'headers');
+      const tokenHeaders = tokenParams?.filter((p) => p?.sendIn == 'headers');
       if (tokenHeaders?.length) {
         bru += `auth:oauth2:additional_params:access_token_req:headers {
 ${indentString(
   tokenHeaders
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const tokenQueryParams = tokenParams?.filter(p => p?.sendIn == 'queryparams');
+      const tokenQueryParams = tokenParams?.filter((p) => p?.sendIn == 'queryparams');
       if (tokenQueryParams?.length) {
         bru += `auth:oauth2:additional_params:access_token_req:queryparams {
 ${indentString(
   tokenQueryParams
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const tokenBodyValues = tokenParams?.filter(p => p?.sendIn == 'body');
+      const tokenBodyValues = tokenParams?.filter((p) => p?.sendIn == 'body');
       if (tokenBodyValues?.length) {
         bru += `auth:oauth2:additional_params:access_token_req:body {
 ${indentString(
   tokenBodyValues
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const refreshHeaders = refreshParams?.filter(p => p?.sendIn == 'headers');
+      const refreshHeaders = refreshParams?.filter((p) => p?.sendIn == 'headers');
       if (refreshHeaders?.length) {
         bru += `auth:oauth2:additional_params:refresh_token_req:headers {
 ${indentString(
   refreshHeaders
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const refreshQueryParams = refreshParams?.filter(p => p?.sendIn == 'queryparams');
+      const refreshQueryParams = refreshParams?.filter((p) => p?.sendIn == 'queryparams');
       if (refreshQueryParams?.length) {
         bru += `auth:oauth2:additional_params:refresh_token_req:queryparams {
 ${indentString(
   refreshQueryParams
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const refreshBodyValues = refreshParams?.filter(p => p?.sendIn == 'body');
+      const refreshBodyValues = refreshParams?.filter((p) => p?.sendIn == 'body');
       if (refreshBodyValues?.length) {
         bru += `auth:oauth2:additional_params:refresh_token_req:body {
 ${indentString(
   refreshBodyValues
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
@@ -508,14 +502,14 @@ ${indentString(body.sparql)}
 
     if (enabled(body.formUrlEncoded).length) {
       const enabledValues = enabled(body.formUrlEncoded)
-        .map((item) => `${quoteKey(item.name)}: ${getValueString(item.value)}`)
+        .map((item) => `${getKeyString(item.name)}: ${getValueString(item.value)}`)
         .join('\n');
       bru += `${indentString(enabledValues)}\n`;
     }
 
     if (disabled(body.formUrlEncoded).length) {
       const disabledValues = disabled(body.formUrlEncoded)
-        .map((item) => `~${quoteKey(item.name)}: ${getValueString(item.value)}`)
+        .map((item) => `~${getKeyString(item.name)}: ${getValueString(item.value)}`)
         .join('\n');
       bru += `${indentString(disabledValues)}\n`;
     }
@@ -532,11 +526,11 @@ ${indentString(body.sparql)}
         multipartForms
           .map((item) => {
             const enabled = item.enabled ? '' : '~';
-            const contentType =
-              item.contentType && item.contentType !== '' ? ' @contentType(' + item.contentType + ')' : '';
+            const contentType
+              = item.contentType && item.contentType !== '' ? ' @contentType(' + item.contentType + ')' : '';
 
             if (item.type === 'text') {
-              return `${enabled}${quoteKey(item.name)}: ${getValueString(item.value)}${contentType}`;
+              return `${enabled}${getKeyString(item.name)}: ${getValueString(item.value)}${contentType}`;
             }
 
             if (item.type === 'file') {
@@ -544,7 +538,7 @@ ${indentString(body.sparql)}
               const filestr = filepaths.join('|');
 
               const value = `@file(${filestr})`;
-              return `${enabled}${quoteKey(item.name)}: ${value}${contentType}`;
+              return `${enabled}${getKeyString(item.name)}: ${value}${contentType}`;
             }
           })
           .join('\n')
@@ -554,21 +548,20 @@ ${indentString(body.sparql)}
     bru += '\n}\n\n';
   }
 
-
   if (body && body.file && body.file.length) {
     bru += `body:file {`;
-    const files = enabled(body.file, "selected").concat(disabled(body.file, "selected"));
+    const files = enabled(body.file, 'selected').concat(disabled(body.file, 'selected'));
 
     if (files.length) {
       bru += `\n${indentString(
         files
           .map((item) => {
             const selected = item.selected ? '' : '~';
-            const contentType =
-              item.contentType && item.contentType !== '' ? ' @contentType(' + item.contentType + ')' : '';
+            const contentType
+              = item.contentType && item.contentType !== '' ? ' @contentType(' + item.contentType + ')' : '';
             const filePath = item.filePath || '';
             const value = `@file(${filePath})`;
-            const itemName = "file";
+            const itemName = 'file';
             return `${selected}${itemName}: ${value}${contentType}`;
           })
           .join('\n')
@@ -594,15 +587,15 @@ ${indentString(body.sparql)}
     // Convert each gRPC message to a separate body:grpc block
     if (Array.isArray(body.grpc)) {
       body.grpc.forEach((m) => {
-        const {name, content} = m;
-        
+        const { name, content } = m;
+
         bru += `body:grpc {\n`;
-        
+
         bru += `${indentString(`name: ${getValueString(name)}`)}\n`;
-        
+
         // Convert content to JSON string if it's an object
         let jsonValue = typeof content === 'object' ? JSON.stringify(content, null, 2) : content || '{}';
-        
+
         // Wrap content with triple quotes for multiline support, without extra indentation
         bru += `${indentString(`content: '''\n${indentString(jsonValue)}\n'''`)}\n`;
         bru += '}\n\n';
@@ -644,19 +637,19 @@ ${indentString(body.sparql)}
     bru += `vars:pre-request {`;
 
     if (varsEnabled.length) {
-      bru += `\n${indentString(varsEnabled.map((item) => `${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsEnabled.map((item) => `${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsLocalEnabled.length) {
-      bru += `\n${indentString(varsLocalEnabled.map((item) => `@${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsLocalEnabled.map((item) => `@${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsDisabled.length) {
-      bru += `\n${indentString(varsDisabled.map((item) => `~${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsDisabled.map((item) => `~${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsLocalDisabled.length) {
-      bru += `\n${indentString(varsLocalDisabled.map((item) => `~@${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsLocalDisabled.map((item) => `~@${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     bru += '\n}\n\n';
@@ -670,19 +663,19 @@ ${indentString(body.sparql)}
     bru += `vars:post-response {`;
 
     if (varsEnabled.length) {
-      bru += `\n${indentString(varsEnabled.map((item) => `${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsEnabled.map((item) => `${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsLocalEnabled.length) {
-      bru += `\n${indentString(varsLocalEnabled.map((item) => `@${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsLocalEnabled.map((item) => `@${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsDisabled.length) {
-      bru += `\n${indentString(varsDisabled.map((item) => `~${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsDisabled.map((item) => `~${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsLocalDisabled.length) {
-      bru += `\n${indentString(varsLocalDisabled.map((item) => `~@${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsLocalDisabled.map((item) => `~@${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     bru += '\n}\n\n';
@@ -694,7 +687,7 @@ ${indentString(body.sparql)}
     if (enabled(assertions).length) {
       bru += `\n${indentString(
         enabled(assertions)
-          .map((item) => `${item.name}: ${item.value}`)
+          .map((item) => `${item.name}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -702,7 +695,7 @@ ${indentString(body.sparql)}
     if (disabled(assertions).length) {
       bru += `\n${indentString(
         disabled(assertions)
-          .map((item) => `~${item.name}: ${item.value}`)
+          .map((item) => `~${getKeyString(item.name)}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
diff --git a/packages/bruno-lang/v2/src/jsonToCollectionBru.js b/packages/bruno-lang/v2/src/jsonToCollectionBru.js
index d5aa1c1e0..cc5428996 100644
--- a/packages/bruno-lang/v2/src/jsonToCollectionBru.js
+++ b/packages/bruno-lang/v2/src/jsonToCollectionBru.js
@@ -1,6 +1,6 @@
 const _ = require('lodash');
 
-const { indentString } = require('./utils');
+const { indentString, getValueString, getKeyString } = require('./utils');
 
 const enabled = (items = []) => items.filter((item) => item.enabled);
 const disabled = (items = []) => items.filter((item) => !item.enabled);
@@ -30,7 +30,7 @@ const jsonToCollectionBru = (json) => {
     if (enabled(query).length) {
       bru += `\n${indentString(
         enabled(query)
-          .map((item) => `${item.name}: ${item.value}`)
+          .map((item) => `${getKeyString(item.name)}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -38,7 +38,7 @@ const jsonToCollectionBru = (json) => {
     if (disabled(query).length) {
       bru += `\n${indentString(
         disabled(query)
-          .map((item) => `~${item.name}: ${item.value}`)
+          .map((item) => `~${getKeyString(item.name)}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -51,7 +51,7 @@ const jsonToCollectionBru = (json) => {
     if (enabled(headers).length) {
       bru += `\n${indentString(
         enabled(headers)
-          .map((item) => `${item.name}: ${item.value}`)
+          .map((item) => `${getKeyString(item.name)}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -59,7 +59,7 @@ const jsonToCollectionBru = (json) => {
     if (disabled(headers).length) {
       bru += `\n${indentString(
         disabled(headers)
-          .map((item) => `~${item.name}: ${item.value}`)
+          .map((item) => `~${getKeyString(item.name)}: ${getValueString(item.value)}`)
           .join('\n')
       )}`;
     }
@@ -122,9 +122,9 @@ ${indentString(`password: ${auth.digest.password}`)}
 
 `;
   }
- 
-if (auth && auth.ntlm) {
-  bru += `auth:ntlm {
+
+  if (auth && auth.ntlm) {
+    bru += `auth:ntlm {
 ${indentString(`username: ${auth.ntlm.username}`)}
 ${indentString(`password: ${auth.ntlm.password}`)}
 ${indentString(`domain: ${auth.ntlm.domain}`)}
@@ -237,106 +237,105 @@ ${indentString(`auto_refresh_token: ${(auth?.oauth2?.autoRefreshToken ?? false).
 
     if (auth?.oauth2?.additionalParameters) {
       const { authorization: authorizationParams, token: tokenParams, refresh: refreshParams } = auth?.oauth2?.additionalParameters;
-      const authorizationHeaders = authorizationParams?.filter(p => p?.sendIn == 'headers');
+      const authorizationHeaders = authorizationParams?.filter((p) => p?.sendIn == 'headers');
       if (authorizationHeaders?.length) {
         bru += `auth:oauth2:additional_params:auth_req:headers {
 ${indentString(
   authorizationHeaders
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const authorizationQueryParams = authorizationParams?.filter(p => p?.sendIn == 'queryparams');
+      const authorizationQueryParams = authorizationParams?.filter((p) => p?.sendIn == 'queryparams');
       if (authorizationQueryParams?.length) {
         bru += `auth:oauth2:additional_params:auth_req:queryparams {
 ${indentString(
   authorizationQueryParams
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const tokenHeaders = tokenParams?.filter(p => p?.sendIn == 'headers');
+      const tokenHeaders = tokenParams?.filter((p) => p?.sendIn == 'headers');
       if (tokenHeaders?.length) {
         bru += `auth:oauth2:additional_params:access_token_req:headers {
 ${indentString(
   tokenHeaders
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const tokenQueryParams = tokenParams?.filter(p => p?.sendIn == 'queryparams');
+      const tokenQueryParams = tokenParams?.filter((p) => p?.sendIn == 'queryparams');
       if (tokenQueryParams?.length) {
         bru += `auth:oauth2:additional_params:access_token_req:queryparams {
 ${indentString(
   tokenQueryParams
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
-    .join('\n')
-  )}
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
+    .join('\n'))}
 }
 
 `;
       }
-      const tokenBodyValues = tokenParams?.filter(p => p?.sendIn == 'body');
+      const tokenBodyValues = tokenParams?.filter((p) => p?.sendIn == 'body');
       if (tokenBodyValues?.length) {
         bru += `auth:oauth2:additional_params:access_token_req:body {
 ${indentString(
   tokenBodyValues
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const refreshHeaders = refreshParams?.filter(p => p?.sendIn == 'headers');
+      const refreshHeaders = refreshParams?.filter((p) => p?.sendIn == 'headers');
       if (refreshHeaders?.length) {
         bru += `auth:oauth2:additional_params:refresh_token_req:headers {
 ${indentString(
   refreshHeaders
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const refreshQueryParams = refreshParams?.filter(p => p?.sendIn == 'queryparams');
+      const refreshQueryParams = refreshParams?.filter((p) => p?.sendIn == 'queryparams');
       if (refreshQueryParams?.length) {
         bru += `auth:oauth2:additional_params:refresh_token_req:queryparams {
 ${indentString(
   refreshQueryParams
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
       }
-      const refreshBodyValues = refreshParams?.filter(p => p?.sendIn == 'body');
+      const refreshBodyValues = refreshParams?.filter((p) => p?.sendIn == 'body');
       if (refreshBodyValues?.length) {
         bru += `auth:oauth2:additional_params:refresh_token_req:body {
 ${indentString(
   refreshBodyValues
-    .filter(item => item?.name?.length)
-    .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`)
+    .filter((item) => item?.name?.length)
+    .map((item) => `${item.enabled ? '' : '~'}${getKeyString(item.name)}: ${getValueString(item.value)}`)
     .join('\n')
-  )}
+)}
 }
 
 `;
@@ -355,19 +354,19 @@ ${indentString(
     bru += `vars:pre-request {`;
 
     if (varsEnabled.length) {
-      bru += `\n${indentString(varsEnabled.map((item) => `${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsEnabled.map((item) => `${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsLocalEnabled.length) {
-      bru += `\n${indentString(varsLocalEnabled.map((item) => `@${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsLocalEnabled.map((item) => `@${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsDisabled.length) {
-      bru += `\n${indentString(varsDisabled.map((item) => `~${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsDisabled.map((item) => `~${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsLocalDisabled.length) {
-      bru += `\n${indentString(varsLocalDisabled.map((item) => `~@${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsLocalDisabled.map((item) => `~@${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     bru += '\n}\n\n';
@@ -381,19 +380,19 @@ ${indentString(
     bru += `vars:post-response {`;
 
     if (varsEnabled.length) {
-      bru += `\n${indentString(varsEnabled.map((item) => `${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsEnabled.map((item) => `${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsLocalEnabled.length) {
-      bru += `\n${indentString(varsLocalEnabled.map((item) => `@${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsLocalEnabled.map((item) => `@${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsDisabled.length) {
-      bru += `\n${indentString(varsDisabled.map((item) => `~${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsDisabled.map((item) => `~${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     if (varsLocalDisabled.length) {
-      bru += `\n${indentString(varsLocalDisabled.map((item) => `~@${item.name}: ${item.value}`).join('\n'))}`;
+      bru += `\n${indentString(varsLocalDisabled.map((item) => `~@${item.name}: ${getValueString(item.value)}`).join('\n'))}`;
     }
 
     bru += '\n}\n\n';
diff --git a/packages/bruno-lang/v2/src/utils.js b/packages/bruno-lang/v2/src/utils.js
index 8dee48999..cff670015 100644
--- a/packages/bruno-lang/v2/src/utils.js
+++ b/packages/bruno-lang/v2/src/utils.js
@@ -7,15 +7,15 @@ const safeParseJson = (json) => {
   }
 };
 
-
-const indentString = (str) => {
+const indentString = (str, levels = 1) => {
   if (!str || !str.length) {
     return str || '';
   }
 
+  const indent = '  '.repeat(levels);
   return str
     .split(/\r\n|\r|\n/)
-    .map((line) => '  ' + line)
+    .map((line) => indent + line)
     .join('\n');
 };
 
@@ -37,7 +37,7 @@ const getValueString = (value) => {
     return '';
   }
 
-  const hasNewLines = value?.includes('\n') || value?.includes('\r');
+  const hasNewLines = value.includes('\n') || value.includes('\r');
 
   if (!hasNewLines) {
     return value;
@@ -47,9 +47,32 @@ const getValueString = (value) => {
   return `'''\n${indentString(value)}\n'''`;
 };
 
+const getKeyString = (key) => {
+  const quotableChars = [':', '"', '{', '}', ' '];
+  return quotableChars.some((char) => key.includes(char)) ? ('"' + key.replaceAll('"', '\\"') + '"') : key;
+};
+
+const getValueUrl = (url) => {
+  // Handle null, undefined, and empty strings
+  if (!url) {
+    return '';
+  }
+
+  const hasNewLines = url.includes('\n') || url.includes('\r');
+
+  if (!hasNewLines) {
+    return url;
+  }
+
+  // Wrap multiline values in triple quotes with 4-space indentation (2 levels)
+  return `'''\n${indentString(url, 2)}\n'''`;
+};
+
 module.exports = {
   safeParseJson,
   indentString,
   outdentString,
-  getValueString
+  getValueString,
+  getKeyString,
+  getValueUrl
 };
diff --git a/packages/bruno-lang/v2/tests/bruToJson.spec.js b/packages/bruno-lang/v2/tests/bruToJson.spec.js
index aa94ccef1..718ce6e1b 100644
--- a/packages/bruno-lang/v2/tests/bruToJson.spec.js
+++ b/packages/bruno-lang/v2/tests/bruToJson.spec.js
@@ -38,4 +38,142 @@ settings {
       expect(output).toEqual(expected);
     });
   });
+
+  describe('body:grpc', () => {
+    it('parses message content with name and content', () => {
+      const input = `
+body:grpc {
+    name: message 1
+    content: '''
+      {"foo":"bar"}
+    ''' 
+}
+`;
+
+      const expected = {
+        body: {
+          mode: 'grpc',
+          grpc: [
+            {
+              content: '{"foo":"bar"}',
+              name: 'message 1'
+            }
+          ]
+        }
+      };
+
+      const output = parser(input);
+      expect(output).toEqual(expected);
+    });
+
+    it('parses message with variables in content', () => {
+      const input = `
+body:grpc {
+    name: message 1
+    content: '''
+      {"id":{{userId}},"name":"{{userName}}"}
+    ''' 
+}
+`;
+
+      const expected = {
+        body: {
+          mode: 'grpc',
+          grpc: [
+            {
+              content: '{"id":{{userId}},"name":"{{userName}}"}',
+              name: 'message 1'
+            }
+          ]
+        }
+      };
+
+      const output = parser(input);
+      expect(output).toEqual(expected);
+    });
+  });
+
+  describe('multi-line values', () => {
+    it('parses multi-line values in URL, headers, params, and vars', () => {
+      const input = `
+meta {
+  name: new-line
+  type: http
+  seq: 1
+}
+
+get {
+  url: '''
+    https://httpbin.io/anything?foo=hello
+    world
+'''
+  body: none
+  auth: oauth2
+}
+
+params:query {
+  foo: '''
+    hello
+    world
+  '''
+}
+
+headers {
+  "test header": '''
+    t1
+    t2
+  '''
+}
+
+vars:pre-request {
+  test-var: '''
+    t1
+    t2
+  '''
+}
+`;
+
+      const expected = {
+        meta: {
+          name: 'new-line',
+          type: 'http',
+          seq: '1'
+        },
+        http: {
+          method: 'get',
+          url: 'https://httpbin.io/anything?foo=hello\nworld',
+          body: 'none',
+          auth: 'oauth2'
+        },
+        params: [
+          {
+            name: 'foo',
+            value: 'hello\nworld',
+            enabled: true,
+            type: 'query'
+          }
+        ],
+        headers: [
+          {
+            name: 'test header',
+            value: 't1\nt2',
+            enabled: true
+          }
+        ],
+        vars: {
+          req: [
+            {
+              name: 'test-var',
+              value: 't1\nt2',
+              enabled: true,
+              local: false
+            }
+          ]
+        }
+      };
+
+      const output = parser(input);
+      expect(output).toEqual(expected);
+    });
+  });
 });
diff --git a/packages/bruno-lang/v2/tests/getKeyString.spec.js b/packages/bruno-lang/v2/tests/getKeyString.spec.js
new file mode 100644
index 000000000..278a4226a
--- /dev/null
+++ b/packages/bruno-lang/v2/tests/getKeyString.spec.js
@@ -0,0 +1,56 @@
+const { getKeyString } = require('../src/utils');
+
+describe('getKeyString', () => {
+  describe('should not quote keys without special characters', () => {
+    it('should return simple alphanumeric keys as-is', () => {
+      expect(getKeyString('hello')).toBe('hello');
+      expect(getKeyString('world123')).toBe('world123');
+      expect(getKeyString('API')).toBe('API');
+    });
+
+    it('should return keys with hyphens as-is', () => {
+      expect(getKeyString('api-key')).toBe('api-key');
+      expect(getKeyString('content-type')).toBe('content-type');
+    });
+
+    it('should return keys with underscores as-is', () => {
+      expect(getKeyString('api_key')).toBe('api_key');
+      expect(getKeyString('user_name')).toBe('user_name');
+    });
+  });
+
+  describe('should quote keys with special characters', () => {
+    it('should quote keys with colons', () => {
+      expect(getKeyString('key:value')).toBe('"key:value"');
+      expect(getKeyString('disabled:colon:header')).toBe('"disabled:colon:header"');
+      expect(getKeyString(':startsWithColon')).toBe('":startsWithColon"');
+      expect(getKeyString('endsWithColon:')).toBe('"endsWithColon:"');
+    });
+
+    it('should quote keys with spaces', () => {
+      expect(getKeyString('key with spaces')).toBe('"key with spaces"');
+      expect(getKeyString(' leadingSpace')).toBe('" leadingSpace"');
+      expect(getKeyString('trailingSpace ')).toBe('"trailingSpace "');
+      expect(getKeyString('multiple   spaces')).toBe('"multiple   spaces"');
+    });
+
+    it('should quote keys with curly braces', () => {
+      expect(getKeyString('{braces}')).toBe('"{braces}"');
+      expect(getKeyString('{only-open')).toBe('"{only-open"');
+      expect(getKeyString('only-close}')).toBe('"only-close}"');
+      expect(getKeyString('nested{brace}here')).toBe('"nested{brace}here"');
+    });
+
+    it('should quote keys with double quotes and escape them', () => {
+      expect(getKeyString('nested "quote"')).toBe('"nested \\"quote\\""');
+      expect(getKeyString('"quoted"')).toBe('"\\"quoted\\""');
+      expect(getKeyString('multiple "quotes" here "too"')).toBe('"multiple \\"quotes\\" here \\"too\\""');
+    });
+
+    it('should quote keys with multiple special characters', () => {
+      expect(getKeyString('key: value')).toBe('"key: value"');
+      expect(getKeyString('{key}: "value"')).toBe('"{key}: \\"value\\""');
+      expect(getKeyString('complex:key with {braces}')).toBe('"complex:key with {braces}"');
+    });
+  });
+});
diff --git a/packages/bruno-lang/v2/tests/jsonToBru.spec.js b/packages/bruno-lang/v2/tests/jsonToBru.spec.js
index 56e8ea059..059146469 100644
--- a/packages/bruno-lang/v2/tests/jsonToBru.spec.js
+++ b/packages/bruno-lang/v2/tests/jsonToBru.spec.js
@@ -53,4 +53,87 @@ describe('jsonToBru stringify', () => {
       expect(output).toMatch(new RegExp(`timeout: ${input.settings.timeout}`));
     });
   });
+
+  describe('multi-line values', () => {
+    it('handles multi-line values in URL, headers, params, and vars', () => {
+      const input = {
+        meta: {
+          name: 'new-line',
+          type: 'http',
+          seq: 1
+        },
+        http: {
+          method: 'get',
+          url: 'https://httpbin.io/anything?foo=hello\nworld',
+          body: 'none',
+          auth: 'oauth2'
+        },
+        params: [
+          {
+            name: 'foo',
+            value: 'hello\nworld',
+            enabled: true,
+            type: 'query'
+          }
+        ],
+        headers: [
+          {
+            name: 'test header',
+            value: 't1\nt2',
+            enabled: true
+          }
+        ],
+        vars: {
+          req: [
+            {
+              name: 'test-var',
+              value: 't1\nt2',
+              enabled: true
+            }
+          ]
+        }
+      };
+
+      const output = stringify(input);
+
+      expect(output).toMatchInlineSnapshot(`
+        "meta {
+          name: new-line
+          type: http
+          seq: 1
+        }
+
+        get {
+          url: '''
+            https://httpbin.io/anything?foo=hello
+            world
+        '''
+          body: none
+          auth: oauth2
+        }
+
+        params:query {
+          foo: '''
+            hello
+            world
+          '''
+        }
+
+        headers {
+          "test header": '''
+            t1
+            t2
+          '''
+        }
+
+        vars:pre-request {
+          test-var: '''
+            t1
+            t2
+          '''
+        }
+        "
+      `);
+    });
+  });
 });
diff --git a/packages/bruno-lang/v2/tests/list.spec.js b/packages/bruno-lang/v2/tests/list.spec.js
index 19804779f..abf52767c 100644
--- a/packages/bruno-lang/v2/tests/list.spec.js
+++ b/packages/bruno-lang/v2/tests/list.spec.js
@@ -4,7 +4,6 @@
 const parser = require('../src/bruToJson');
 
 describe('List Support in BruFile Blocks', () => {
-
   describe('Basic List Functionality', () => {
     describe('Valid List Syntax', () => {
       it('should parse simple list with proper indentation', () => {
@@ -21,7 +20,7 @@ meta {
           meta: {
             seq: 1,
             tags: ['tag_1', 'tag_2'],
-            type: "http"
+            type: 'http'
           }
         };
         expect(output).toEqual(expected);
@@ -42,9 +41,9 @@ meta {
         const expected = {
           meta: {
             seq: 1,
-            name: "request_name",
+            name: 'request_name',
             tags: ['regression', 'smoke_test'],
-            type: "http"
+            type: 'http'
           }
         };
         expect(output).toEqual(expected);
@@ -65,7 +64,7 @@ meta {
           meta: {
             seq: 1,
             tags: ['tag_1', 'tag_2', 'tag_3'],
-            type: "http"
+            type: 'http'
           }
         };
         expect(output).toEqual(expected);
@@ -87,7 +86,7 @@ meta {
           meta: {
             seq: 1,
             tags: ['tag-with-hyphens', 'tag_with_underscores', 'tag123numbers', 'CamelCaseTag'],
-            type: "http"
+            type: 'http'
           }
         };
         expect(output).toEqual(expected);
@@ -227,9 +226,9 @@ meta {
         const expected = {
           meta: {
             seq: 1,
-            name: "[some name]",
+            name: '[some name]',
             tags: ['actual_list_item'],
-            type: "http"
+            type: 'http'
           }
         };
         expect(output).toEqual(expected);
@@ -249,9 +248,9 @@ meta {
         const expected = {
           meta: {
             seq: 1,
-            name: "[ this is the name ]",
+            name: '[ this is the name ]',
             tags: ['tag_1', 'tag_2'],
-            type: "http"
+            type: 'http'
           }
         };
         expect(output).toEqual(expected);
@@ -285,10 +284,10 @@ meta {
       const output = parser(input);
       const expected = {
         meta: {
-          name: "API Test",
+          name: 'API Test',
           tags: ['api', 'integration', 'v1'],
           seq: 1,
-          type: "http"
+          type: 'http'
         }
       };
       expect(output).toEqual(expected);
@@ -313,7 +312,7 @@ meta {
           seq: 1,
           categories: ['user-management', 'auth'],
           environments: ['staging', 'production'],
-          type: "http"
+          type: 'http'
         }
       };
       expect(output).toEqual(expected);
@@ -344,10 +343,10 @@ body:text {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -388,10 +387,10 @@ body:text {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -432,10 +431,10 @@ body:json {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -476,10 +475,10 @@ body:json {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -520,10 +519,10 @@ body:json {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -570,10 +569,10 @@ body:json {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -616,10 +615,10 @@ body:json {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -650,10 +649,10 @@ body:json {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -696,10 +695,10 @@ body:json {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -761,10 +760,10 @@ body:json {
 
       const expected = {
         meta: {
-          name: "[name]",
+          name: '[name]',
           tags: [
-            "tag_1",
-            "tag_2"
+            'tag_1',
+            'tag_2'
           ],
           seq: 1,
           type: 'http'
@@ -795,4 +794,4 @@ body:json {
       expect(output).toEqual(expected);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-lang/v2/tests/oauth2-additional-params.spec.js b/packages/bruno-lang/v2/tests/oauth2-additional-params.spec.js
index c38ea7ef0..2cbbac4f0 100644
--- a/packages/bruno-lang/v2/tests/oauth2-additional-params.spec.js
+++ b/packages/bruno-lang/v2/tests/oauth2-additional-params.spec.js
@@ -63,7 +63,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
     `.trim();
 
     const result = bruToJson(input);
-    
+
     // Verify all config types are present
     expect(result).toHaveProperty('oauth2_additional_parameters_auth_req_headers');
     expect(result).toHaveProperty('oauth2_additional_parameters_auth_req_queryparams');
@@ -94,7 +94,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-auth-header-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_auth_req_queryparams).toEqual([{
       name: 'auth-query-param',
       value: 'auth-query-param-value',
@@ -104,7 +104,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-auth-query-param-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_access_token_req_headers).toEqual([{
       name: 'token-header',
       value: 'token-header-value',
@@ -114,7 +114,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-token-header-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_access_token_req_queryparams).toEqual([{
       name: 'token-query-param',
       value: 'token-query-param-value',
@@ -124,7 +124,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-token-query-param-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_access_token_req_bodyvalues).toEqual([{
       name: 'token-body',
       value: 'token-body-value',
@@ -134,7 +134,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-token-body-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_refresh_token_req_headers).toEqual([{
       name: 'refresh-header',
       value: 'refresh-header-value',
@@ -144,7 +144,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-refresh-header-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_refresh_token_req_queryparams).toEqual([{
       name: 'refresh-query-param',
       value: 'refresh-query-param-value',
@@ -154,7 +154,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-refresh-query-param-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_refresh_token_req_bodyvalues).toEqual([{
       name: 'refresh-body',
       value: 'refresh-body-value',
@@ -224,7 +224,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
    `.trim();
 
     const result = collectionBruToJson(input);
-    
+
     // Verify all config types are present
     expect(result).toHaveProperty('oauth2_additional_parameters_auth_req_headers');
     expect(result).toHaveProperty('oauth2_additional_parameters_auth_req_queryparams');
@@ -255,7 +255,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-auth-header-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_auth_req_queryparams).toEqual([{
       name: 'auth-query-param',
       value: 'auth-query-param-value',
@@ -265,7 +265,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-auth-query-param-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_access_token_req_headers).toEqual([{
       name: 'token-header',
       value: 'token-header-value',
@@ -275,7 +275,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-token-header-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_access_token_req_queryparams).toEqual([{
       name: 'token-query-param',
       value: 'token-query-param-value',
@@ -285,7 +285,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-token-query-param-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_access_token_req_bodyvalues).toEqual([{
       name: 'token-body',
       value: 'token-body-value',
@@ -295,7 +295,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-token-body-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_refresh_token_req_headers).toEqual([{
       name: 'refresh-header',
       value: 'refresh-header-value',
@@ -305,7 +305,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-refresh-header-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_refresh_token_req_queryparams).toEqual([{
       name: 'refresh-query-param',
       value: 'refresh-query-param-value',
@@ -315,7 +315,7 @@ auth:oauth2:additional_params:refresh_token_req:body {
       value: 'disabled-refresh-query-param-value',
       enabled: false
     }]);
-    
+
     expect(result.oauth2_additional_parameters_refresh_token_req_bodyvalues).toEqual([{
       name: 'refresh-body',
       value: 'refresh-body-value',
@@ -326,4 +326,4 @@ auth:oauth2:additional_params:refresh_token_req:body {
       enabled: false
     }]);
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-lang/v2/tests/script.spec.js b/packages/bruno-lang/v2/tests/script.spec.js
index 7d4f50b53..232db4c74 100644
--- a/packages/bruno-lang/v2/tests/script.spec.js
+++ b/packages/bruno-lang/v2/tests/script.spec.js
@@ -14,7 +14,7 @@ script:pre-request {
     const output = parser(input);
     const expected = {
       script: {
-        req: "$req.setHeader('Content-Type', 'application/json');"
+        req: '$req.setHeader(\'Content-Type\', \'application/json\');'
       }
     };
     expect(output).toEqual(expected);
diff --git a/packages/bruno-lang/v2/tests/utils.spec.js b/packages/bruno-lang/v2/tests/utils.spec.js
index e63c96c3b..6ac249f0f 100644
--- a/packages/bruno-lang/v2/tests/utils.spec.js
+++ b/packages/bruno-lang/v2/tests/utils.spec.js
@@ -6,7 +6,7 @@ describe('getValueString', () => {
   });
 
   it('wraps multiline value in triple quotes with indentation', () => {
-    expect(getValueString('line1\nline2\nline3')).toBe("'''\n  line1\n  line2\n  line3\n'''");
+    expect(getValueString('line1\nline2\nline3')).toBe('\'\'\'\n  line1\n  line2\n  line3\n\'\'\'');
   });
 
   it('normalizes different newline types', () => {
diff --git a/packages/bruno-requests/babel.config.js b/packages/bruno-requests/babel.config.js
index d19d38b94..ca92638f5 100644
--- a/packages/bruno-requests/babel.config.js
+++ b/packages/bruno-requests/babel.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   presets: [
     ['@babel/preset-env', { targets: { node: 'current' } }],
-    '@babel/preset-typescript',
-  ],
-};
\ No newline at end of file
+    '@babel/preset-typescript'
+  ]
+};
diff --git a/packages/bruno-requests/jest.config.js b/packages/bruno-requests/jest.config.js
index ae522cdc8..417b96c60 100644
--- a/packages/bruno-requests/jest.config.js
+++ b/packages/bruno-requests/jest.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   transform: {
-    '^.+\\.(ts|js)$': 'babel-jest',
+    '^.+\\.(ts|js)$': 'babel-jest'
   },
   transformIgnorePatterns: [
     '/node_modules/(?!(lodash-es|is-ip|ip-regex|super-regex|function-timeout|time-span|convert-hrtime|clone-regexp|is-regexp)/)'
@@ -10,4 +10,4 @@ module.exports = {
     '**/*.(test|spec).(ts|js)'
   ],
   moduleFileExtensions: ['ts', 'js', 'json']
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-requests/package.json b/packages/bruno-requests/package.json
index 1d54c53e7..76d9749f8 100644
--- a/packages/bruno-requests/package.json
+++ b/packages/bruno-requests/package.json
@@ -26,11 +26,12 @@
     "@types/qs": "^6.9.18",
     "axios": "^1.9.0",
     "debug": "^4.4.3",
-    "grpc-reflection-js": "^0.3.0",
+    "google-protobuf": "^4.0.0",
+    "grpc-js-reflection-client": "^1.3.0",
     "is-ip": "^5.0.1",
-    "ws": "^8.18.3",
     "system-ca": "^2.0.1",
-    "tough-cookie": "^6.0.0"
+    "tough-cookie": "^6.0.0",
+    "ws": "^8.18.3"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.22.0",
diff --git a/packages/bruno-requests/rollup.config.js b/packages/bruno-requests/rollup.config.js
index bd0907f29..0d00804a1 100644
--- a/packages/bruno-requests/rollup.config.js
+++ b/packages/bruno-requests/rollup.config.js
@@ -7,7 +7,6 @@ const peerDepsExternal = require('rollup-plugin-peer-deps-external');
 const json = require('@rollup/plugin-json');
 const packageJson = require('./package.json');
 
-
 module.exports = [
   {
     input: 'src/index.ts',
@@ -30,14 +29,14 @@ module.exports = [
       nodeResolve({
         extensions: ['.js', '.ts', '.tsx', '.json', '.css'],
         dedupe: ['@grpc/grpc-js'],
-        preferBuiltins: true 
+        preferBuiltins: true
       }),
       json(),
       commonjs({
         transformMixedEsModules: true
       }),
       typescript({ tsconfig: './tsconfig.json' }),
-      terser(),
+      terser()
     ],
     external: ['axios', 'qs', 'ws', 'debug']
   }
diff --git a/packages/bruno-requests/src/auth/digestauth-helper.js b/packages/bruno-requests/src/auth/digestauth-helper.js
index e104b795f..f8d4f0f7c 100644
--- a/packages/bruno-requests/src/auth/digestauth-helper.js
+++ b/packages/bruno-requests/src/auth/digestauth-helper.js
@@ -23,8 +23,8 @@ function containsDigestHeader(response) {
 
 function containsAuthorizationHeader(originalRequest) {
   return Boolean(
-    originalRequest.headers['Authorization'] ||
-    originalRequest.headers['authorization']
+    originalRequest.headers['Authorization']
+    || originalRequest.headers['authorization']
   );
 }
 
@@ -53,9 +53,9 @@ export function addDigestInterceptor(axiosInstance, request) {
       originalRequest._retry = true;
 
       if (
-        error.response?.status === 401 &&
-        containsDigestHeader(error.response) &&
-        !containsAuthorizationHeader(originalRequest)
+        error.response?.status === 401
+        && containsDigestHeader(error.response)
+        && !containsAuthorizationHeader(originalRequest)
       ) {
         console.debug('Processing Digest Authentication Challenge');
         console.debug(error.response.headers['www-authenticate']);
@@ -77,7 +77,7 @@ export function addDigestInterceptor(axiosInstance, request) {
           return Promise.reject(error);
         }
 
-        console.debug("Auth Details: \n", authDetails);
+        console.debug('Auth Details: \n', authDetails);
 
         const nonceCount = '00000001';
         const cnonce = crypto.randomBytes(24).toString('hex');
@@ -113,7 +113,7 @@ export function addDigestInterceptor(axiosInstance, request) {
           `realm="${authDetails.realm}"`,
           `nonce="${authDetails.nonce}"`,
           `uri="${uri}"`,
-          `response="${response}"`,
+          `response="${response}"`
         ];
 
         if (authDetails.qop && authDetails.qop.split(',').map((q) => q.trim().toLowerCase()).includes('auth')) {
diff --git a/packages/bruno-requests/src/auth/digestauth-helper.spec.js b/packages/bruno-requests/src/auth/digestauth-helper.spec.js
index 4eb3a405a..c77195905 100644
--- a/packages/bruno-requests/src/auth/digestauth-helper.spec.js
+++ b/packages/bruno-requests/src/auth/digestauth-helper.spec.js
@@ -55,4 +55,4 @@ describe('Digest Auth with query params', () => {
     // Expected to include both pathname and query
     expect(uri).toBe('/resource?foo=bar&baz=qux');
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-requests/src/auth/index.ts b/packages/bruno-requests/src/auth/index.ts
index 082ca796b..a19151532 100644
--- a/packages/bruno-requests/src/auth/index.ts
+++ b/packages/bruno-requests/src/auth/index.ts
@@ -1,2 +1,2 @@
 export { addDigestInterceptor } from './digestauth-helper';
-export { getOAuth2Token } from './oauth2-helper';
\ No newline at end of file
+export { getOAuth2Token } from './oauth2-helper';
diff --git a/packages/bruno-requests/src/auth/oauth2-helper.ts b/packages/bruno-requests/src/auth/oauth2-helper.ts
index a8f499886..be3fc1457 100644
--- a/packages/bruno-requests/src/auth/oauth2-helper.ts
+++ b/packages/bruno-requests/src/auth/oauth2-helper.ts
@@ -145,7 +145,7 @@ const fetchTokenClientCredentials = async (oauth2Config: OAuth2Config) => {
   }
 
   if (credentialsPlacement === 'basic_auth_header') {
-    requestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret!)}`).toString('base64')}`;
+    requestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret!}`).toString('base64')}`;
   }
 
   if (credentialsPlacement !== 'basic_auth_header') {
@@ -246,7 +246,7 @@ const fetchTokenPassword = async (oauth2Config: OAuth2Config) => {
   }
 
   if (credentialsPlacement === 'basic_auth_header') {
-    requestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret!)}`).toString('base64')}`;
+    requestConfig.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret!}`).toString('base64')}`;
   }
 
   if (credentialsPlacement !== 'basic_auth_header') {
@@ -337,7 +337,7 @@ export const getOAuth2Token = async (oauth2Config: OAuth2Config, tokenStore: Tok
 
   // Check if we already have credentials stored
   const existingToken = await tokenStore.getCredential({ url: accessTokenUrl, credentialsId });
-  
+
   if (existingToken) {
     // Check if token is expired
     if (!isTokenExpired(existingToken)) {
diff --git a/packages/bruno-requests/src/cookies/index.spec.ts b/packages/bruno-requests/src/cookies/index.spec.ts
index 22071828d..1edb76efd 100644
--- a/packages/bruno-requests/src/cookies/index.spec.ts
+++ b/packages/bruno-requests/src/cookies/index.spec.ts
@@ -69,7 +69,7 @@ describe('Bruno Cookie Jar Wrapper - API Examples', () => {
       // Verify all cookies were set
       const retrievedCookies = (await jar.getCookies(testUrl)) as Cookie[];
       expect(retrievedCookies).toHaveLength(3);
-      
+
       const cookieNames = retrievedCookies.map((c: Cookie) => c.key);
       expect(cookieNames).toContain('cookie1');
       expect(cookieNames).toContain('cookie2');
@@ -81,15 +81,15 @@ describe('Bruno Cookie Jar Wrapper - API Examples', () => {
       await jar.setCookie(testUrl, 'auth', 'token123');
       await jar.setCookie(testUrl, 'session', 'sess456');
       await jar.setCookie(testUrl, 'prefs', 'theme=dark');
-      
+
       const cookies = (await jar.getCookies(testUrl)) as Cookie[];
       expect(cookies).toHaveLength(3);
-      
+
       const cookieMap = (cookies as Cookie[]).reduce<Record<string, string>>((map, cookie: Cookie) => {
         map[cookie.key] = cookie.value;
         return map;
       }, {} as Record<string, string>);
-      
+
       expect(cookieMap.auth).toBe('token123');
       expect(cookieMap.session).toBe('sess456');
       expect(cookieMap.prefs).toBe('theme=dark');
@@ -101,10 +101,10 @@ describe('Bruno Cookie Jar Wrapper - API Examples', () => {
       // Set two cookies
       await jar.setCookie(testUrl, 'keep', 'keepValue');
       await jar.setCookie(testUrl, 'remove', 'removeValue');
-      
+
       // Delete one cookie
       await jar.deleteCookie(testUrl, 'remove');
-      
+
       // Verify only one cookie remains
       const cookies = (await jar.getCookies(testUrl)) as Cookie[];
       expect(cookies).toHaveLength(1);
@@ -116,10 +116,10 @@ describe('Bruno Cookie Jar Wrapper - API Examples', () => {
       // Set multiple cookies
       await jar.setCookie(testUrl, 'cookie1', 'value1');
       await jar.setCookie(testUrl, 'cookie2', 'value2');
-      
+
       // Delete all cookies for the URL
       await jar.deleteCookies(testUrl);
-      
+
       // Verify no cookies remain
       const cookies = (await jar.getCookies(testUrl)) as Cookie[];
       expect(cookies).toHaveLength(0);
@@ -129,14 +129,14 @@ describe('Bruno Cookie Jar Wrapper - API Examples', () => {
       // Set cookies for multiple URLs
       await jar.setCookie('https://site1.com', 'cookie1', 'value1');
       await jar.setCookie('https://site2.com', 'cookie2', 'value2');
-      
+
       // Clear entire jar
       await jar.clear();
-      
+
       // Verify no cookies remain for any URL
       const cookies1 = (await jar.getCookies('https://site1.com')) as Cookie[];
       const cookies2 = (await jar.getCookies('https://site2.com')) as Cookie[];
-      
+
       expect(cookies1).toHaveLength(0);
       expect(cookies2).toHaveLength(0);
     });
@@ -164,17 +164,17 @@ describe('Bruno Cookie Jar Wrapper - API Examples', () => {
     test('Authentication workflow example', async () => {
       const apiUrl = 'https://api.example.com';
       const authToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...';
-      
+
       // Simulate login - set auth cookie
       await jar.setCookie(apiUrl, 'authToken', authToken);
-      
+
       // Later in the session - retrieve auth token
       const cookie = (await jar.getCookie(apiUrl, 'authToken'))!;
       expect(cookie.value).toBe(authToken);
-      
+
       // Simulate logout - remove auth cookie
       await jar.deleteCookie(apiUrl, 'authToken');
-      
+
       // Verify cookie is gone
       const deletedCookie = await jar.getCookie(apiUrl, 'authToken');
       expect(deletedCookie).toBeNull();
@@ -182,29 +182,29 @@ describe('Bruno Cookie Jar Wrapper - API Examples', () => {
 
     test('Session management with multiple cookies', async () => {
       const sessionUrl = 'https://app.example.com';
-      
+
       // Set session cookies
       const sessionCookies = [
         { key: 'sessionId', value: 'sess_123', httpOnly: true },
         { key: 'csrfToken', value: 'csrf_456' },
         { key: 'userPrefs', value: JSON.stringify({ theme: 'dark', lang: 'en' }) }
       ];
-      
+
       await jar.setCookies(sessionUrl, sessionCookies);
-      
+
       // Retrieve all session cookies
       const cookies = (await jar.getCookies(sessionUrl)) as Cookie[];
       expect(cookies).toHaveLength(3);
-      
+
       // Find specific cookies
       const sessionCookie = cookies.find((c: Cookie) => c.key === 'sessionId')!;
       const csrfCookie = cookies.find((c: Cookie) => c.key === 'csrfToken')!;
       const prefsCookie = cookies.find((c: Cookie) => c.key === 'userPrefs')!;
-      
+
       expect(sessionCookie.value).toBe('sess_123');
       expect(sessionCookie.httpOnly).toBe(true);
       expect(csrfCookie.value).toBe('csrf_456');
-      
+
       const prefs = JSON.parse(prefsCookie.value);
       expect(prefs.theme).toBe('dark');
       expect(prefs.lang).toBe('en');
@@ -212,23 +212,23 @@ describe('Bruno Cookie Jar Wrapper - API Examples', () => {
 
     test('Cookie path handling', async () => {
       const baseUrl = 'https://example.com';
-      
+
       // Set cookies with different paths
       await jar.setCookie(baseUrl, { key: 'global', value: 'global_val', path: '/' });
       await jar.setCookie(baseUrl, { key: 'api', value: 'api_val', path: '/api' });
       await jar.setCookie(baseUrl, { key: 'admin', value: 'admin_val', path: '/admin' });
-      
+
       const rootCookies = (await jar.getCookies(baseUrl + '/')) as Cookie[];
       const globalCookie = rootCookies.find((c: Cookie) => c.key === 'global')!;
       expect(globalCookie).toBeTruthy();
       expect(globalCookie.value).toBe('global_val');
-      
+
       const apiCookies = (await jar.getCookies(baseUrl + '/api/users')) as Cookie[];
       expect(apiCookies.length).toBeGreaterThanOrEqual(2);
-      
+
       const apiCookieNames = apiCookies.map((c: Cookie) => c.key);
       expect(apiCookieNames).toContain('global');
       expect(apiCookieNames).toContain('api');
     });
   });
-}); 
\ No newline at end of file
+});
diff --git a/packages/bruno-requests/src/cookies/index.ts b/packages/bruno-requests/src/cookies/index.ts
index dfd9482bc..629727953 100644
--- a/packages/bruno-requests/src/cookies/index.ts
+++ b/packages/bruno-requests/src/cookies/index.ts
@@ -15,7 +15,7 @@ const addCookieToJar = (setCookieHeader: string, requestUrl: string): void => {
 
 const getCookiesForUrl = (url: string) => {
   return cookieJar.getCookiesSync(url, {
-    secure: isPotentiallyTrustworthyOrigin(url),
+    secure: isPotentiallyTrustworthyOrigin(url)
   } as any);
 };
 
@@ -37,7 +37,7 @@ const getDomainsWithCookies = (): Promise<Array<{ domain: string; cookies: Cooki
       cookies.forEach((cookie) => {
         // Handle null domain by skipping the cookie
         if (!cookie.domain) return;
-        
+
         if (!domainCookieMap[cookie.domain]) {
           domainCookieMap[cookie.domain] = [cookie];
         } else {
@@ -163,7 +163,7 @@ const createCookieString = (cookieObj: any): string => {
     cookieString += `; Domain=${cookieObj.domain}`;
   }
   return cookieString;
-}
+};
 
 const saveCookies = (url: string, headers: any) => {
   if (headers['set-cookie']) {
@@ -180,7 +180,7 @@ const saveCookies = (url: string, headers: any) => {
 
 const cookieJarWrapper = () => {
   return {
-  
+
     // Get the full cookie object for the given URL & name.
     getCookie: function (
       url: string,
@@ -213,7 +213,7 @@ const cookieJarWrapper = () => {
         });
       });
     },
-   
+
     // Get all cookies that would be sent to the given URL.
     getCookies: function (url: string, callback?: (err: Error | null | undefined, cookies?: Cookie[]) => void) {
       if (!url) {
@@ -263,7 +263,7 @@ const cookieJarWrapper = () => {
           const cookie = new Cookie({
             key: cookieName,
             value: cookieValue,
-            domain: new URL(url).hostname,
+            domain: new URL(url).hostname
           });
 
           cookieJar.setCookieSync(cookie, url, { ignoreError: true });
@@ -279,7 +279,7 @@ const cookieJarWrapper = () => {
 
           const base = {
             domain: new URL(url).hostname,
-            ...obj,
+            ...obj
           } as any;
 
           const processedCookie = createCookieObj(base);
@@ -314,7 +314,6 @@ const cookieJarWrapper = () => {
       });
     },
 
-
     setCookies: function (
       url: string,
       cookiesArray: any[],
@@ -365,7 +364,6 @@ const cookieJarWrapper = () => {
       });
     },
 
-
     clear: function (callback?: (err?: Error | undefined) => void) {
       if (callback) {
         // Callback mode
@@ -483,7 +481,6 @@ const cookieJarWrapper = () => {
   } as const;
 };
 
-
 const cookiesModule = {
   cookieJar,
   addCookieToJar,
@@ -502,4 +499,4 @@ const cookiesModule = {
   saveCookies
 };
 
-export default cookiesModule; 
\ No newline at end of file
+export default cookiesModule;
diff --git a/packages/bruno-requests/src/grpc/grpc-client.js b/packages/bruno-requests/src/grpc/grpc-client.js
index ab4c6cac1..695be3eec 100644
--- a/packages/bruno-requests/src/grpc/grpc-client.js
+++ b/packages/bruno-requests/src/grpc/grpc-client.js
@@ -1,5 +1,5 @@
-import { makeGenericClientConstructor, ChannelCredentials, Metadata } from '@grpc/grpc-js';
-import * as grpcReflection from 'grpc-reflection-js';
+import { makeGenericClientConstructor, ChannelCredentials, Metadata, status, credentials, CallCredentials } from '@grpc/grpc-js';
+import { GrpcReflection } from 'grpc-js-reflection-client';
 import * as protoLoader from '@grpc/proto-loader';
 import { generateGrpcSampleMessage } from './grpcMessageGenerator';
 import * as tls from 'tls';
@@ -34,6 +34,8 @@ const configOptions = {
   json: true
 };
 
+const reflectionServices = ['grpc.reflection.v1alpha.ServerReflection', 'grpc.reflection.v1.ServerReflection'];
+
 const replaceTabsWithSpaces = (str, numSpaces = 2) => {
   if (!str || !str.length || !isString(str)) {
     return '';
@@ -64,7 +66,7 @@ const safeJsonParse = (jsonString, context = 'JSON string') => {
     console.error(errorMessage, { originalString: jsonString, parseError: error });
     throw new Error(errorMessage);
   }
-}
+};
 
 const processGrpcMetadata = (metadata) => {
   return Object.entries(metadata).map(([name, value]) => {
@@ -90,16 +92,16 @@ const processGrpcMetadata = (metadata) => {
 
 const getParsedGrpcUrlObject = (url) => {
   const isUnixSocket = (str) => str.startsWith('unix:');
-  //const isXdsUrl = str => str.startsWith('xds:');
+  // const isXdsUrl = str => str.startsWith('xds:');
   // By default, secure protocol grpcs is set if not specified, localhost is set to insecure (grpc://)
   const addProtocolIfMissing = (str) => {
     if (str.includes('://')) return str;
-    
+
     // For localhost, default to insecure (grpc://) for local development
     if (str.includes('localhost') || str.includes('127.0.0.1')) {
       return `grpc://${str}`;
     }
-    
+
     // For other hosts, default to secure
     return `grpcs://${str}`;
   };
@@ -172,6 +174,51 @@ class GrpcClient {
     this.eventCallback = eventCallback;
   }
 
+  /**
+   * Creates call options from metadata for gRPC calls
+   * @param {grpc.Metadata} metadata - metadata to be sent with calls
+   * @returns {Object} callOptions object with credentials if metadata is provided
+   */
+  #createCallOptions(metadata) {
+    if (metadata && Object.keys(metadata.getMap()).length > 0) {
+      // Create CallCredentials from metadata generator
+      const callCredentials = CallCredentials.createFromMetadataGenerator((options, callback) => {
+        callback(null, metadata);
+      });
+      return { credentials: callCredentials };
+    }
+    return {};
+  }
+
+  /**
+   * Creates a reflection client that works for v1, v1alpha, or both.
+   *
+   * @param {string} host - host:port of the gRPC server
+   * @param {grpc.ChannelCredentials} credentials - defaults to insecure
+   * @param {grpc.Metadata} metadata - metadata to be sent with reflection calls (used for insecure connections where credentials can't include metadata)
+   * @param {grpc.ChannelOptions} options - channel options
+   * @returns {Promise<{ client: GrpcReflection, services: string[], callOptions: Object }>}
+   */
+  async #getReflectionClient(host, credentials = ChannelCredentials.createInsecure(), metadata = null, options = {}) {
+    const makeClient = (version) => new GrpcReflection(host, credentials, options, version);
+    const callOptions = this.#createCallOptions(metadata);
+
+    let client;
+    let services;
+
+    try {
+      client = makeClient('v1');
+      services = await client.listServices('*', callOptions);
+      return { client, services, callOptions };
+    } catch (e) {
+      console.warn(`gRPC reflection v1 failed:`, e);
+    }
+
+    client = makeClient('v1alpha');
+    services = await client.listServices('*', callOptions);
+    return { client, services, callOptions };
+  }
+
   /**
    * Get method type based on streaming configuration
    */
@@ -241,9 +288,7 @@ class GrpcClient {
         return ChannelCredentials.createFromSecureContext(secureContext, sslOptions);
       }
 
-      const credentials = ChannelCredentials.createSsl(rootCertBuffer, privateKeyBuffer, clientCertBuffer, sslOptions);
-
-      return credentials;
+      return ChannelCredentials.createSsl(rootCertBuffer, privateKeyBuffer, clientCertBuffer, sslOptions);
     } catch (error) {
       console.error('Error creating channel credentials:', error);
       // Default to insecure as fallback
@@ -446,9 +491,8 @@ class GrpcClient {
     try {
       method = this.#getMethodFromPath(methodPath);
     } catch (error) {
-
       /* Attempt to refresh methods as fallback
-      * In an ideal case, the stored metadata from local storage should be received from the client side, 
+      * In an ideal case, the stored metadata from local storage should be received from the client side,
       * however, this approach causes serialization failure as the method definition loses its requestSerialize function while saving to local storage
       * so we are using reflection as a fallback
       */
@@ -491,8 +535,8 @@ class GrpcClient {
       messages = messages.map(({ content }) => safeJsonParse(content, 'message content'));
     } catch (parseError) {
       console.error('Failed to parse gRPC message content:', parseError);
-      this.eventCallback('grpc:error', request.uid, collection.uid, { 
-        error: parseError 
+      this.eventCallback('grpc:error', request.uid, collection.uid, {
+        error: parseError
       });
       return; // Exit early to prevent sending invalid data
     }
@@ -527,7 +571,7 @@ class GrpcClient {
 
     if (connection) {
       let parsedBody;
-      
+
       // Parse the body if it's a string, with error handling
       if (typeof body === 'string') {
         try {
@@ -535,8 +579,8 @@ class GrpcClient {
         } catch (parseError) {
           // Log the error and notify the client
           console.error('Failed to parse message body:', parseError);
-          this.eventCallback('grpc:error', requestId, collectionUid, { 
-            error: parseError 
+          this.eventCallback('grpc:error', requestId, collectionUid, {
+            error: parseError
           });
           return; // Exit early to prevent sending invalid data
         }
@@ -566,6 +610,11 @@ class GrpcClient {
     verifyOptions,
     sendEvent
   }) {
+    const { host, path } = getParsedGrpcUrlObject(request.url);
+    const metadata = new Metadata();
+    Object.entries(request.headers).forEach(([name, value]) => {
+      metadata.add(name, value);
+    });
     const credentials = this.#getChannelCredentials({
       url: request.url,
       rootCertificate,
@@ -575,38 +624,31 @@ class GrpcClient {
       pfx,
       verifyOptions
     });
-    const { host, path } = getParsedGrpcUrlObject(request.url);
-    const metadata = new Metadata();
-    Object.entries(request.headers).forEach(([name, value]) => {
-      metadata.add(name, value);
-    });
 
     try {
-      const client = new grpcReflection.Client(host, credentials, {}, metadata);
+      const { client, services, callOptions } = await this.#getReflectionClient(host, credentials, metadata, {});
 
-      const declarations = await client.listServices();
-      const methods = await Promise.all(
-        declarations.map(async (declaration) => {
-          const fileContainingSymbol = await client.fileContainingSymbol(declaration);
-          const descriptor = fileContainingSymbol.toDescriptor('proto3');
-          const protoDefinition = protoLoader.loadFileDescriptorSetFromObject(descriptor, configOptions);
+      const methods = [];
+      for (const service of services) {
+        if (reflectionServices.includes(service)) {
+          continue;
+        }
+        const m = await client.listMethods(service, callOptions);
+        methods.push(...m);
+      }
 
-          const serviceDefinition = protoDefinition[declaration];
-          if (!!serviceDefinition?.format) {
-            return [];
-          }
-          const methods = Object.values(serviceDefinition);
-          methods.forEach((method) => {
-            this.methods.set(method.path, method);
-          });
-          return methods;
-        })
-      );
-
-      const methodsWithType = methods.flat().map((method) => ({
-        ...method,
-        type: this.#getMethodType(method)
-      }));
+      const methodsWithType = methods.map((method) => {
+        const { definition, ...rest } = method;
+        const modifiedMethod = {
+          ...rest,
+          ...definition
+        };
+        modifiedMethod.type = this.#getMethodType(modifiedMethod);
+        return modifiedMethod;
+      });
+      methodsWithType.forEach((method) => {
+        this.methods.set(method.path, method);
+      });
       return methodsWithType;
     } catch (error) {
       console.error('Error in gRPC reflection:', error);
@@ -615,9 +657,6 @@ class GrpcClient {
     }
   }
 
-  /**
-   * Load methods from proto file
-   */
   async loadMethodsFromProtoFile(filePath, includeDirs = []) {
     const protoDefinition = await protoLoader.load(filePath, { ...configOptions, includeDirs });
     const methods = Object.values(protoDefinition)
@@ -690,7 +729,7 @@ class GrpcClient {
   generateSampleMessage(methodPath, options = {}) {
     try {
       let method;
-      
+
       // First, try to use the methodMetadata from options if provided
       if (options.methodMetadata) {
         method = options.methodMetadata;
@@ -702,7 +741,7 @@ class GrpcClient {
             error: `Method ${methodPath} not found in cache, please refresh the methods`
           };
         }
-        
+
         // Get the method definition from cache
         method = this.methods.get(methodPath);
       }
diff --git a/packages/bruno-requests/src/grpc/grpcMessageGenerator.js b/packages/bruno-requests/src/grpc/grpcMessageGenerator.js
index 8b736c498..e7b66aa25 100644
--- a/packages/bruno-requests/src/grpc/grpcMessageGenerator.js
+++ b/packages/bruno-requests/src/grpc/grpcMessageGenerator.js
@@ -8,12 +8,12 @@ import { faker } from '@faker-js/faker';
  */
 const generateSampleMessageFromFields = (fields, options = {}) => {
   const result = {};
-  
+
   if (!fields || !Array.isArray(fields)) {
     return {};
   }
-  
-  fields.forEach(field => {
+
+  fields.forEach((field) => {
     // Generate a value based on field name and type
     if (field.type === 'TYPE_MESSAGE') {
       // Handle nested message
@@ -21,7 +21,7 @@ const generateSampleMessageFromFields = (fields, options = {}) => {
         if (field.label === 'LABEL_REPEATED') {
           // Generate array of nested messages
           const count = options.arraySize || faker.number.int({ min: 1, max: 3 });
-          result[field.name] = Array.from({ length: count }, () => 
+          result[field.name] = Array.from({ length: count }, () =>
             generateSampleMessageFromFields(field.messageType.field, options)
           );
         } else {
@@ -37,7 +37,7 @@ const generateSampleMessageFromFields = (fields, options = {}) => {
     } else {
       // Generate value based on primitive type and name
       let value;
-      
+
       switch (field.type) {
         case 'TYPE_DOUBLE':
         case 'TYPE_FLOAT':
@@ -57,7 +57,7 @@ const generateSampleMessageFromFields = (fields, options = {}) => {
           value = faker.datatype.boolean();
           break;
         case 'TYPE_STRING':
-          value = faker.lorem.word()
+          value = faker.lorem.word();
           break;
         case 'TYPE_BYTES':
           value = Buffer.from(faker.string.alpha({ length: { min: 5, max: 10 } })).toString('base64');
@@ -75,7 +75,7 @@ const generateSampleMessageFromFields = (fields, options = {}) => {
       }
     }
   });
-  
+
   return result;
 };
 
@@ -90,15 +90,14 @@ const getMethodRequestFields = (method) => {
     if (method.requestType?.type?.field) {
       return method.requestType.type.field;
     }
-    
+
     if (method.requestType?.field) {
       return method.requestType.field;
     }
-    
+
     if (method.requestType?.type) {
       return method.requestType.type;
     }
-   
   } catch (error) {
     console.error('Error extracting method request fields:', error);
     return null;
@@ -116,17 +115,17 @@ export const generateGrpcSampleMessage = (method, options = {}) => {
     if (!method) {
       return {};
     }
-    
+
     const fields = getMethodRequestFields(method);
-    
+
     if (fields) {
       return generateSampleMessageFromFields(fields, options);
     }
-    
+
     // If method exists but no field information could be extracted,
     // generate a generic message that matches common patterns
     return {};
   } catch (error) {
     console.error('Error generating gRPC sample message:', error);
   }
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-requests/src/grpc/index.ts b/packages/bruno-requests/src/grpc/index.ts
index 060b54bb6..e866c8395 100644
--- a/packages/bruno-requests/src/grpc/index.ts
+++ b/packages/bruno-requests/src/grpc/index.ts
@@ -1,2 +1,2 @@
 export { GrpcClient } from './grpc-client';
-export { generateGrpcSampleMessage } from './grpcMessageGenerator';
\ No newline at end of file
+export { generateGrpcSampleMessage } from './grpcMessageGenerator';
diff --git a/packages/bruno-requests/src/index.ts b/packages/bruno-requests/src/index.ts
index c30e41772..ad751f0ce 100644
--- a/packages/bruno-requests/src/index.ts
+++ b/packages/bruno-requests/src/index.ts
@@ -5,4 +5,4 @@ export { default as cookies } from './cookies';
 
 export { getCACertificates } from './utils/ca-cert';
 
-export * as scripting from './scripting';
\ No newline at end of file
+export * as scripting from './scripting';
diff --git a/packages/bruno-requests/src/network/axios-instance.ts b/packages/bruno-requests/src/network/axios-instance.ts
index 6ae868c3f..7e764427f 100644
--- a/packages/bruno-requests/src/network/axios-instance.ts
+++ b/packages/bruno-requests/src/network/axios-instance.ts
@@ -3,11 +3,11 @@ import http from 'node:http';
 import https from 'node:https';
 
 /**
- * 
+ *
  * @param {Object} customRequestConfig options - partial AxiosRequestConfig
- * 
+ *
  * @returns {import('axios').AxiosInstance} Configured Axios instance
- * 
+ *
  * @example
  * const instance = makeAxiosInstance({
  *   maxRedirects: 0,
@@ -20,11 +20,11 @@ import https from 'node:https';
 
 type ModifiedInternalAxiosRequestConfig = InternalAxiosRequestConfig & {
   startTime: number;
-}
+};
 
 type ModifiedAxiosResponse = AxiosResponse & {
   responseTime: number;
-}
+};
 
 const baseRequestConfig: Partial<AxiosRequestConfig> = {
   proxy: false,
@@ -45,7 +45,7 @@ const baseRequestConfig: Partial<AxiosRequestConfig> = {
 
     return data;
   }
-}
+};
 
 const makeAxiosInstance = (customRequestConfig?: AxiosRequestConfig) => {
   customRequestConfig = customRequestConfig || {};
@@ -58,7 +58,7 @@ const makeAxiosInstance = (customRequestConfig?: AxiosRequestConfig) => {
     const modifiedConfig: ModifiedInternalAxiosRequestConfig = {
       ...config,
       startTime: Date.now()
-    }
+    };
     return modifiedConfig;
   });
 
diff --git a/packages/bruno-requests/src/network/index.ts b/packages/bruno-requests/src/network/index.ts
index 7d72cb7d1..19548a4e5 100644
--- a/packages/bruno-requests/src/network/index.ts
+++ b/packages/bruno-requests/src/network/index.ts
@@ -1 +1 @@
-export { makeAxiosInstance } from './axios-instance';
\ No newline at end of file
+export { makeAxiosInstance } from './axios-instance';
diff --git a/packages/bruno-requests/src/scripting/index.ts b/packages/bruno-requests/src/scripting/index.ts
index 5ec4ee97b..7dd459330 100644
--- a/packages/bruno-requests/src/scripting/index.ts
+++ b/packages/bruno-requests/src/scripting/index.ts
@@ -1 +1 @@
-export { default as sendRequest } from './send-request';
\ No newline at end of file
+export { default as sendRequest } from './send-request';
diff --git a/packages/bruno-requests/src/scripting/send-request.ts b/packages/bruno-requests/src/scripting/send-request.ts
index 8afedeaf3..926e8143e 100644
--- a/packages/bruno-requests/src/scripting/send-request.ts
+++ b/packages/bruno-requests/src/scripting/send-request.ts
@@ -12,16 +12,13 @@ const sendRequest = async (requestConfig: AxiosRequestConfig, callback: T_SendRe
     const response = await axiosInstance(requestConfig);
     try {
       await callback(null, response);
-    }
-    catch(error) {
+    } catch (error) {
       return Promise.reject(error);
     }
-  }
-  catch (error) {
+  } catch (error) {
     try {
       await callback(error, null);
-    }
-    catch(err) {
+    } catch (err) {
       return Promise.reject(err);
     }
   }
diff --git a/packages/bruno-requests/src/utils/ca-cert.ts b/packages/bruno-requests/src/utils/ca-cert.ts
index a8112bdab..ff92b85bf 100644
--- a/packages/bruno-requests/src/utils/ca-cert.ts
+++ b/packages/bruno-requests/src/utils/ca-cert.ts
@@ -4,7 +4,7 @@ import * as fs from 'node:fs';
 type T_CACertificatesOptions = {
   caCertFilePath?: string;
   shouldKeepDefaultCerts?: boolean;
-}
+};
 
 type T_CACertificatesResult = {
   caCertificates: string;
@@ -14,7 +14,7 @@ type T_CACertificatesResult = {
     custom: number;
     extra: number;
   };
-}
+};
 
 let systemCertsCache: string[] | undefined;
 
@@ -70,20 +70,20 @@ function getNodeExtraCACerts(): string[] {
 
 /**
  * Get CA certificates
- * 
+ *
  * Generic function to get CA certificates
  * - System CA certificates (From OS)
  * - Root CA certificates (From Node)
  * - Custom CA certificates (From user-provided file)
  * - NODE_EXTRA_CA_CERTS (From environment variable)
- * 
+ *
  * If no custom CA certificate file path is provided
  *  → return system CA certificates and root certificates + NODE_EXTRA_CA_CERTS
- * 
+ *
  * If custom CA certificate file path is provided
  *  → use custom CA certificate file + NODE_EXTRA_CA_CERTS
  *  → ignore system + root certificates if shouldKeepDefaultCerts is false
- * 
+ *
  * @param caCertFilePath - path to custom CA certificate file
  * @param shouldKeepDefaultCerts - whether to keep default CA certificates
  * @returns {T_CACertificatesResult} - CA certificates and their count
@@ -97,14 +97,13 @@ const getCACertificates = ({ caCertFilePath, shouldKeepDefaultCerts = true }: T_
       root: 0,
       custom: 0,
       extra: 0
-    }
+    };
 
     let systemCerts: string[] = [];
     let rootCerts: string[] = [];
     let customCerts: string[] = [];
     let nodeExtraCerts: string[] = [];
 
-
     // handle user-provided custom CA certificate file with optional default certificates
     if (caCertFilePath) {
       // validate custom CA certificate file
@@ -153,13 +152,13 @@ const getCACertificates = ({ caCertFilePath, shouldKeepDefaultCerts = true }: T_
     return {
       caCertificates,
       caCertificatesCount
-    }
+    };
   } catch (err) {
     console.error('Error configuring CA certificates:', (err as Error).message);
     throw err; // Re-throw certificate loading errors as they're critical
   }
-}
+};
 
 export {
   getCACertificates
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-requests/src/utils/url-validation.spec.ts b/packages/bruno-requests/src/utils/url-validation.spec.ts
index b2b35e602..e0804c2ff 100644
--- a/packages/bruno-requests/src/utils/url-validation.spec.ts
+++ b/packages/bruno-requests/src/utils/url-validation.spec.ts
@@ -130,4 +130,4 @@ describe('isPotentiallyTrustworthyOrigin', () => {
       expect(isPotentiallyTrustworthyOrigin('wss://localhost')).toBe(true);
     });
   });
-});
\ No newline at end of file
+});
diff --git a/packages/bruno-requests/src/utils/url-validation.ts b/packages/bruno-requests/src/utils/url-validation.ts
index 1a94bcfdc..4e2a35353 100644
--- a/packages/bruno-requests/src/utils/url-validation.ts
+++ b/packages/bruno-requests/src/utils/url-validation.ts
@@ -64,4 +64,4 @@ const isPotentiallyTrustworthyOrigin = (urlString: string): boolean => {
   return isLocalHostname(hostname);
 };
 
-export { isPotentiallyTrustworthyOrigin }; 
\ No newline at end of file
+export { isPotentiallyTrustworthyOrigin };
diff --git a/packages/bruno-requests/src/ws/ws-client.js b/packages/bruno-requests/src/ws/ws-client.js
index 32b11b079..cb6fee6d7 100644
--- a/packages/bruno-requests/src/ws/ws-client.js
+++ b/packages/bruno-requests/src/ws/ws-client.js
@@ -360,6 +360,19 @@ class WsClient {
       });
     }
   }
+
+  /**
+   * Get the connection status of a connection
+   * @param {string} requestId - The request ID to get the connection status of
+   * @returns {string} - The connection status
+   */
+  // Returns "disconnected", "connecting", "connected"
+  connectionStatus(requestId) {
+    const connectionMeta = this.activeConnections.get(requestId);
+    if (connectionMeta?.connection?.readyState === ws.WebSocket.CONNECTING) return 'connecting';
+    if (connectionMeta?.connection?.readyState === ws.WebSocket.OPEN) return 'connected';
+    return 'disconnected';
+  }
 }
 
 export { WsClient };
diff --git a/packages/bruno-schema-types/.gitignore b/packages/bruno-schema-types/.gitignore
new file mode 100644
index 000000000..e505c2f5c
--- /dev/null
+++ b/packages/bruno-schema-types/.gitignore
@@ -0,0 +1,18 @@
+# Dependencies
+node_modules/
+
+# Build outputs
+dist/
+*.tsbuildinfo
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+
diff --git a/packages/bruno-schema-types/package.json b/packages/bruno-schema-types/package.json
new file mode 100644
index 000000000..7270655f7
--- /dev/null
+++ b/packages/bruno-schema-types/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "@usebruno/schema-types",
+  "version": "0.0.1",
+  "description": "TypeScript types for Bruno schema",
+  "author": "Bruno Software Inc.",
+  "main": "dist/schema-types.js",
+  "types": "dist/schema-types.d.ts",
+  "files": [
+    "dist",
+    "src",
+    "package.json"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "clean": "rm -rf dist",
+    "prepublishOnly": "npm run build"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./common/*": {
+      "types": "./dist/common/*.d.ts",
+      "default": "./dist/common/*.js"
+    },
+    "./config/*": {
+      "types": "./dist/config/*.d.ts",
+      "default": "./dist/config/*.js"
+    },
+    "./collection/*": {
+      "types": "./dist/collection/*.d.ts",
+      "default": "./dist/collection/*.js"
+    },
+    "./requests/*": {
+      "types": "./dist/requests/*.d.ts",
+      "default": "./dist/requests/*.js"
+    }
+  },
+  "devDependencies": {
+    "typescript": "^5.0.0"
+  },
+  "license": "MIT",
+  "keywords": [
+    "bruno",
+    "types",
+    "typescript",
+    "api",
+    "http"
+  ]
+}
+
diff --git a/packages/bruno-schema-types/src/collection/collection.ts b/packages/bruno-schema-types/src/collection/collection.ts
new file mode 100644
index 000000000..196d15d01
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/collection.ts
@@ -0,0 +1,22 @@
+import type { UID } from '../common';
+import type { Item } from './item';
+import type { Environments } from './environment';
+import type { FolderRoot } from './folder';
+
+export interface RunnerResult {
+  items?: unknown[] | null;
+}
+
+export interface Collection {
+  version: '1';
+  uid: UID;
+  name: string;
+  items: Item[];
+  activeEnvironmentUid?: string | null;
+  environments?: Environments | null;
+  pathname?: string | null;
+  runnerResult?: RunnerResult | null;
+  runtimeVariables?: Record<string, unknown> | null;
+  brunoConfig?: Record<string, unknown> | null;
+  root?: FolderRoot | null;
+}
diff --git a/packages/bruno-schema-types/src/collection/environment.ts b/packages/bruno-schema-types/src/collection/environment.ts
new file mode 100644
index 000000000..90fdbfaf3
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/environment.ts
@@ -0,0 +1,18 @@
+import type { UID } from '../common';
+
+export interface EnvironmentVariable {
+  uid: UID;
+  name?: string | null;
+  value?: string | number | boolean | Record<string, unknown> | null;
+  type: 'text';
+  enabled?: boolean;
+  secret?: boolean;
+}
+
+export interface Environment {
+  uid: UID;
+  name: string;
+  variables: EnvironmentVariable[];
+}
+
+export type Environments = Environment[];
diff --git a/packages/bruno-schema-types/src/collection/examples.ts b/packages/bruno-schema-types/src/collection/examples.ts
new file mode 100644
index 000000000..0dcf34db1
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/examples.ts
@@ -0,0 +1,34 @@
+import type { UID, KeyValue } from '../common';
+import type { HttpRequestBody, HttpRequestParam } from '../requests';
+
+export type ExampleType = 'http-request' | 'graphql-request' | 'grpc-request';
+
+export interface ExampleRequest {
+  url: string;
+  method: string;
+  headers: KeyValue[];
+  params: HttpRequestParam[];
+  body: HttpRequestBody;
+}
+
+export interface ExampleResponseBody {
+  type?: 'json' | 'text' | 'xml' | 'html' | 'binary' | null;
+  content?: unknown;
+}
+
+export interface ExampleResponse {
+  status?: string | null;
+  statusText?: string | null;
+  headers?: KeyValue[] | null;
+  body?: ExampleResponseBody | null;
+}
+
+export interface Example {
+  uid: UID;
+  itemUid: UID;
+  name: string;
+  description?: string | null;
+  type: ExampleType;
+  request?: ExampleRequest | null;
+  response?: ExampleResponse | null;
+}
diff --git a/packages/bruno-schema-types/src/collection/folder.ts b/packages/bruno-schema-types/src/collection/folder.ts
new file mode 100644
index 000000000..f9c88df82
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/folder.ts
@@ -0,0 +1,23 @@
+import type { KeyValue, Auth, Script, Variables } from '../common';
+
+export interface FolderRequest {
+  headers?: KeyValue[] | null;
+  auth?: Auth | null;
+  script?: Script | null;
+  vars?: {
+    req?: Variables | null;
+    res?: Variables | null;
+  } | null;
+  tests?: string | null;
+}
+
+export interface FolderMeta {
+  name?: string | null;
+  seq?: number | null;
+}
+
+export interface FolderRoot {
+  request?: FolderRequest | null;
+  docs?: string | null;
+  meta?: FolderMeta | null;
+}
diff --git a/packages/bruno-schema-types/src/collection/index.ts b/packages/bruno-schema-types/src/collection/index.ts
new file mode 100644
index 000000000..644235e9e
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/index.ts
@@ -0,0 +1,21 @@
+export type {
+  EnvironmentVariable,
+  Environment,
+  Environments
+} from './environment';
+export type { FolderRequest, FolderMeta, FolderRoot } from './folder';
+export type {
+  Example,
+  ExampleType,
+  ExampleRequest,
+  ExampleResponse,
+  ExampleResponseBody
+} from './examples';
+export type {
+  Item,
+  ItemType,
+  ItemSettings,
+  HttpItemSettings,
+  WebSocketItemSettings
+} from './item';
+export type { Collection, RunnerResult } from './collection';
diff --git a/packages/bruno-schema-types/src/collection/item.ts b/packages/bruno-schema-types/src/collection/item.ts
new file mode 100644
index 000000000..bdf3b3346
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/item.ts
@@ -0,0 +1,44 @@
+import type { UID } from '../common';
+import type { Request } from '../requests';
+import type { Example } from './examples';
+import type { FolderRoot } from './folder';
+
+export type ItemType
+  = | 'http-request'
+    | 'graphql-request'
+    | 'folder'
+    | 'js'
+    | 'grpc-request'
+    | 'ws-request';
+
+export interface HttpItemSettings {
+  encodeUrl?: boolean | null;
+  followRedirects?: boolean | null;
+  maxRedirects?: number | null;
+  timeout?: number | 'inherit' | null;
+}
+
+export interface WebSocketItemSettings {
+  settings?: {
+    timeout?: number | null;
+    keepAliveInterval?: number | null;
+  } | null;
+}
+
+export type ItemSettings = HttpItemSettings | WebSocketItemSettings | null;
+
+export interface Item {
+  uid: UID;
+  type: ItemType;
+  seq?: number | null;
+  name: string;
+  tags?: string[] | null;
+  request?: Request | null;
+  settings?: ItemSettings;
+  fileContent?: string | null;
+  root?: FolderRoot | null;
+  items?: Item[] | null;
+  examples?: Example[] | null;
+  filename?: string | null;
+  pathname?: string | null;
+}
diff --git a/packages/bruno-schema-types/src/common/auth.ts b/packages/bruno-schema-types/src/common/auth.ts
new file mode 100644
index 000000000..b620d64b3
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/auth.ts
@@ -0,0 +1,105 @@
+export interface AuthAwsV4 {
+  accessKeyId?: string | null;
+  secretAccessKey?: string | null;
+  sessionToken?: string | null;
+  service?: string | null;
+  region?: string | null;
+  profileName?: string | null;
+}
+
+export interface AuthBasic {
+  username?: string | null;
+  password?: string | null;
+}
+
+export interface AuthWsse {
+  username?: string | null;
+  password?: string | null;
+}
+
+export interface AuthBearer {
+  token?: string | null;
+}
+
+export interface AuthDigest {
+  username?: string | null;
+  password?: string | null;
+}
+
+export interface AuthNTLM {
+  username?: string | null;
+  password?: string | null;
+  domain?: string | null;
+}
+
+export interface AuthApiKey {
+  key?: string | null;
+  value?: string | null;
+  placement?: 'header' | 'queryparams' | null;
+}
+
+export type OAuthGrantType
+  = | 'client_credentials'
+    | 'password'
+    | 'authorization_code'
+    | 'implicit';
+
+export interface OAuthAdditionalParameter {
+  name?: string | null;
+  value?: string | null;
+  sendIn: 'headers' | 'queryparams' | 'body';
+  enabled?: boolean;
+}
+
+export interface OAuthAdditionalParameters {
+  authorization?: OAuthAdditionalParameter[] | null;
+  token?: OAuthAdditionalParameter[] | null;
+  refresh?: OAuthAdditionalParameter[] | null;
+}
+
+export interface OAuth2 {
+  grantType: OAuthGrantType;
+  username?: string | null;
+  password?: string | null;
+  callbackUrl?: string | null;
+  authorizationUrl?: string | null;
+  accessTokenUrl?: string | null;
+  clientId?: string | null;
+  clientSecret?: string | null;
+  scope?: string | null;
+  state?: string | null;
+  pkce?: boolean | null;
+  credentialsPlacement?: 'body' | 'basic_auth_header' | null;
+  credentialsId?: string | null;
+  tokenPlacement?: string | null;
+  tokenHeaderPrefix?: string | null;
+  tokenQueryKey?: string | null;
+  refreshTokenUrl?: string | null;
+  autoRefreshToken?: boolean | null;
+  autoFetchToken?: boolean | null;
+  additionalParameters?: OAuthAdditionalParameters | null;
+}
+
+export type AuthMode
+  = | 'inherit'
+    | 'none'
+    | 'awsv4'
+    | 'basic'
+    | 'bearer'
+    | 'digest'
+    | 'ntlm'
+    | 'oauth2'
+    | 'wsse'
+    | 'apikey';
+
+export interface Auth {
+  mode: AuthMode;
+  awsv4?: AuthAwsV4 | null;
+  basic?: AuthBasic | null;
+  bearer?: AuthBearer | null;
+  digest?: AuthDigest | null;
+  ntlm?: AuthNTLM | null;
+  oauth2?: OAuth2 | null;
+  wsse?: AuthWsse | null;
+  apikey?: AuthApiKey | null;
+}
diff --git a/packages/bruno-schema-types/src/common/file.ts b/packages/bruno-schema-types/src/common/file.ts
new file mode 100644
index 000000000..1f95c7e24
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/file.ts
@@ -0,0 +1,10 @@
+import type { UID } from './uid';
+
+export interface FileEntry {
+  uid: UID;
+  filePath?: string | null;
+  contentType?: string | null;
+  selected: boolean;
+}
+
+export type FileList = FileEntry[];
diff --git a/packages/bruno-schema-types/src/common/graphql.ts b/packages/bruno-schema-types/src/common/graphql.ts
new file mode 100644
index 000000000..233e16219
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/graphql.ts
@@ -0,0 +1,4 @@
+export interface GraphqlBody {
+  query?: string | null;
+  variables?: string | null;
+}
diff --git a/packages/bruno-schema-types/src/common/index.ts b/packages/bruno-schema-types/src/common/index.ts
new file mode 100644
index 000000000..d19826f59
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/index.ts
@@ -0,0 +1,22 @@
+export type { UID } from './uid';
+export type { KeyValue } from './key-value';
+export type { Variable, Variables } from './variables';
+export type { MultipartFormEntry, MultipartForm } from './multipart-form';
+export type { FileEntry, FileList } from './file';
+export type { GraphqlBody } from './graphql';
+export type { Script } from './scripts';
+export type {
+  Auth,
+  AuthMode,
+  AuthAwsV4,
+  AuthBasic,
+  AuthBearer,
+  AuthDigest,
+  AuthNTLM,
+  AuthWsse,
+  AuthApiKey,
+  OAuth2,
+  OAuthGrantType,
+  OAuthAdditionalParameter,
+  OAuthAdditionalParameters
+} from './auth';
diff --git a/packages/bruno-schema-types/src/common/key-value.ts b/packages/bruno-schema-types/src/common/key-value.ts
new file mode 100644
index 000000000..8007393f2
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/key-value.ts
@@ -0,0 +1,12 @@
+import type { UID } from './uid';
+
+/**
+ * Generic key/value structure used for headers, params, assertions, etc.
+ */
+export interface KeyValue {
+  uid: UID;
+  name?: string | null;
+  value?: string | null;
+  description?: string | null;
+  enabled?: boolean;
+}
diff --git a/packages/bruno-schema-types/src/common/multipart-form.ts b/packages/bruno-schema-types/src/common/multipart-form.ts
new file mode 100644
index 000000000..75200868d
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/multipart-form.ts
@@ -0,0 +1,13 @@
+import type { UID } from './uid';
+
+export interface MultipartFormEntry {
+  uid: UID;
+  type: 'file' | 'text';
+  name?: string | null;
+  value?: string | string[] | null;
+  description?: string | null;
+  contentType?: string | null;
+  enabled?: boolean;
+}
+
+export type MultipartForm = MultipartFormEntry[];
diff --git a/packages/bruno-schema-types/src/common/scripts.ts b/packages/bruno-schema-types/src/common/scripts.ts
new file mode 100644
index 000000000..612325388
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/scripts.ts
@@ -0,0 +1,4 @@
+export interface Script {
+  req?: string | null;
+  res?: string | null;
+}
diff --git a/packages/bruno-schema-types/src/common/uid.ts b/packages/bruno-schema-types/src/common/uid.ts
new file mode 100644
index 000000000..d9228c3d1
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/uid.ts
@@ -0,0 +1,4 @@
+/**
+ * Unique identifier used across Bruno collections.
+ */
+export type UID = string;
diff --git a/packages/bruno-schema-types/src/common/variables.ts b/packages/bruno-schema-types/src/common/variables.ts
new file mode 100644
index 000000000..8d45d1401
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/variables.ts
@@ -0,0 +1,15 @@
+import type { UID } from './uid';
+
+/**
+ * Request-scoped variable entry.
+ */
+export interface Variable {
+  uid: UID;
+  name?: string | null;
+  value?: string | null;
+  description?: string | null;
+  enabled?: boolean;
+  local?: boolean;
+}
+
+export type Variables = Variable[] | null;
diff --git a/packages/bruno-schema-types/src/index.ts b/packages/bruno-schema-types/src/index.ts
new file mode 100644
index 000000000..cdc9ee116
--- /dev/null
+++ b/packages/bruno-schema-types/src/index.ts
@@ -0,0 +1,11 @@
+export * as Common from './common';
+export * as Requests from './requests';
+export * as Collection from './collection';
+
+export type {
+  Collection as BrunoCollection,
+  Item as BrunoItem,
+  Environment as BrunoEnvironment,
+  Environments as BrunoEnvironments
+} from './collection';
+export type { Request as BrunoRequest } from './requests';
diff --git a/packages/bruno-schema-types/src/requests/grpc.ts b/packages/bruno-schema-types/src/requests/grpc.ts
new file mode 100644
index 000000000..20fd70a91
--- /dev/null
+++ b/packages/bruno-schema-types/src/requests/grpc.ts
@@ -0,0 +1,36 @@
+import type { KeyValue, Script, Variables, Auth } from '../common';
+
+export type GrpcMethodType
+  = | 'unary'
+    | 'client-streaming'
+    | 'server-streaming'
+    | 'bidi-streaming'
+    | '';
+
+export interface GrpcMessage {
+  name?: string | null;
+  content?: string | null;
+}
+
+export interface GrpcRequestBody {
+  mode: 'grpc';
+  grpc?: GrpcMessage[] | null;
+}
+
+export interface GrpcRequest {
+  url: string;
+  method?: string | null;
+  methodType?: GrpcMethodType | null;
+  protoPath?: string | null;
+  headers: KeyValue[];
+  auth?: Auth | null;
+  body: GrpcRequestBody;
+  script?: Script | null;
+  vars?: {
+    req: Variables;
+    res: Variables;
+  } | null;
+  assertions?: KeyValue[] | null;
+  tests?: string | null;
+  docs?: string | null;
+}
diff --git a/packages/bruno-schema-types/src/requests/http.ts b/packages/bruno-schema-types/src/requests/http.ts
new file mode 100644
index 000000000..76a387a2e
--- /dev/null
+++ b/packages/bruno-schema-types/src/requests/http.ts
@@ -0,0 +1,55 @@
+import type {
+  KeyValue,
+  Script,
+  Variables,
+  Auth,
+  MultipartForm,
+  FileList,
+  GraphqlBody
+} from '../common';
+
+export type HttpRequestParamType = 'query' | 'path';
+
+export interface HttpRequestParam extends KeyValue {
+  type: HttpRequestParamType;
+}
+
+export type HttpRequestBodyMode
+  = | 'none'
+    | 'json'
+    | 'text'
+    | 'xml'
+    | 'formUrlEncoded'
+    | 'multipartForm'
+    | 'graphql'
+    | 'sparql'
+    | 'file';
+
+export interface HttpRequestBody {
+  mode: HttpRequestBodyMode;
+  json?: string | null;
+  text?: string | null;
+  xml?: string | null;
+  sparql?: string | null;
+  formUrlEncoded?: KeyValue[] | null;
+  multipartForm?: MultipartForm | null;
+  graphql?: GraphqlBody | null;
+  file?: FileList | null;
+}
+
+export interface HttpRequest {
+  url: string;
+  method: string;
+  headers: KeyValue[];
+  params: HttpRequestParam[];
+  auth?: Auth | null;
+  body?: HttpRequestBody | null;
+  script?: Script | null;
+  vars?: {
+    req: Variables;
+    res: Variables;
+  } | null;
+  assertions?: KeyValue[] | null;
+  tests?: string | null;
+  docs?: string | null;
+}
diff --git a/packages/bruno-schema-types/src/requests/index.ts b/packages/bruno-schema-types/src/requests/index.ts
new file mode 100644
index 000000000..4b726734a
--- /dev/null
+++ b/packages/bruno-schema-types/src/requests/index.ts
@@ -0,0 +1,26 @@
+import type { HttpRequest } from './http';
+import type { GrpcRequest } from './grpc';
+import type { WebSocketRequest } from './websocket';
+
+export type {
+  HttpRequest,
+  HttpRequestBody,
+  HttpRequestBodyMode,
+  HttpRequestParam,
+  HttpRequestParamType
+} from './http';
+
+export type {
+  GrpcRequest,
+  GrpcRequestBody,
+  GrpcMessage,
+  GrpcMethodType
+} from './grpc';
+
+export type {
+  WebSocketRequest,
+  WebSocketRequestBody,
+  WebSocketMessage
+} from './websocket';
+
+export type Request = HttpRequest | GrpcRequest | WebSocketRequest;
diff --git a/packages/bruno-schema-types/src/requests/websocket.ts b/packages/bruno-schema-types/src/requests/websocket.ts
new file mode 100644
index 000000000..1781ebfc8
--- /dev/null
+++ b/packages/bruno-schema-types/src/requests/websocket.ts
@@ -0,0 +1,27 @@
+import type { KeyValue, Script, Variables, Auth } from '../common';
+
+export interface WebSocketMessage {
+  name?: string | null;
+  type?: string | null;
+  content?: string | null;
+}
+
+export interface WebSocketRequestBody {
+  mode: 'ws';
+  ws?: WebSocketMessage[] | null;
+}
+
+export interface WebSocketRequest {
+  url: string;
+  headers: KeyValue[];
+  auth?: Auth | null;
+  body: WebSocketRequestBody;
+  script?: Script | null;
+  vars?: {
+    req: Variables;
+    res: Variables;
+  } | null;
+  assertions?: KeyValue[] | null;
+  tests?: string | null;
+  docs?: string | null;
+}
diff --git a/packages/bruno-schema-types/tsconfig.json b/packages/bruno-schema-types/tsconfig.json
new file mode 100644
index 000000000..453972338
--- /dev/null
+++ b/packages/bruno-schema-types/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ESNext",
+    "lib": ["ES2020"],
+    "declaration": true,
+    "declarationMap": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}
+
diff --git a/packages/bruno-tests/collection/lib/constants.js b/packages/bruno-tests/collection/lib/constants.js
index 2f0e62f37..826014e83 100644
--- a/packages/bruno-tests/collection/lib/constants.js
+++ b/packages/bruno-tests/collection/lib/constants.js
@@ -2,4 +2,4 @@ const PI = 3.14;
 
 module.exports = {
   PI
-};
\ No newline at end of file
+};
diff --git a/packages/bruno-tests/collection/scripting/inbuilt modules/crypto-utils/getRandomValues.bru b/packages/bruno-tests/collection/scripting/inbuilt modules/crypto-utils/getRandomValues.bru
index c07e30530..1dd9b379b 100644
--- a/packages/bruno-tests/collection/scripting/inbuilt modules/crypto-utils/getRandomValues.bru	
+++ b/packages/bruno-tests/collection/scripting/inbuilt modules/crypto-utils/getRandomValues.bru	
@@ -15,12 +15,7 @@ assert {
 }
 
 tests {
-  const { doesUint8ArraysWorkAsExpected, getRandomValuesFunction, isUint8Array } = require('./scripting/inbuilt modules/utils.js');
-  
-  if (!doesUint8ArraysWorkAsExpected()) {
-    console.warn('Uint8Array does not work as expected in vm2');
-    return;
-  }
+  const { getRandomValuesFunction, isUint8Array } = require('./scripting/inbuilt modules/utils.js');
   
   // check if Uint8Array work as expected
   test("should get random values", function() {
diff --git a/packages/bruno-tests/collection/scripting/inbuilt modules/utils.js b/packages/bruno-tests/collection/scripting/inbuilt modules/utils.js
index 5b9b86174..569b73393 100644
--- a/packages/bruno-tests/collection/scripting/inbuilt modules/utils.js	
+++ b/packages/bruno-tests/collection/scripting/inbuilt modules/utils.js	
@@ -1,56 +1,38 @@
-const doesUint8ArraysWorkAsExpected = () => {
-  try {
-    const util = require('node:util');
-    // node:vm - true
-    // vm2 - false
-    return util.types.isUint8Array(new Uint8Array(32));
-  }
-  catch (err) {
-    // safe mode [quickjs], will work as expected
-    return true;
-  }
-}
-
 const isUint8Array = (val) => {
   try {
-    // developer mode [node:vm and vm2]
+    // developer mode [node:vm]
     const util = require('node:util');
     return util.types.isUint8Array(val);
-  }
-  catch (err) {
+  } catch (err) {
     // node:util not present in safe mode [quickjs]
     return val instanceof Uint8Array;
   }
-}
+};
 
 const getRandomValuesFunction = (typedArray) => {
   try {
-    // developer mode [node:vm and vm2]
+    // developer mode [node:vm]
     const crypto = require('node:crypto');
     return crypto.getRandomValues(typedArray);
-  }
-  catch (err) {
+  } catch (err) {
     // node:crypto not present in safe mode [quickjs] - uses shim
     return crypto.getRandomValues(typedArray);
   }
-}
+};
 
 const randomBytesFunction = (num) => {
   try {
-    // developer mode [node:vm and vm2]
+    // developer mode [node:vm]
     const crypto = require('node:crypto');
     return crypto.randomBytes(num);
-  }
-  catch (err) {
+  } catch (err) {
     // node:crypto not present in safe mode [quickjs] - uses shim
     return crypto.randomBytes(num);
   }
-}
-
+};
 
 module.exports = {
-  doesUint8ArraysWorkAsExpected,
   isUint8Array,
   getRandomValuesFunction,
   randomBytesFunction
-}
\ No newline at end of file
+};
diff --git a/packages/bruno-tests/package.json b/packages/bruno-tests/package.json
index 45b2ac18d..8cfe133e7 100644
--- a/packages/bruno-tests/package.json
+++ b/packages/bruno-tests/package.json
@@ -26,7 +26,7 @@
     "express-basic-auth": "^1.2.1",
     "fast-xml-parser": "^5.0.8",
     "http-proxy": "^1.18.1",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
     "multer": "^1.4.5-lts.1",
diff --git a/packages/bruno-tests/src/echo/index.js b/packages/bruno-tests/src/echo/index.js
index a9425b305..044065536 100644
--- a/packages/bruno-tests/src/echo/index.js
+++ b/packages/bruno-tests/src/echo/index.js
@@ -52,7 +52,7 @@ router.get('/iso-enc', (req, res) => {
   return res.send(Buffer.from(responseText, 'latin1'));
 });
 
-router.post("/custom", (req, res) => {
+router.post('/custom', (req, res) => {
   const { headers, content, contentBase64, contentJSON, type } = req.body || {};
 
   res._headers = {};
diff --git a/packages/bruno-tests/src/redirect/index.js b/packages/bruno-tests/src/redirect/index.js
index f9dac57c8..7fdf6b526 100644
--- a/packages/bruno-tests/src/redirect/index.js
+++ b/packages/bruno-tests/src/redirect/index.js
@@ -8,8 +8,8 @@ const parseMultipartFormData = (req) => {
       const parts = formDataParser.parse(req);
       const parsedBody = {};
       const files = [];
-      
-      parts.forEach(part => {
+
+      parts.forEach((part) => {
         if (part.filename) {
           files.push({
             fieldname: part.name,
@@ -21,7 +21,7 @@ const parseMultipartFormData = (req) => {
           parsedBody[part.name] = part.value;
         }
       });
-      
+
       return { body: parsedBody, files };
     } catch (error) {
       console.error('Error parsing multipart form data:', error);
@@ -35,11 +35,11 @@ router.post('/multipart-redirect-source', function (req, res) {
   console.log('Multipart redirect source endpoint hit');
   console.log('Method:', req.method);
   console.log('Headers:', req.headers);
-  
+
   const { body, files } = parseMultipartFormData(req);
   console.log('Parsed Body:', body);
   console.log('Files:', files);
-  
+
   res.status(308).location('/api/redirect/multipart-redirect-target').send('Permanently moved');
 });
 
@@ -47,11 +47,11 @@ router.post('/multipart-redirect-target', function (req, res) {
   console.log('Multipart redirect target endpoint hit');
   console.log('Method:', req.method);
   console.log('Headers:', req.headers);
-  
+
   const { body, files } = parseMultipartFormData(req);
   console.log('Parsed Body:', body);
   console.log('Files:', files);
-  
+
   res.json({
     status: 'success',
     method: req.method,
diff --git a/packages/bruno-tests/src/utils/xmlParser.js b/packages/bruno-tests/src/utils/xmlParser.js
index ed765c077..4825d4cd1 100644
--- a/packages/bruno-tests/src/utils/xmlParser.js
+++ b/packages/bruno-tests/src/utils/xmlParser.js
@@ -3,7 +3,7 @@ const { XMLParser } = require('fast-xml-parser');
 const xmlParser = () => {
   const parser = new XMLParser({
     ignoreAttributes: false,
-    allowBooleanAttributes: true,
+    allowBooleanAttributes: true
   });
 
   return (req, res, next) => {
@@ -27,4 +27,4 @@ const xmlParser = () => {
   };
 };
 
-module.exports = xmlParser;
\ No newline at end of file
+module.exports = xmlParser;
diff --git a/playwright/electron.ts b/playwright/electron.ts
index 89f73f25d..1fcd80964 100644
--- a/playwright/electron.ts
+++ b/playwright/electron.ts
@@ -4,7 +4,7 @@ const { _electron: electron } = require('playwright');
 const electronAppPath = path.join(__dirname, '../packages/bruno-electron');
 
 exports.startApp = async () => {
-  const app = await electron.launch({ 
+  const app = await electron.launch({
     args: [electronAppPath]
   });
   const context = await app.context();
diff --git a/scripts/setup.js b/scripts/setup.js
index e0a15bdc1..47d25d657 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -76,8 +76,9 @@ async function setup() {
     execCommand('npm run build:bruno-common', 'Building bruno-common');
     execCommand('npm run build:bruno-converters', 'Building bruno-converters');
     execCommand('npm run build:bruno-requests', 'Building bruno-requests');
+    execCommand('npm run build:schema-types', 'Building schema-types');
     execCommand('npm run build:bruno-filestore', 'Building bruno-filestore');
-
+    
     // Bundle JS sandbox libraries
     execCommand(
       'npm run sandbox:bundle-libraries --workspace=packages/bruno-js',
diff --git a/tests/collection/close-all-collections/close-all-collections.spec.ts b/tests/collection/close-all-collections/close-all-collections.spec.ts
new file mode 100644
index 000000000..c43d06d6d
--- /dev/null
+++ b/tests/collection/close-all-collections/close-all-collections.spec.ts
@@ -0,0 +1,189 @@
+import { execSync } from 'child_process';
+import { test, expect } from '../../../playwright';
+import { Page, ElectronApplication } from '@playwright/test';
+import path from 'path';
+import { openCollectionAndAcceptSandbox } from '../../utils/page/actions';
+import { buildCommonLocators } from '../../utils/page/locators';
+
+/**
+ * Helper function to restart app and get fresh state with locators
+ */
+const restartAppAndGetLocators = async (restartApp: (options?: { initUserDataPath?: string }) => Promise<ElectronApplication>): Promise<{ app: ElectronApplication; page: Page; locators: ReturnType<typeof buildCommonLocators> }> => {
+  const app = await restartApp();
+  const page = await app.firstWindow();
+  await page.locator('[data-app-state="loaded"]').waitFor();
+  const locators = buildCommonLocators(page);
+  return { app, page, locators };
+};
+
+// TODO: These tests need to be updated for the new workspace UI
+// The CollectionsHeader component (with close-all-collections-button) is not rendered in workspace mode
+// The "Remove from workspace" flow is different from the old "Close collection" flow
+test.describe.skip('Close All Collections', () => {
+  test.afterAll(async () => {
+    // Reset the request file to the original state after saving changes
+    execSync(`git checkout -- "${path.join(__dirname, 'fixtures', 'collections', 'collection 1', 'test-request.bru')}"`);
+  });
+
+  test('should show/hide close all icon based on hover state', async ({ pageWithUserData: page }) => {
+    const locators = buildCommonLocators(page);
+
+    await test.step('Verify initial state', async () => {
+      await expect(locators.sidebar.collection('collection 1')).toBeVisible();
+      const closeAllButton = locators.sidebar.closeAllCollectionsButton();
+      await expect(closeAllButton).toHaveCSS('opacity', '0');
+    });
+
+    await test.step('Hover to show icon', async () => {
+      const closeAllButton = locators.sidebar.closeAllCollectionsButton();
+      await locators.sidebar.collectionsContainer().hover();
+      await expect(closeAllButton).toHaveCSS('opacity', '1');
+    });
+
+    await test.step('Move mouse away to hide icon', async () => {
+      const closeAllButton = locators.sidebar.closeAllCollectionsButton();
+      await page.mouse.move(0, 0);
+      await expect(closeAllButton).toHaveCSS('opacity', '0');
+    });
+  });
+
+  test('should handle closing all collections without unsaved changes', async ({ restartApp }) => {
+    const { page, locators } = await restartAppAndGetLocators(restartApp);
+
+    await test.step('Verify collections are visible', async () => {
+      await expect(locators.sidebar.collection('collection 1')).toBeVisible();
+      await expect(locators.sidebar.collection('collection 2')).toBeVisible();
+    });
+
+    await test.step('Cancel closing collections', async () => {
+      // Hover and click close all icon
+      await locators.sidebar.collectionsContainer().hover();
+      await locators.sidebar.closeAllCollectionsButton().click();
+
+      // Verify confirmation modal appears
+      const confirmModal = locators.modal.byTitle('Close all collections');
+      await expect(confirmModal).toBeVisible();
+
+      // Click "Cancel" to dismiss the modal
+      await locators.modal.closeButton().click();
+
+      // Verify collections are still visible
+      await expect(locators.sidebar.collection('collection 1')).toBeVisible();
+      await expect(locators.sidebar.collection('collection 2')).toBeVisible();
+    });
+
+    await test.step('Confirm closing collections', async () => {
+      // Hover and click close all icon again
+      await locators.sidebar.collectionsContainer().hover();
+      await locators.sidebar.closeAllCollectionsButton().click();
+
+      // Verify confirmation modal appears
+      const confirmModal = locators.modal.byTitle('Close all collections');
+      await expect(confirmModal).toBeVisible();
+
+      // Click "Close All" to confirm
+      await locators.modal.button('Close All').click();
+
+      // Verify collections are closed
+      await expect(locators.sidebar.collection('collection 1')).not.toBeVisible();
+      await expect(locators.sidebar.collection('collection 2')).not.toBeVisible();
+    });
+  });
+
+  test('should discard changes and close collections when Discard and Close is clicked', async ({ restartApp }) => {
+    const { page, locators: newLocators } = await restartAppAndGetLocators(restartApp);
+
+    await test.step('Verify collections are visible', async () => {
+      await expect(newLocators.sidebar.collection('collection 1')).toBeVisible();
+      await expect(newLocators.sidebar.collection('collection 2')).toBeVisible();
+    });
+
+    await test.step('Create unsaved changes', async () => {
+      await openCollectionAndAcceptSandbox(page, 'collection 1');
+      await newLocators.sidebar.request('test-request').click();
+
+      const urlContainer = page.locator('#request-url');
+      await expect(urlContainer).toBeVisible();
+
+      const codeMirrorEditor = urlContainer.locator('.CodeMirror');
+      await codeMirrorEditor.click();
+      await page.keyboard.type('modified');
+    });
+
+    await test.step('Trigger close all and discard changes', async () => {
+      await newLocators.sidebar.collectionsContainer().hover();
+      await newLocators.sidebar.closeAllCollectionsButton().click();
+
+      const unsavedChangesModal = newLocators.modal.byTitle('Close all collections');
+      await expect(unsavedChangesModal).toBeVisible();
+      await expect(unsavedChangesModal.getByText('Do you want to save')).toBeVisible();
+
+      await newLocators.modal.button('Discard and Close').click();
+
+      await expect(page.getByText('Closed all collections')).toBeVisible();
+      await expect(newLocators.sidebar.collection('collection 1')).not.toBeVisible();
+      await expect(newLocators.sidebar.collection('collection 2')).not.toBeVisible();
+    });
+
+    await test.step('Restart app to verify changes were discarded', async () => {
+      const { page: restartedPage, locators: restartedLocators } = await restartAppAndGetLocators(restartApp);
+
+      await expect(restartedLocators.sidebar.collection('collection 1')).toBeVisible();
+      await openCollectionAndAcceptSandbox(restartedPage, 'collection 1');
+      await restartedLocators.sidebar.request('test-request').click();
+
+      const urlContainerAfterReopen = restartedPage.locator('#request-url');
+      await expect(urlContainerAfterReopen).toBeVisible();
+      const urlAfterReopen = await urlContainerAfterReopen.locator('.CodeMirror').textContent();
+      expect(urlAfterReopen).not.toContain('modified');
+    });
+  });
+
+  test('should save changes and close collections when Save and Close is clicked', async ({ restartApp }) => {
+    const { page, locators: newLocators } = await restartAppAndGetLocators(restartApp);
+
+    await test.step('Verify collections are visible', async () => {
+      await expect(newLocators.sidebar.collection('collection 1')).toBeVisible();
+      await expect(newLocators.sidebar.collection('collection 2')).toBeVisible();
+    });
+
+    await test.step('Create unsaved changes', async () => {
+      await openCollectionAndAcceptSandbox(page, 'collection 1');
+      await newLocators.sidebar.request('test-request').click();
+
+      const urlContainer = page.locator('#request-url');
+      await expect(urlContainer).toBeVisible();
+
+      const codeMirrorEditor = urlContainer.locator('.CodeMirror');
+      await codeMirrorEditor.click();
+      await page.keyboard.type('modified');
+    });
+
+    await test.step('Trigger close all and save changes', async () => {
+      await newLocators.sidebar.collectionsContainer().hover();
+      await newLocators.sidebar.closeAllCollectionsButton().click();
+
+      const unsavedChangesModal = newLocators.modal.byTitle('Close all collections');
+      await expect(unsavedChangesModal).toBeVisible();
+      await expect(unsavedChangesModal.getByText('Do you want to save')).toBeVisible();
+
+      await newLocators.modal.button('Save and Close').click();
+
+      await expect(newLocators.sidebar.collection('collection 1')).not.toBeVisible();
+      await expect(newLocators.sidebar.collection('collection 2')).not.toBeVisible();
+    });
+
+    await test.step('Restart app to verify changes were saved', async () => {
+      const { page: restartedPage, locators: restartedLocators } = await restartAppAndGetLocators(restartApp);
+
+      await expect(restartedLocators.sidebar.collection('collection 1')).toBeVisible();
+      await openCollectionAndAcceptSandbox(restartedPage, 'collection 1');
+      await restartedLocators.sidebar.request('test-request').click();
+
+      const urlContainerAfterReopen = restartedPage.locator('#request-url');
+      await expect(urlContainerAfterReopen).toBeVisible();
+      const urlAfterReopen = await urlContainerAfterReopen.locator('.CodeMirror').textContent();
+      expect(urlAfterReopen).toContain('modified');
+    });
+  });
+});
diff --git a/tests/collection/close-all-collections/fixtures/collections/collection 1/bruno.json b/tests/collection/close-all-collections/fixtures/collections/collection 1/bruno.json
new file mode 100644
index 000000000..9296360cd
--- /dev/null
+++ b/tests/collection/close-all-collections/fixtures/collections/collection 1/bruno.json	
@@ -0,0 +1,6 @@
+{
+  "version": "1",
+  "name": "collection 1",
+  "type": "collection"
+}
+
diff --git a/tests/collection/close-all-collections/fixtures/collections/collection 1/test-request.bru b/tests/collection/close-all-collections/fixtures/collections/collection 1/test-request.bru
new file mode 100644
index 000000000..4b0a586e9
--- /dev/null
+++ b/tests/collection/close-all-collections/fixtures/collections/collection 1/test-request.bru	
@@ -0,0 +1,12 @@
+meta {
+  name: test-request
+  type: http
+  seq: 1
+}
+
+get {
+  url: https://jsonplaceholder.typicode.com/posts/1
+  body: none
+  auth: none
+}
+
diff --git a/tests/collection/close-all-collections/fixtures/collections/collection 2/bruno.json b/tests/collection/close-all-collections/fixtures/collections/collection 2/bruno.json
new file mode 100644
index 000000000..61e871772
--- /dev/null
+++ b/tests/collection/close-all-collections/fixtures/collections/collection 2/bruno.json	
@@ -0,0 +1,6 @@
+{
+  "version": "1",
+  "name": "collection 2",
+  "type": "collection"
+}
+
diff --git a/tests/collection/close-all-collections/fixtures/collections/collection 2/test-request.bru b/tests/collection/close-all-collections/fixtures/collections/collection 2/test-request.bru
new file mode 100644
index 000000000..5a64399b6
--- /dev/null
+++ b/tests/collection/close-all-collections/fixtures/collections/collection 2/test-request.bru	
@@ -0,0 +1,12 @@
+meta {
+  name: test-request
+  type: http
+  seq: 1
+}
+
+get {
+  url: https://jsonplaceholder.typicode.com/users/1
+  body: none
+  auth: none
+}
+
diff --git a/tests/collection/close-all-collections/init-user-data/preferences.json b/tests/collection/close-all-collections/init-user-data/preferences.json
new file mode 100644
index 000000000..e818ec80e
--- /dev/null
+++ b/tests/collection/close-all-collections/init-user-data/preferences.json
@@ -0,0 +1,7 @@
+{
+  "lastOpenedCollections": [
+    "{{projectRoot}}/tests/collection/close-all-collections/fixtures/collections/collection 1",
+    "{{projectRoot}}/tests/collection/close-all-collections/fixtures/collections/collection 2"
+  ]
+}
+
diff --git a/tests/collection/create/create-collection.spec.ts b/tests/collection/create/create-collection.spec.ts
index 56124a41f..147983a72 100644
--- a/tests/collection/create/create-collection.spec.ts
+++ b/tests/collection/create/create-collection.spec.ts
@@ -8,14 +8,17 @@ test.describe('Create collection', () => {
   });
 
   test('Create collection and add a simple HTTP request', async ({ page, createTmpDir }) => {
-    // Create a new collection
-    await page.getByLabel('Create Collection').click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: '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();
+    const locationInput = page.locator('.bruno-modal').getByLabel('Location');
+    if (await locationInput.isVisible()) {
+      await locationInput.fill(await createTmpDir('test-collection'));
+    }
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'test-collection' }).click();
 
     // Select safe mode
     await page.getByLabel('Safe Mode').check();
@@ -37,4 +40,4 @@ test.describe('Create collection', () => {
     // Verify the response
     await expect(page.getByRole('main')).toContainText('200 OK');
   });
-});
\ No newline at end of file
+});
diff --git a/tests/collection/draft/draft-values-in-requests.spec.ts b/tests/collection/draft/draft-values-in-requests.spec.ts
index 6cff4c811..5fd7c0950 100644
--- a/tests/collection/draft/draft-values-in-requests.spec.ts
+++ b/tests/collection/draft/draft-values-in-requests.spec.ts
@@ -121,6 +121,7 @@ test.describe('Draft values are used in requests', () => {
   });
 
   test('Verify draft for proxy settings are used in HTTP requests', async ({ page, createTmpDir }) => {
+    test.skip(true, 'Temporarily skipping this test because of proxy-related problems');
     const collectionName = 'test-draft-proxy-settings';
 
     // Create a new collection
diff --git a/tests/collection/moving-requests/tag-persistence.spec.ts b/tests/collection/moving-requests/tag-persistence.spec.ts
index 78681d6b9..7ae0020ba 100644
--- a/tests/collection/moving-requests/tag-persistence.spec.ts
+++ b/tests/collection/moving-requests/tag-persistence.spec.ts
@@ -8,12 +8,16 @@ test.describe('Tag persistence', () => {
   });
 
   test('Verify tag persistence while moving requests within a collection', async ({ page, createTmpDir }) => {
-    // Create first collection - click dropdown menu first
-    await page.getByLabel('Create Collection').click();
+    // Create first collection - click plus icon button to open dropdown
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
     await page.getByLabel('Name').fill('test-collection');
-    await page.getByLabel('Location').fill(await createTmpDir('test-collection'));
-    await page.getByRole('button', { name: 'Create', exact: true }).click();
-    await page.getByText('test-collection').click();
+    const locationInput = page.locator('.bruno-modal').getByLabel('Location');
+    if (await locationInput.isVisible()) {
+      await locationInput.fill(await createTmpDir('test-collection'));
+    }
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'test-collection' }).click();
     await page.getByLabel('Safe Mode').check();
     await page.getByRole('button', { name: 'Save' }).click();
 
@@ -51,7 +55,7 @@ test.describe('Tag persistence', () => {
     // Move the request-3 request to just above request-1 within the same collection
     const r3Request = page.locator('.collection-item-name').filter({ hasText: 'request-3' });
     const r1Request = page.locator('.collection-item-name').filter({ hasText: 'request-1' });
-    
+
     await expect(r3Request).toBeVisible();
     await expect(r1Request).toBeVisible();
 
@@ -74,12 +78,16 @@ test.describe('Tag persistence', () => {
   });
 
   test('verify tag persistence while moving requests between folders', async ({ page, createTmpDir }) => {
-    // Create first collection - click dropdown menu first
-    await page.getByLabel('Create Collection').click();
+    // Create first collection - click plus icon button to open dropdown
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
     await page.getByLabel('Name').fill('test-collection');
-    await page.getByLabel('Location').fill(await createTmpDir('test-collection'));
-    await page.getByRole('button', { name: 'Create', exact: true }).click();
-    await page.getByText('test-collection').click();
+    const locationInput = page.locator('.bruno-modal').getByLabel('Location');
+    if (await locationInput.isVisible()) {
+      await locationInput.fill(await createTmpDir('test-collection'));
+    }
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'test-collection' }).click();
     await page.getByLabel('Safe Mode').check();
     await page.getByRole('button', { name: 'Save' }).click();
 
@@ -100,7 +108,7 @@ test.describe('Tag persistence', () => {
 
     await page.locator('.collection-item-name').filter({ hasText: 'folder-1' }).hover();
     await page.locator('.collection-item-name').filter({ hasText: 'folder-1' }).locator('.menu-icon').click();
-    await page.locator('.dropdown-item').getByText('New Request').click()
+    await page.locator('.dropdown-item').getByText('New Request').click();
     await page.getByRole('textbox', { name: 'Request Name' }).fill('request-1');
     await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
     await page.getByRole('button', { name: 'Create' }).click();
@@ -110,7 +118,7 @@ test.describe('Tag persistence', () => {
       .filter({ hasText: 'folder-1' }).hover();
     await page.locator('.collection-item-name')
       .filter({ hasText: 'folder-1' }).locator('.menu-icon').click();
-    await page.locator('.dropdown-item').getByText('New Request').click()
+    await page.locator('.dropdown-item').getByText('New Request').click();
     await page.getByRole('textbox', { name: 'Request Name' }).fill('request-2');
     await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
     await page.getByRole('button', { name: 'Create' }).click();
@@ -145,12 +153,12 @@ test.describe('Tag persistence', () => {
     await page.getByRole('textbox', { name: 'Request Name' }).fill('request-3');
     await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
     await page.getByRole('button', { name: 'Create' }).click();
-    
+
     // Drag and drop request-2 request to folder-2 folder
     const r2Request = page.locator('.collection-item-name').filter({ hasText: 'request-2' });
     const f2Folder = page.locator('.collection-item-name').filter({ hasText: 'folder-2' });
     await r2Request.dragTo(f2Folder);
-    
+
     // Verify the requests are still in the collection and request-2 is now in folder-2 folder
     await expect(page.locator('.collection-item-name').filter({ hasText: 'request-2' })).toBeVisible();
     await expect(page.locator('.collection-item-name').filter({ hasText: 'folder-2' })).toBeVisible();
diff --git a/tests/collection/moving-tabs/move-tabs.spec.ts b/tests/collection/moving-tabs/move-tabs.spec.ts
index 8a590e0c6..6700ff05b 100644
--- a/tests/collection/moving-tabs/move-tabs.spec.ts
+++ b/tests/collection/moving-tabs/move-tabs.spec.ts
@@ -9,11 +9,14 @@ test.describe('Move tabs', () => {
 
   test('Verify tab move by drag and drop', async ({ page, createTmpDir }) => {
     // Create a collection
-    await page.locator('.dropdown-icon').click();
-    await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
     await page.getByLabel('Name').fill('source-collection-drag-drop');
-    await page.getByLabel('Location').fill(await createTmpDir('source-collection-drag-drop'));
-    await page.getByRole('button', { name: 'Create', exact: true }).click();
+    const locationInput = page.locator('.bruno-modal').getByLabel('Location');
+    if (await locationInput.isVisible()) {
+      await locationInput.fill(await createTmpDir('source-collection-drag-drop'));
+    }
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
 
     // Wait for collection to appear and click on it
     await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'source-collection-drag-drop' })).toBeVisible();
@@ -97,11 +100,14 @@ test.describe('Move tabs', () => {
 
   test('Verify tab move by keyboard shortcut', async ({ page, createTmpDir }) => {
     // Create a collection
-    await page.locator('.dropdown-icon').click();
-    await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
     await page.getByLabel('Name').fill('source-collection-keyboard-shortcut');
-    await page.getByLabel('Location').fill(await createTmpDir('source-collection-keyboard-shortcut'));
-    await page.getByRole('button', { name: 'Create', exact: true }).click();
+    const locationInput2 = page.locator('.bruno-modal').getByLabel('Location');
+    if (await locationInput2.isVisible()) {
+      await locationInput2.fill(await createTmpDir('source-collection-keyboard-shortcut'));
+    }
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
 
     // Wait for collection to appear and click on it
     await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'source-collection-keyboard-shortcut' })).toBeVisible();
diff --git a/tests/collection/open/open-multiple-collections.spec.ts b/tests/collection/open/open-multiple-collections.spec.ts
index 6865986ac..835ffbe5f 100644
--- a/tests/collection/open/open-multiple-collections.spec.ts
+++ b/tests/collection/open/open-multiple-collections.spec.ts
@@ -1,7 +1,6 @@
 import { test, expect } from '../../../playwright';
 import * as path from 'path';
 import * as fs from 'fs';
-
 import { closeAllCollections } from '../../utils/page';
 
 test.describe('Open Multiple Collections', () => {
@@ -57,8 +56,9 @@ test.describe('Open Multiple Collections', () => {
 
     await expect(page.locator('#sidebar-collection-name').getByText('Test Collection 1')).not.toBeVisible();
 
-    // Click on Open Collection button
-    await page.locator('button').filter({ hasText: 'Open Collection' }).click();
+    // Click on plus icon button and then "Open collection" in the dropdown
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Open collection' }).click();
 
     // Wait for both collections to appear in the sidebar
     const collection1Element = page.locator('#sidebar-collection-name').getByText('Test Collection 1');
@@ -80,6 +80,9 @@ test.describe('Open Multiple Collections', () => {
     const collection1Dir = await createTmpDir('collection-1');
     const collection2Dir = 'invalid-collection-path';
 
+    // Count collections before attempting to open invalid ones
+    const collectionCountBefore = await page.locator('#sidebar-collection-name').count();
+
     // Mock the electron dialog to return multiple folder selections
     await electronApp.evaluate(({ dialog }, { collection1Dir, collection2Dir }) => {
       dialog.showOpenDialog = async () => ({
@@ -89,20 +92,17 @@ test.describe('Open Multiple Collections', () => {
     },
     { collection1Dir, collection2Dir });
 
-    await expect(page.locator('#sidebar-collection-name').getByText('Test Collection 1')).not.toBeVisible();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Open collection' }).click();
 
-    // Click on Open Collection button
-    await page.getByRole('button', { name: 'Open Collection' }).click();
+    // Wait for error toasts to appear
+    await page.waitForTimeout(1000);
 
     // Verify no collections were opened
-    await expect(page.locator('#sidebar-collection-name')).toHaveCount(0);
+    await expect(page.locator('#sidebar-collection-name')).toHaveCount(collectionCountBefore);
 
     // Verify invalid collection error
-    const invalidCollectionError = page.getByText('The collection is not valid (bruno.json not found)').first();
+    const invalidCollectionError = page.getByText('The collection is not valid').first();
     await expect(invalidCollectionError).toBeVisible();
-
-    // Verify invalid path error
-    const invalidPathError = page.getByText('Some selected folders could not be opened').getByText('invalid-collection-path').first();
-    await expect(invalidPathError).toBeVisible();
   });
 });
diff --git a/tests/cookies/corrupted-passkey.spec.ts b/tests/cookies/corrupted-passkey.spec.ts
index 02c2a5010..dcdd72984 100644
--- a/tests/cookies/corrupted-passkey.spec.ts
+++ b/tests/cookies/corrupted-passkey.spec.ts
@@ -23,7 +23,7 @@ test('should handle corrupted passkey and still display saved cookie list', asyn
   await page1.getByRole('button', { name: 'Save' }).click();
 
   await expect(page1.getByText('example.com')).toBeVisible();
-  
+
   await app1.close();
 
   // 2. Corrupt the encryptedPasskey in cookies.json
diff --git a/tests/environments/create-environment/collection-env-create.spec.ts b/tests/environments/create-environment/collection-env-create.spec.ts
index 1a34e2fc8..f44439f2d 100644
--- a/tests/environments/create-environment/collection-env-create.spec.ts
+++ b/tests/environments/create-environment/collection-env-create.spec.ts
@@ -9,7 +9,8 @@ test.describe('Collection Environment Create Tests', () => {
     const openApiFile = path.join(__dirname, 'fixtures', 'bruno-collection.json');
 
     // Import test collection
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     const importModal = page.locator('[data-testid="import-collection-modal"]');
     await importModal.waitFor({ state: 'visible' });
@@ -21,7 +22,7 @@ test.describe('Collection Environment Create Tests', () => {
     await expect(locationModal.getByText('test_collection')).toBeVisible();
 
     await page.locator('#collection-location').fill(await createTmpDir('env-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'test_collection' })).toBeVisible();
 
@@ -113,18 +114,13 @@ test.describe('Collection Environment Create Tests', () => {
     await expect(responsePane).toContainText('"body": "This is a test post body with environment variables"');
     await expect(responsePane).toContainText('"apiToken": "super-secret-token-12345"');
 
-    // Cleanup
-    await page
-      .locator('.collection-name')
-      .filter({ has: page.locator('#sidebar-collection-name:has-text("test_collection")') })
-      .locator('.collection-actions')
-      .click();
-    await page.locator('.dropdown-item').filter({ hasText: 'Close' }).click();
-    // Scope the Close button to the confirmation modal to avoid matching the dropdown close button
-    // Wait for the confirmation modal with "Close Collection" title to appear
-    const closeModal = page.getByRole('dialog').filter({ has: page.getByText('Close Collection') });
-    await closeModal.getByRole('button', { name: 'Close' }).click();
+    // Cleanup - use new "Remove" action in workspace UI
+    const collectionRow = page.locator('.collection-name').filter({ has: page.locator('#sidebar-collection-name:has-text("test_collection")') });
+    await collectionRow.hover();
+    await collectionRow.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Remove' }).click();
 
-    await page.locator('.bruno-logo').click();
+    const closeModal = page.getByRole('dialog').filter({ has: page.getByText('Remove Collection') });
+    await closeModal.getByRole('button', { name: 'Remove' }).click();
   });
 });
diff --git a/tests/environments/create-environment/global-env-create.spec.ts b/tests/environments/create-environment/global-env-create.spec.ts
index 5ca860fce..32ffa6641 100644
--- a/tests/environments/create-environment/global-env-create.spec.ts
+++ b/tests/environments/create-environment/global-env-create.spec.ts
@@ -1,5 +1,6 @@
 import { test, expect } from '../../../playwright';
 import path from 'path';
+import { closeAllCollections } from '../../utils/page';
 
 test.describe('Global Environment Create Tests', () => {
   test('should import collection and create global environment for request usage', async ({
@@ -9,20 +10,22 @@ test.describe('Global Environment Create Tests', () => {
     const openApiFile = path.join(__dirname, 'fixtures', 'bruno-collection.json');
 
     // Import test collection
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     const importModal = page.locator('[data-testid="import-collection-modal"]');
     await importModal.waitFor({ state: 'visible' });
 
     await page.setInputFiles('input[type="file"]', openApiFile);
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
 
+    // Wait for location modal to appear after file processing
     const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
     await expect(locationModal.getByText('test_collection')).toBeVisible();
 
     await page.locator('#collection-location').fill(await createTmpDir('global-env-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'test_collection' })).toBeVisible();
 
@@ -116,18 +119,7 @@ test.describe('Global Environment Create Tests', () => {
     await expect(responsePane).toContainText('"body": "This is a global test post body with environment variables"');
     await expect(responsePane).toContainText('"apiToken": "global-secret-token-12345"');
 
-    // Cleanup
-    await page
-      .locator('.collection-name')
-      .filter({ has: page.locator('#sidebar-collection-name:has-text("test_collection")') })
-      .locator('.collection-actions')
-      .click();
-    await page.locator('.dropdown-item').filter({ hasText: 'Close' }).click();
-    // Scope the Close button to the confirmation modal to avoid matching the dropdown close button
-    // Wait for the confirmation modal with "Close Collection" title to appear
-    const closeModal = page.getByRole('dialog').filter({ has: page.getByText('Close Collection') });
-    await closeModal.getByRole('button', { name: 'Close' }).click();
-
-    await page.locator('.bruno-logo').click();
+    // cleanup: close all collections
+    await closeAllCollections(page);
   });
 });
diff --git a/tests/environments/import-environment/collection-env-import.spec.ts b/tests/environments/import-environment/collection-env-import.spec.ts
index 0e5097f54..fa6ac1c8c 100644
--- a/tests/environments/import-environment/collection-env-import.spec.ts
+++ b/tests/environments/import-environment/collection-env-import.spec.ts
@@ -12,24 +12,24 @@ test.describe('Collection Environment Import Tests', () => {
     const envFile = path.join(__dirname, 'fixtures', 'collection-env.json');
 
     // Import test collection
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     const importModal = page.locator('[data-testid="import-collection-modal"]');
     await importModal.waitFor({ state: 'visible' });
 
     await page.setInputFiles('input[type="file"]', openApiFile);
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
 
     const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
     await expect(locationModal.getByText('Environment Test Collection')).toBeVisible();
 
+    // Select a location and import
     await page.locator('#collection-location').fill(await createTmpDir('collection-env-import-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     await expect(
-      page.locator('#sidebar-collection-name').filter({ hasText: 'Environment Test Collection' })
-    ).toBeVisible();
+      page.locator('#sidebar-collection-name').filter({ hasText: 'Environment Test Collection' })).toBeVisible({ timeout: 10000 });
 
     // Configure collection
     await page.locator('#sidebar-collection-name').filter({ hasText: 'Environment Test Collection' }).click();
diff --git a/tests/environments/import-environment/global-env-import.spec.ts b/tests/environments/import-environment/global-env-import.spec.ts
index 0327ae830..917675ef9 100644
--- a/tests/environments/import-environment/global-env-import.spec.ts
+++ b/tests/environments/import-environment/global-env-import.spec.ts
@@ -1,5 +1,6 @@
 import { test, expect } from '../../../playwright';
 import path from 'path';
+import { closeAllCollections } from '../../utils/page';
 
 test.describe('Global Environment Import Tests', () => {
   test('should import global environment from file', async ({ newPage: page, createTmpDir }) => {
@@ -7,24 +8,23 @@ test.describe('Global Environment Import Tests', () => {
     const globalEnvFile = path.join(__dirname, 'fixtures', 'global-env.json');
 
     // Import test collection
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     const importModal = page.locator('[data-testid="import-collection-modal"]');
     await importModal.waitFor({ state: 'visible' });
 
     await page.setInputFiles('input[type="file"]', openApiFile);
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
 
     const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
     await expect(locationModal.getByText('Environment Test Collection')).toBeVisible();
 
     await page.locator('#collection-location').fill(await createTmpDir('global-env-import-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     await expect(
-      page.locator('#sidebar-collection-name').filter({ hasText: 'Environment Test Collection' })
-    ).toBeVisible();
+      page.locator('#sidebar-collection-name').filter({ hasText: 'Environment Test Collection' })).toBeVisible({ timeout: 10000 });
 
     // Configure collection
     await page.locator('#sidebar-collection-name').filter({ hasText: 'Environment Test Collection' }).click();
@@ -79,15 +79,7 @@ test.describe('Global Environment Import Tests', () => {
     await page.locator('[data-testid="response-status-code"]').waitFor({ state: 'visible' });
     await expect(page.locator('[data-testid="response-status-code"]')).toContainText('201');
 
-    // Cleanup
-    await page.locator('#sidebar-collection-name').filter({ hasText: 'Environment Test Collection' }).click();
-    await page
-      .locator('.collection-name')
-      .filter({ has: page.locator('#sidebar-collection-name:has-text("Environment Test Collection")') })
-      .locator('.collection-actions')
-      .click();
-    await page.locator('.dropdown-item').filter({ hasText: 'Close' }).click();
-    await page.locator('.dropdown-item').filter({ hasText: 'Close' }).waitFor({ state: 'detached' });
-    await page.getByRole('button', { name: 'Close' }).click();
+    // cleanup: close all collections
+    await closeAllCollections(page);
   });
 });
diff --git a/tests/environments/multiline-variables/read-multiline-environment.spec.ts b/tests/environments/multiline-variables/read-multiline-environment.spec.ts
index fdf2fefc7..d9ec80636 100644
--- a/tests/environments/multiline-variables/read-multiline-environment.spec.ts
+++ b/tests/environments/multiline-variables/read-multiline-environment.spec.ts
@@ -5,8 +5,9 @@ test.describe('Multiline Variables - Read Environment Test', () => {
     test.setTimeout(30 * 1000);
 
     // open the collection
-    await expect(page.getByTitle('multiline-variables')).toBeVisible();
-    await page.getByTitle('multiline-variables').click();
+    const collection = page.getByTestId('collections').locator('#sidebar-collection-name').filter({ hasText: 'multiline-variables' });
+    await expect(collection).toBeVisible();
+    await collection.click();
 
     // open request
     await expect(page.getByTitle('request', { exact: true })).toBeVisible();
diff --git a/tests/environments/multiline-variables/write-multiline-variable.spec.ts b/tests/environments/multiline-variables/write-multiline-variable.spec.ts
index 1127ed369..d774d88a3 100644
--- a/tests/environments/multiline-variables/write-multiline-variable.spec.ts
+++ b/tests/environments/multiline-variables/write-multiline-variable.spec.ts
@@ -5,8 +5,9 @@ test.describe('Multiline Variables - Write Test', () => {
     test.setTimeout(60 * 1000);
 
     // open the collection
-    await expect(page.getByTitle('multiline-variables')).toBeVisible();
-    await page.getByTitle('multiline-variables').click();
+    const collection = page.getByTestId('collections').locator('#sidebar-collection-name').filter({ hasText: 'multiline-variables' });
+    await expect(collection).toBeVisible();
+    await collection.click();
 
     // open request
     await expect(page.getByTitle('multiline-test', { exact: true })).toBeVisible();
@@ -70,8 +71,8 @@ test.describe('Multiline Variables - Write Test', () => {
     await expect(page.locator('.response-status-code')).toContainText('200');
 
     // verify multiline JSON variable resolution in response
-    const expectedBody =
-      '{\n  "user": {\n    "name": "John Doe",\n    "email": "john@example.com",\n    "preferences": {\n      "theme": "dark",\n      "notifications": true\n    }\n  },\n  "metadata": {\n    "created": "2025-09-03",\n    "version": "1.0"\n  }\n}';
+    const expectedBody
+      = '{\n  "user": {\n    "name": "John Doe",\n    "email": "john@example.com",\n    "preferences": {\n      "theme": "dark",\n      "notifications": true\n    }\n  },\n  "metadata": {\n    "created": "2025-09-03",\n    "version": "1.0"\n  }\n}';
     await expect(page.locator('.response-pane')).toContainText(`"body": ${JSON.stringify(expectedBody)}`);
   });
 
@@ -88,8 +89,4 @@ test.describe('Multiline Variables - Write Test', () => {
 
     fs.writeFileSync(testBruPath, content);
   });
-
-  test.afterAll(async ({ page }) => {
-    await page.locator('.bruno-logo').click();
-  });
 });
diff --git a/tests/footer/notifications/notifications.spec.js b/tests/footer/notifications/notifications.spec.js
index 238afcc98..51da3805b 100644
--- a/tests/footer/notifications/notifications.spec.js
+++ b/tests/footer/notifications/notifications.spec.js
@@ -4,22 +4,22 @@ test.describe('Notifications Modal', () => {
   test('should open notifications modal when clicking bell icon and close with close button', async ({ page }) => {
     // Get the notification bell icon in the status bar
     const notificationBell = page.getByLabel('Check all Notifications');
-    
+
     // Click on the bell icon to open notifications
     await notificationBell.click();
-    
+
     // Get modal elements
     const notificationsModal = page.locator('.bruno-modal');
     const modalCloseButton = notificationsModal.locator('div.bruno-modal-header div.close');
-    
+
     // Verify modal is visible and has the correct title
     await expect(notificationsModal).toBeVisible();
     await expect(notificationsModal.locator('.bruno-modal-header-title')).toContainText('NOTIFICATIONS');
-    
+
     // Click the close button
     await modalCloseButton.click();
-    
+
     // Verify modal is closed
     await expect(notificationsModal).not.toBeVisible();
   });
-});
\ No newline at end of file
+});
diff --git a/tests/footer/sidebar-toggle/sidebar-toggle.spec.js b/tests/footer/sidebar-toggle/sidebar-toggle.spec.js
index d8e7dfb21..01f1a2ac1 100644
--- a/tests/footer/sidebar-toggle/sidebar-toggle.spec.js
+++ b/tests/footer/sidebar-toggle/sidebar-toggle.spec.js
@@ -6,14 +6,14 @@ test.describe('Sidebar Toggle', () => {
     const sidebar = page.locator('aside.sidebar');
     const toggleButton = page.getByLabel('Toggle Sidebar');
     const dragHandle = page.locator('.sidebar-drag-handle');
-    
+
     // Initial state - sidebar and drag handle should be visible
     await expect(sidebar).toBeVisible();
     await expect(dragHandle).toBeVisible();
-    
+
     // Click toggle to hide sidebar
     await toggleButton.click();
-    
+
     // Wait for transition to complete and verify sidebar and drag handle are hidden
     await expect(sidebar).not.toBeVisible();
     await expect(dragHandle).not.toBeVisible();
@@ -21,10 +21,10 @@ test.describe('Sidebar Toggle', () => {
     // Verify the sidebar has collapsed width
     const sidebarBox = await sidebar.boundingBox();
     expect(sidebarBox?.width).toBe(0);
-    
+
     // Click toggle again to show sidebar
     await toggleButton.click();
-    
+
     // Wait for transition and verify sidebar and drag handle are visible again
     await expect(sidebar).toBeVisible();
     await expect(dragHandle).toBeVisible();
@@ -33,4 +33,4 @@ test.describe('Sidebar Toggle', () => {
     const expandedSidebarBox = await sidebar.boundingBox();
     expect(expandedSidebarBox?.width).toBeGreaterThan(0);
   });
-});
\ No newline at end of file
+});
diff --git a/tests/grpc/make-request/fixtures/collection/HelloService/BidiHello.bru b/tests/grpc/make-request/fixtures/collection/HelloService/BidiHello.bru
new file mode 100644
index 000000000..77b0daf53
--- /dev/null
+++ b/tests/grpc/make-request/fixtures/collection/HelloService/BidiHello.bru
@@ -0,0 +1,31 @@
+meta {
+  name: BidiHello
+  type: grpc
+  seq: 4
+}
+
+grpc {
+  url: {{host}}
+  method: /hello.HelloService/BidiHello
+  body: grpc
+  auth: inherit
+  methodType: bidi-streaming
+}
+
+body:grpc {
+  name: message 1
+  content: '''
+    {
+      "greeting": "cuius"
+    }
+  '''
+}
+
+body:grpc {
+  name: message 2
+  content: '''
+    {
+      "greeting": "adfectus"
+    }
+  '''
+}
diff --git a/tests/grpc/make-request/fixtures/collection/HelloService/LotOfGreetings.bru b/tests/grpc/make-request/fixtures/collection/HelloService/LotOfGreetings.bru
new file mode 100644
index 000000000..473d6e28d
--- /dev/null
+++ b/tests/grpc/make-request/fixtures/collection/HelloService/LotOfGreetings.bru
@@ -0,0 +1,31 @@
+meta {
+  name: LotOfGreetings
+  type: grpc
+  seq: 3
+}
+
+grpc {
+  url: {{host}}
+  method: /hello.HelloService/LotsOfGreetings
+  body: grpc
+  auth: inherit
+  methodType: client-streaming
+}
+
+body:grpc {
+  name: message 1
+  content: '''
+    {
+      "greeting": "sortitus"
+    }
+  '''
+}
+
+body:grpc {
+  name: message 2
+  content: '''
+    {
+      "greeting": "porro"
+    }
+  '''
+}
diff --git a/tests/grpc/make-request/fixtures/collection/HelloService/LotOfReplies.bru b/tests/grpc/make-request/fixtures/collection/HelloService/LotOfReplies.bru
new file mode 100644
index 000000000..c0556bb7e
--- /dev/null
+++ b/tests/grpc/make-request/fixtures/collection/HelloService/LotOfReplies.bru
@@ -0,0 +1,22 @@
+meta {
+  name: LotOfReplies
+  type: grpc
+  seq: 2
+}
+
+grpc {
+  url: {{host}}
+  method: /hello.HelloService/LotsOfReplies
+  body: grpc
+  auth: inherit
+  methodType: server-streaming
+}
+
+body:grpc {
+  name: message 1
+  content: '''
+    {
+      "greeting": "suadeo"
+    }
+  '''
+}
diff --git a/tests/grpc/make-request/fixtures/collection/HelloService/SayHello.bru b/tests/grpc/make-request/fixtures/collection/HelloService/SayHello.bru
new file mode 100644
index 000000000..8b6ee12ad
--- /dev/null
+++ b/tests/grpc/make-request/fixtures/collection/HelloService/SayHello.bru
@@ -0,0 +1,22 @@
+meta {
+  name: SayHello
+  type: grpc
+  seq: 1
+}
+
+grpc {
+  url: {{host}}
+  method: /hello.HelloService/SayHello
+  body: grpc
+  auth: inherit
+  methodType: unary
+}
+
+body:grpc {
+  name: message 1
+  content: '''
+    {
+      "greeting": "amoveo"
+    }
+  '''
+}
diff --git a/tests/grpc/make-request/fixtures/collection/HelloService/folder.bru b/tests/grpc/make-request/fixtures/collection/HelloService/folder.bru
new file mode 100644
index 000000000..f69c64528
--- /dev/null
+++ b/tests/grpc/make-request/fixtures/collection/HelloService/folder.bru
@@ -0,0 +1,8 @@
+meta {
+  name: HelloService
+  seq: 2
+}
+
+auth {
+  mode: inherit
+}
diff --git a/tests/grpc/make-request/fixtures/collection/bruno.json b/tests/grpc/make-request/fixtures/collection/bruno.json
new file mode 100644
index 000000000..50c4d912e
--- /dev/null
+++ b/tests/grpc/make-request/fixtures/collection/bruno.json
@@ -0,0 +1,33 @@
+{
+  "version": "1",
+  "name": "Grpcbin",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ],
+  "size": 0.001827239990234375,
+  "filesCount": 10,
+  "protobuf": {
+    "protoFiles": [
+      {
+        "path": "../protos/services/product.proto",
+        "type": "file"
+      },
+      {
+        "path": "../protos/services/order.proto",
+        "type": "file"
+      }
+    ],
+    "importPaths": [
+      {
+        "path": "../protos/types",
+        "enabled": false
+      },
+      {
+        "path": ".",
+        "enabled": true
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/tests/grpc/make-request/fixtures/collection/collection.bru b/tests/grpc/make-request/fixtures/collection/collection.bru
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/grpc/make-request/fixtures/collection/environments/Env.bru b/tests/grpc/make-request/fixtures/collection/environments/Env.bru
new file mode 100644
index 000000000..c5dbd6b76
--- /dev/null
+++ b/tests/grpc/make-request/fixtures/collection/environments/Env.bru
@@ -0,0 +1,3 @@
+vars {
+  host: grpc://grpcb.in:9000
+}
diff --git a/tests/grpc/make-request/init-user-data/collection-security.json b/tests/grpc/make-request/init-user-data/collection-security.json
new file mode 100644
index 000000000..f91f9e1af
--- /dev/null
+++ b/tests/grpc/make-request/init-user-data/collection-security.json
@@ -0,0 +1,10 @@
+{
+  "collections": [
+    {
+      "path": "{{projectRoot}}/tests/grpc/make-request/fixtures/collection",
+      "securityConfig": {
+        "jsSandboxMode": "safe"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/grpc/make-request/init-user-data/preferences.json b/tests/grpc/make-request/init-user-data/preferences.json
new file mode 100644
index 000000000..a87c220ad
--- /dev/null
+++ b/tests/grpc/make-request/init-user-data/preferences.json
@@ -0,0 +1,11 @@
+{
+  "maximized": false,
+  "lastOpenedCollections": [
+    "{{projectRoot}}/tests/grpc/make-request/fixtures/collection"
+  ],
+  "preferences": {
+    "beta": {
+      "nodevm": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/grpc/make-request/make-request.spec.ts b/tests/grpc/make-request/make-request.spec.ts
new file mode 100644
index 000000000..3aa630618
--- /dev/null
+++ b/tests/grpc/make-request/make-request.spec.ts
@@ -0,0 +1,202 @@
+import { test, expect } from '../../../playwright';
+import { buildGrpcCommonLocators } from '../../utils/page/locators';
+
+test.describe('make grpc requests', () => {
+  const setupGrpcTest = async (page) => {
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('navigate to gRPC collection', async () => {
+      await locators.sidebar.collection('Grpcbin').click();
+      await locators.sidebar.folder('HelloService').click();
+    });
+
+    await test.step('select environment', async () => {
+      await locators.environment.selector().click();
+      await locators.environment.collectionTab().click();
+      await locators.environment.envOption('Env').click();
+    });
+  };
+
+  test('make unary request', async ({ pageWithUserData: page }) => {
+    await setupGrpcTest(page);
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('select unary method', async () => {
+      await locators.sidebar.request('SayHello').click();
+      await expect(locators.method.dropdownTrigger()).toContainText('HelloService/SayHello');
+    });
+
+    await test.step('verify gRPC unary request is opened successfully', async () => {
+      await expect(locators.method.indicator()).toContainText('gRPC');
+      await expect(locators.request.queryUrlContainer().locator('.CodeMirror')).toBeVisible();
+      await expect(locators.request.sendButton()).toBeVisible();
+      await expect(locators.request.messagesContainer()).toBeVisible();
+    });
+
+    await test.step('send request', async () => {
+      await locators.request.sendButton().click();
+      await expect(locators.response.statusCode()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusText()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusCode()).toHaveText(/0/);
+      await expect(locators.response.statusText()).toHaveText(/OK/);
+    });
+
+    await test.step('verify response message count', async () => {
+      await expect(locators.response.tabCount()).toHaveText('1');
+    });
+
+    await test.step('verify response items are rendered', async () => {
+      await expect(locators.response.content()).toBeVisible();
+      await expect(locators.response.container()).toBeVisible();
+      await expect(locators.response.singleResponse()).toBeVisible();
+    });
+
+    /* TODO: Reflection fetching incorrectly marks requests as modified, causing save indicators to appear. This save step prevents test timeouts by clearing the modified state. This is a temporary workaround until the reflection fetching issue is resolved. */
+    await test.step('save request via shortcut', async () => {
+      await page.keyboard.press('Meta+s');
+    });
+  });
+
+  test('make server streaming request', async ({ pageWithUserData: page }) => {
+    await setupGrpcTest(page);
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('select server streaming method', async () => {
+      await locators.sidebar.request('LotOfReplies').click();
+      await expect(locators.method.dropdownTrigger()).toContainText('HelloService/LotsOfReplies');
+    });
+
+    await test.step('verify gRPC server streaming request is opened successfully', async () => {
+      await expect(locators.method.indicator()).toContainText('gRPC');
+      await expect(locators.request.queryUrlContainer().locator('.CodeMirror')).toBeVisible();
+      await expect(locators.request.messagesContainer()).toBeVisible();
+      await expect(locators.request.sendButton()).toBeVisible();
+    });
+
+    await test.step('send request', async () => {
+      await locators.request.sendButton().click();
+      await expect(locators.response.statusCode()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusText()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusCode()).toHaveText(/0/);
+      await expect(locators.response.statusText()).toHaveText(/OK/);
+    });
+
+    await test.step('verify response message count', async () => {
+      await expect(locators.response.tabCount()).toHaveText('10');
+    });
+
+    await test.step('verify response items are rendered', async () => {
+      await expect(locators.response.content()).toBeVisible();
+      await expect(locators.response.container()).toBeVisible();
+      await expect(locators.response.accordion()).toBeVisible();
+      await expect(locators.response.responseItems()).toHaveCount(10);
+    });
+
+    /* TODO: Reflection fetching incorrectly marks requests as modified, causing save indicators to appear. This save step prevents test timeouts by clearing the modified state. This is a temporary workaround until the reflection fetching issue is resolved. */
+    await test.step('save request via shortcut', async () => {
+      await page.keyboard.press('Meta+s');
+    });
+  });
+
+  test('make client streaming request', async ({ pageWithUserData: page }) => {
+    await setupGrpcTest(page);
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('select client streaming method', async () => {
+      await locators.sidebar.request('LotOfGreetings').click();
+      await expect(locators.method.dropdownTrigger()).toContainText('HelloService/LotsOfGreetings');
+    });
+
+    await test.step('verify gRPC client streaming request is opened successfully', async () => {
+      await expect(locators.request.queryUrlContainer().locator('.CodeMirror')).toBeVisible();
+      await expect(locators.request.messagesContainer()).toBeVisible();
+      await expect(locators.request.addMessageButton()).toBeVisible();
+      await expect(locators.request.sendMessage(0)).toBeVisible();
+      await expect(locators.request.sendButton()).toBeVisible();
+    });
+
+    await test.step('start client streaming connection', async () => {
+      await locators.request.sendButton().click();
+      await expect(locators.request.endConnectionButton()).toBeVisible();
+    });
+
+    await test.step('send individual message', async () => {
+      await locators.request.sendMessage(0).click();
+    });
+
+    await test.step('end client streaming connection', async () => {
+      await locators.request.endConnectionButton().click();
+      await expect(locators.response.statusCode()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusText()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusCode()).toHaveText(/0/);
+      await expect(locators.response.statusText()).toHaveText(/OK/);
+    });
+
+    await test.step('verify response message count', async () => {
+      await expect(locators.response.tabCount()).toHaveText('1');
+    });
+
+    await test.step('verify response items are rendered', async () => {
+      await expect(locators.response.content()).toBeVisible();
+      await expect(locators.response.container()).toBeVisible();
+      await expect(locators.response.singleResponse()).toBeVisible();
+    });
+
+    /* TODO: Reflection fetching incorrectly marks requests as modified, causing save indicators to appear. This save step prevents test timeouts by clearing the modified state. This is a temporary workaround until the reflection fetching issue is resolved. */
+    await test.step('save request via shortcut', async () => {
+      await page.keyboard.press('Meta+s');
+    });
+  });
+
+  test('make bidi streaming request', async ({ pageWithUserData: page }) => {
+    await setupGrpcTest(page);
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('select bidirectional streaming method', async () => {
+      await locators.sidebar.request('BidiHello').click();
+      await expect(locators.method.dropdownTrigger()).toContainText('HelloService/BidiHello');
+    });
+
+    await test.step('verify gRPC bidi streaming request is opened successfully', async () => {
+      await expect(locators.request.queryUrlContainer().locator('.CodeMirror')).toBeVisible();
+      await expect(locators.request.messagesContainer()).toBeVisible();
+      await expect(locators.request.addMessageButton()).toBeVisible();
+      await expect(locators.request.sendMessage(0)).toBeVisible();
+      await expect(locators.request.sendButton()).toBeVisible();
+    });
+
+    await test.step('start bidirectional streaming connection', async () => {
+      await locators.request.sendButton().click();
+      await expect(locators.request.endConnectionButton()).toBeVisible();
+    });
+
+    await test.step('send individual message', async () => {
+      await locators.request.sendMessage(0).click();
+      await locators.request.sendMessage(1).click();
+    });
+
+    await test.step('end bidirectional streaming connection', async () => {
+      await locators.request.endConnectionButton().click();
+      await expect(locators.response.statusCode()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusText()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusCode()).toHaveText(/0/);
+      await expect(locators.response.statusText()).toHaveText(/OK/);
+    });
+
+    await test.step('verify response message count', async () => {
+      await expect(locators.response.tabCount()).toHaveText('2');
+    });
+
+    await test.step('verify response items are rendered', async () => {
+      await expect(locators.response.content()).toBeVisible();
+      await expect(locators.response.container()).toBeVisible();
+      await expect(locators.response.accordion()).toBeVisible();
+      await expect(locators.response.responseItems()).toHaveCount(2);
+    });
+
+    /* TODO: Reflection fetching incorrectly marks requests as modified, causing save indicators to appear. This save step prevents test timeouts by clearing the modified state. This is a temporary workaround until the reflection fetching issue is resolved. */
+    await test.step('save request via shortcut', async () => {
+      await page.keyboard.press('Meta+s');
+    });
+  });
+});
diff --git a/tests/grpc/metadata/init-user-data/preferences.json b/tests/grpc/metadata/init-user-data/preferences.json
index f0405920e..ed17e31c5 100644
--- a/tests/grpc/metadata/init-user-data/preferences.json
+++ b/tests/grpc/metadata/init-user-data/preferences.json
@@ -1,5 +1,5 @@
 {
-  "maximized": true,
+  "maximized": false,
   "lastOpenedCollections": [
     "{{projectRoot}}/tests/grpc/metadata/fixtures/collection"
   ],
diff --git a/tests/grpc/method-search/init-user-data/preferences.json b/tests/grpc/method-search/init-user-data/preferences.json
index b2bb8145b..baa9643f1 100644
--- a/tests/grpc/method-search/init-user-data/preferences.json
+++ b/tests/grpc/method-search/init-user-data/preferences.json
@@ -2,8 +2,5 @@
   "maximized": false,
   "lastOpenedCollections": [
       "{{projectRoot}}/tests/grpc/method-search/fixtures/grpc-collection"
-  ],
-  "beta": {
-      "grpc": true
-  }
+  ]
 }
\ No newline at end of file
diff --git a/tests/import/bruno/import-bruno-corrupted-fails.spec.ts b/tests/import/bruno/import-bruno-corrupted-fails.spec.ts
index 6fe2a0799..76da05539 100644
--- a/tests/import/bruno/import-bruno-corrupted-fails.spec.ts
+++ b/tests/import/bruno/import-bruno-corrupted-fails.spec.ts
@@ -5,7 +5,8 @@ test.describe('Import Corrupted Bruno Collection - Should Fail', () => {
   test('Import Bruno collection with invalid JSON structure should fail', async ({ page }) => {
     const brunoFile = path.resolve(__dirname, 'fixtures', 'bruno-malformed.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,16 +15,13 @@ test.describe('Import Corrupted Bruno Collection - Should Fail', () => {
 
     await page.setInputFiles('input[type="file"]', brunoFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for JSON parsing error
-    const hasImportError = await page.getByText('Failed to parse the file – ensure it is valid JSON or YAML').first().isVisible();
+    const hasImportError = await page.getByText('Failed to parse the file – ensure it is valid JSON or YAML').first().isVisible({ timeout: 5000 });
 
     // Either parsing error or import error should be shown
     expect(hasImportError).toBe(true);
 
     // Cleanup: close any open modals
-    await page.locator('[data-test-id="modal-close-button"]').click();
+    await page.getByTestId('modal-close-button').click();
   });
 });
diff --git a/tests/import/bruno/import-bruno-missing-required-schema.spec.ts b/tests/import/bruno/import-bruno-missing-required-schema.spec.ts
index 53dcd08bc..f9a131bf2 100644
--- a/tests/import/bruno/import-bruno-missing-required-schema.spec.ts
+++ b/tests/import/bruno/import-bruno-missing-required-schema.spec.ts
@@ -5,7 +5,8 @@ test.describe('Import Bruno Collection - Missing Required Schema Fields', () =>
   test('Import Bruno collection missing required version field should fail', async ({ page }) => {
     const brunoFile = path.resolve(__dirname, 'fixtures', 'bruno-missing-required-fields.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,15 +15,12 @@ test.describe('Import Bruno Collection - Missing Required Schema Fields', () =>
 
     await page.setInputFiles('input[type="file"]', brunoFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for schema validation error messages
-    const hasImportError = await page.getByText('Unsupported collection format').first().isVisible();
+    const hasImportError = await page.getByText('Unsupported collection format').first().isVisible({ timeout: 5000 });
 
     expect(hasImportError).toBe(true);
 
     // Cleanup: close any open modals
-    await page.locator('[data-test-id="modal-close-button"]').click();
+    await page.getByTestId('modal-close-button').click();
   });
 });
diff --git a/tests/import/bruno/import-bruno-testbench.spec.ts b/tests/import/bruno/import-bruno-testbench.spec.ts
index a2590fd60..3ddf3d484 100644
--- a/tests/import/bruno/import-bruno-testbench.spec.ts
+++ b/tests/import/bruno/import-bruno-testbench.spec.ts
@@ -3,20 +3,15 @@ import * as path from 'path';
 import { closeAllCollections } from '../../utils/page';
 
 test.describe('Import Bruno Testbench Collection', () => {
-  test.beforeAll(async ({ page }) => {
-    // Navigate back to homescreen after all tests
-    await page.locator('.bruno-logo').click();
-  });
-
-  test.afterEach(async ({ page }) => {
-    // cleanup: close all collections
+  test.afterAll(async ({ page }) => {
     await closeAllCollections(page);
   });
 
   test('Import Bruno Testbench collection successfully', async ({ page, createTmpDir }) => {
     const brunoFile = path.resolve(__dirname, 'fixtures', 'bruno-testbench.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -25,18 +20,16 @@ test.describe('Import Bruno Testbench Collection', () => {
 
     await page.setInputFiles('input[type="file"]', brunoFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-    // Verify that the Import Collection modal is displayed (for location selection)
-    const locationModal = page.getByRole('dialog');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
     // Wait for collection to appear in the location modal
     await expect(locationModal.getByText('bruno-testbench')).toBeVisible();
 
     await page.locator('#collection-location').fill(await createTmpDir('bruno-testbench-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     await expect(page.locator('#sidebar-collection-name').getByText('bruno-testbench')).toBeVisible();
   });
diff --git a/tests/import/bruno/import-bruno-with-examples.spec.ts b/tests/import/bruno/import-bruno-with-examples.spec.ts
index 7f188a3ec..71078e8c5 100644
--- a/tests/import/bruno/import-bruno-with-examples.spec.ts
+++ b/tests/import/bruno/import-bruno-with-examples.spec.ts
@@ -11,7 +11,8 @@ test.describe('Import Bruno Collection with Examples', () => {
     const brunoFile = path.resolve(__dirname, 'fixtures', 'bruno-with-examples.json');
 
     await test.step('Open import collection modal', async () => {
-      await page.getByRole('button', { name: 'Import Collection' }).click();
+      await page.locator('.plus-icon-button').click();
+      await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
     });
 
     await test.step('Wait for import modal and verify title', async () => {
@@ -24,10 +25,6 @@ test.describe('Import Bruno Collection with Examples', () => {
       await page.setInputFiles('input[type="file"]', brunoFile);
     });
 
-    await test.step('Wait for file processing to complete', async () => {
-      await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-    });
-
     await test.step('Verify no parsing errors occurred', async () => {
       const hasError = await page.getByText('Failed to parse the file').isVisible().catch(() => false);
       if (hasError) {
@@ -36,12 +33,12 @@ test.describe('Import Bruno Collection with Examples', () => {
     });
 
     await test.step('Verify location selection modal appears', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
     });
 
     await test.step('Verify collection name appears in location modal', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await expect(locationModal.getByText('bruno-with-examples')).toBeVisible();
       await page.getByTestId('modal-close-button').click();
     });
diff --git a/tests/import/file-types/file-input-acceptance.spec.ts b/tests/import/file-types/file-input-acceptance.spec.ts
index 3718ffd13..481440ede 100644
--- a/tests/import/file-types/file-input-acceptance.spec.ts
+++ b/tests/import/file-types/file-input-acceptance.spec.ts
@@ -2,7 +2,8 @@ import { test, expect } from '../../../playwright';
 
 test.describe('File Input Acceptance', () => {
   test('File input accepts expected file types', async ({ page }) => {
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Check that file input exists (even if hidden)
     const fileInput = page.locator('input[type="file"]');
diff --git a/tests/import/file-types/invalid-file-handling.spec.ts b/tests/import/file-types/invalid-file-handling.spec.ts
index e8439fa51..bccf0c81f 100644
--- a/tests/import/file-types/invalid-file-handling.spec.ts
+++ b/tests/import/file-types/invalid-file-handling.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid File Handling', () => {
   test('Handle invalid file without crashing', async ({ page }) => {
     const invalidFile = path.resolve(__dirname, 'fixtures', 'invalid.txt');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
diff --git a/tests/import/insomnia/import-insomnia-v4-environments.spec.ts b/tests/import/insomnia/import-insomnia-v4-environments.spec.ts
index fa1e0d8dc..ac6df41d7 100644
--- a/tests/import/insomnia/import-insomnia-v4-environments.spec.ts
+++ b/tests/import/insomnia/import-insomnia-v4-environments.spec.ts
@@ -23,7 +23,8 @@ test.describe('Import Insomnia v4 Collection - Environment Import', () => {
     const insomniaFile = path.resolve(__dirname, 'fixtures', 'insomnia-v4-with-envs.json');
 
     await test.step('Import Insomnia v4 collection with environments', async () => {
-      await page.getByRole('button', { name: 'Import Collection' }).click();
+      await page.locator('.plus-icon-button').click();
+      await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
       const importModal = page.getByTestId('import-collection-modal');
       await importModal.waitFor({ state: 'visible' });
@@ -31,13 +32,13 @@ test.describe('Import Insomnia v4 Collection - Environment Import', () => {
 
       await page.setInputFiles('input[type="file"]', insomniaFile);
 
-      await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+      await locationModal.waitFor({ state: 'visible', timeout: 10000 });
 
-      const locationModal = page.getByTestId('import-collection-location-modal');
       await expect(locationModal.getByText('Test API Collection v4 with Environments')).toBeVisible();
 
       await page.locator('#collection-location').fill(await createTmpDir('insomnia-v4-env-test'));
-      await page.getByRole('button', { name: 'Import', exact: true }).click();
+      await locationModal.getByRole('button', { name: 'Import' }).click();
 
       await expect(page.locator('#sidebar-collection-name').getByText('Test API Collection v4 with Environments')).toBeVisible();
 
diff --git a/tests/import/insomnia/import-insomnia-v4.spec.ts b/tests/import/insomnia/import-insomnia-v4.spec.ts
index 042ad948b..1cb0a55ec 100644
--- a/tests/import/insomnia/import-insomnia-v4.spec.ts
+++ b/tests/import/insomnia/import-insomnia-v4.spec.ts
@@ -11,7 +11,8 @@ test.describe('Import Insomnia Collection v4', () => {
   test('Import Insomnia Collection v4 successfully', async ({ page, createTmpDir }) => {
     const insomniaFile = path.resolve(__dirname, 'fixtures', 'insomnia-v4.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -20,15 +21,13 @@ test.describe('Import Insomnia Collection v4', () => {
 
     await page.setInputFiles('input[type="file"]', insomniaFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-    // Verify that the Import Collection modal is displayed (for location selection)
-    const locationModal = page.getByRole('dialog');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
     await page.locator('#collection-location').fill(await createTmpDir('insomnia-v4-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     await expect(page.locator('#sidebar-collection-name').getByText('Test API Collection v4')).toBeVisible();
   });
diff --git a/tests/import/insomnia/import-insomnia-v5-environments.spec.ts b/tests/import/insomnia/import-insomnia-v5-environments.spec.ts
index 178621667..745ab753a 100644
--- a/tests/import/insomnia/import-insomnia-v5-environments.spec.ts
+++ b/tests/import/insomnia/import-insomnia-v5-environments.spec.ts
@@ -23,7 +23,8 @@ test.describe('Import Insomnia v5 Collection - Environment Import', () => {
     const insomniaFile = path.resolve(__dirname, 'fixtures', 'insomnia-v5-with-envs.yaml');
 
     await test.step('Import Insomnia v5 collection with environments', async () => {
-      await page.getByRole('button', { name: 'Import Collection' }).click();
+      await page.locator('.plus-icon-button').click();
+      await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
       const importModal = page.getByTestId('import-collection-modal');
       await importModal.waitFor({ state: 'visible' });
@@ -31,15 +32,12 @@ test.describe('Import Insomnia v5 Collection - Environment Import', () => {
 
       await page.setInputFiles('input[type="file"]', insomniaFile);
 
-      await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-      const locationModal = page.getByTestId('import-collection-location-modal');
-      await expect(locationModal.getByText('Test API Collection v5 with Environments')).toBeVisible();
+      // Wait for location modal to appear after file processing
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+      await locationModal.waitFor({ state: 'visible', timeout: 10000 });
 
       await page.locator('#collection-location').fill(await createTmpDir('insomnia-v5-env-test'));
-      await page.getByRole('button', { name: 'Import', exact: true }).click();
-
-      await expect(page.getByText('Test API Collection v5 with Environments')).toBeVisible();
+      await locationModal.getByRole('button', { name: 'Import' }).click();
 
       await openCollectionAndAcceptSandbox(page, 'Test API Collection v5 with Environments', 'safe');
     });
diff --git a/tests/import/insomnia/import-insomnia-v5.spec.ts b/tests/import/insomnia/import-insomnia-v5.spec.ts
index 8c66ed582..7a00b6ebf 100644
--- a/tests/import/insomnia/import-insomnia-v5.spec.ts
+++ b/tests/import/insomnia/import-insomnia-v5.spec.ts
@@ -11,7 +11,8 @@ test.describe('Import Insomnia Collection v5', () => {
   test('Import Insomnia Collection v5 successfully', async ({ page, createTmpDir }) => {
     const insomniaFile = path.resolve(__dirname, 'fixtures', 'insomnia-v5.yaml');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -20,15 +21,13 @@ test.describe('Import Insomnia Collection v5', () => {
 
     await page.setInputFiles('input[type="file"]', insomniaFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-    // Verify that the Import Collection modal is displayed (for location selection)
-    const locationModal = page.getByRole('dialog');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
     await page.locator('#collection-location').fill(await createTmpDir('insomnia-v5-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     await expect(page.locator('#sidebar-collection-name').getByText('Test API Collection v5')).toBeVisible();
   });
diff --git a/tests/import/insomnia/invalid-missing-collection.spec.ts b/tests/import/insomnia/invalid-missing-collection.spec.ts
index 2882b4a61..db1f2cfea 100644
--- a/tests/import/insomnia/invalid-missing-collection.spec.ts
+++ b/tests/import/insomnia/invalid-missing-collection.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid Insomnia Collection - Missing Collection Array', () => {
   test('Handle Insomnia v5 collection missing collection array', async ({ page }) => {
     const insomniaFile = path.resolve(__dirname, 'fixtures', 'insomnia-v5-invalid-missing-collection.yaml');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,9 +15,6 @@ test.describe('Invalid Insomnia Collection - Missing Collection Array', () => {
 
     await page.setInputFiles('input[type="file"]', insomniaFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for error message
     const hasError = await page.getByText('Unsupported collection format').first().isVisible();
     expect(hasError).toBe(true);
diff --git a/tests/import/insomnia/malformed-structure.spec.ts b/tests/import/insomnia/malformed-structure.spec.ts
index 05e9be062..08286a403 100644
--- a/tests/import/insomnia/malformed-structure.spec.ts
+++ b/tests/import/insomnia/malformed-structure.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid Insomnia Collection - Malformed Structure', () => {
   test('Handle malformed Insomnia collection structure', async ({ page }) => {
     const insomniaFile = path.resolve(__dirname, 'fixtures', 'insomnia-malformed.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,9 +15,6 @@ test.describe('Invalid Insomnia Collection - Malformed Structure', () => {
 
     await page.setInputFiles('input[type="file"]', insomniaFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for error message - this should fail during JSON parsing
     const hasError = await page.getByText('Failed to parse the file').first().isVisible();
     expect(hasError).toBe(true);
diff --git a/tests/import/openapi/duplicate-operation-names-fix.spec.ts b/tests/import/openapi/duplicate-operation-names-fix.spec.ts
index 6f2570508..64f2e8d84 100644
--- a/tests/import/openapi/duplicate-operation-names-fix.spec.ts
+++ b/tests/import/openapi/duplicate-operation-names-fix.spec.ts
@@ -12,7 +12,8 @@ test.describe('OpenAPI Duplicate Names Handling', () => {
     const openApiFile = path.resolve(__dirname, 'fixtures', 'openapi-duplicate-operation-name.yaml');
 
     // start the import process
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // wait for the import collection modal to appear
     const importModal = page.getByTestId('import-collection-modal');
@@ -21,12 +22,15 @@ test.describe('OpenAPI Duplicate Names Handling', () => {
     // upload the OpenAPI file with duplicate operation names
     await page.setInputFiles('input[type="file"]', openApiFile);
 
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
+
     // wait for the file processing to complete
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
 
     // select a location
     await page.locator('#collection-location').fill(await createTmpDir('duplicate-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     // verify the collection was imported successfully
     await expect(page.locator('#sidebar-collection-name').getByText('Duplicate Test Collection')).toBeVisible();
diff --git a/tests/import/openapi/import-openapi-json.spec.ts b/tests/import/openapi/import-openapi-json.spec.ts
index 7923303ab..77f455939 100644
--- a/tests/import/openapi/import-openapi-json.spec.ts
+++ b/tests/import/openapi/import-openapi-json.spec.ts
@@ -11,7 +11,8 @@ test.describe('Import OpenAPI v3 JSON Collection', () => {
   test('Import simple OpenAPI v3 JSON successfully', async ({ page, createTmpDir }) => {
     const openApiFile = path.resolve(__dirname, 'fixtures', 'openapi-simple.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -20,11 +21,9 @@ test.describe('Import OpenAPI v3 JSON Collection', () => {
 
     await page.setInputFiles('input[type="file"]', openApiFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-    // Verify that the Import Collection modal is displayed (for location selection)
-    const locationModal = page.getByRole('dialog');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
     // Wait for collection to appear in the location modal
@@ -32,7 +31,7 @@ test.describe('Import OpenAPI v3 JSON Collection', () => {
 
     // Select a location and import
     await page.locator('#collection-location').fill(await createTmpDir('simple-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     // Verify the collection was imported successfully
     await expect(page.locator('#sidebar-collection-name').getByText('Simple Test API')).toBeVisible();
diff --git a/tests/import/openapi/import-openapi-with-examples.spec.ts b/tests/import/openapi/import-openapi-with-examples.spec.ts
index bb3b17b41..ad64b371c 100644
--- a/tests/import/openapi/import-openapi-with-examples.spec.ts
+++ b/tests/import/openapi/import-openapi-with-examples.spec.ts
@@ -35,7 +35,8 @@ test.describe('Import OpenAPI Collection with Examples', () => {
     }, { importDir });
 
     await test.step('Open import collection modal', async () => {
-      await page.getByRole('button', { name: 'Import Collection' }).click();
+      await page.locator('.plus-icon-button').click();
+      await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
     });
 
     await test.step('Wait for import modal and verify title', async () => {
@@ -47,10 +48,10 @@ test.describe('Import OpenAPI Collection with Examples', () => {
     await test.step('Upload OpenAPI collection file using hidden file input', async () => {
       // The "choose a file" button triggers a hidden file input, so we can directly set files on it
       await page.setInputFiles('input[type="file"]', openApiFile);
-    });
 
-    await test.step('Wait for file processing to complete', async () => {
-      await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
+      // Wait for location modal to appear after file processing
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+      await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     });
 
     await test.step('Verify no parsing errors occurred', async () => {
@@ -61,18 +62,18 @@ test.describe('Import OpenAPI Collection with Examples', () => {
     });
 
     await test.step('Verify Import Collection location modal appears', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
       await expect(locationModal.getByText('API with Examples')).toBeVisible();
     });
 
     await test.step('Click Browse link to select collection folder', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await locationModal.getByText('Browse').click();
     });
 
     await test.step('Complete import by clicking import button', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await locationModal.getByRole('button', { name: 'Import' }).click();
     });
 
@@ -124,8 +125,8 @@ test.describe('Import OpenAPI Collection with Examples', () => {
       await chevronIcon.click();
 
       // Check if examples are visible
-      const createdExample = page.locator('.collection-item-name').getByText('User Created');
-      const validationErrorExample = page.locator('.collection-item-name').getByText('Validation Error');
+      const createdExample = page.locator('.collection-item-name').getByText('User Created (Valid User)');
+      const validationErrorExample = page.locator('.collection-item-name').getByText('Validation Error (Invalid User)');
 
       await expect(createdExample).toBeVisible();
       await expect(validationErrorExample).toBeVisible();
@@ -151,7 +152,8 @@ test.describe('Import OpenAPI Collection with Examples', () => {
     }, { importDir });
 
     await test.step('Open import collection modal', async () => {
-      await page.getByRole('button', { name: 'Import Collection' }).click();
+      await page.locator('.plus-icon-button').click();
+      await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
     });
 
     await test.step('Wait for import modal and verify title', async () => {
@@ -162,10 +164,10 @@ test.describe('Import OpenAPI Collection with Examples', () => {
 
     await test.step('Upload OpenAPI collection file using hidden file input', async () => {
       await page.setInputFiles('input[type="file"]', openApiFile);
-    });
 
-    await test.step('Wait for file processing to complete', async () => {
-      await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
+      // Wait for location modal to appear after file processing
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+      await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     });
 
     await test.step('Verify no parsing errors occurred', async () => {
@@ -176,13 +178,13 @@ test.describe('Import OpenAPI Collection with Examples', () => {
     });
 
     await test.step('Verify Import Collection location modal appears', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
       await expect(locationModal.getByText('API with Examples')).toBeVisible();
     });
 
     await test.step('Select path-based grouping option from dropdown', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
 
       // Click on the grouping dropdown to open it
       const groupingDropdown = locationModal.getByTestId('grouping-dropdown');
@@ -194,12 +196,12 @@ test.describe('Import OpenAPI Collection with Examples', () => {
     });
 
     await test.step('Click Browse link to select collection folder', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await locationModal.getByText('Browse').click();
     });
 
     await test.step('Complete import by clicking import button', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await locationModal.getByRole('button', { name: 'Import' }).click();
     });
 
diff --git a/tests/import/openapi/import-openapi-yaml.spec.ts b/tests/import/openapi/import-openapi-yaml.spec.ts
index e7110bf93..b6948a18c 100644
--- a/tests/import/openapi/import-openapi-yaml.spec.ts
+++ b/tests/import/openapi/import-openapi-yaml.spec.ts
@@ -11,7 +11,8 @@ test.describe('Import OpenAPI v3 YAML Collection', () => {
   test('Import comprehensive OpenAPI v3 YAML successfully', async ({ page, createTmpDir }) => {
     const openApiFile = path.resolve(__dirname, 'fixtures', 'openapi-comprehensive.yaml');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -20,11 +21,9 @@ test.describe('Import OpenAPI v3 YAML Collection', () => {
 
     await page.setInputFiles('input[type="file"]', openApiFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-    // Verify that the Import Collection modal is displayed (for location selection)
-    const locationModal = page.getByRole('dialog');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
     // Wait for collection to appear in the location modal
@@ -32,7 +31,7 @@ test.describe('Import OpenAPI v3 YAML Collection', () => {
 
     // Select a location and import
     await page.locator('#collection-location').fill(await createTmpDir('comprehensive-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     // Verify the collection was imported successfully
     await expect(page.locator('#sidebar-collection-name').getByText('Comprehensive API Test Collection')).toBeVisible();
diff --git a/tests/import/openapi/malformed-yaml.spec.ts b/tests/import/openapi/malformed-yaml.spec.ts
index ec596d18a..5e0a1f5a8 100644
--- a/tests/import/openapi/malformed-yaml.spec.ts
+++ b/tests/import/openapi/malformed-yaml.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid OpenAPI - Malformed YAML', () => {
   test('Handle malformed OpenAPI YAML structure', async ({ page }) => {
     const openApiFile = path.resolve(__dirname, 'fixtures', 'openapi-malformed.yaml');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,9 +15,6 @@ test.describe('Invalid OpenAPI - Malformed YAML', () => {
 
     await page.setInputFiles('input[type="file"]', openApiFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for error message - this should fail during YAML parsing
     const hasParseError = await page.getByText('Failed to parse the file').isVisible();
     const hasImportError = await page.getByText('Import collection failed').isVisible();
diff --git a/tests/import/openapi/missing-info.spec.ts b/tests/import/openapi/missing-info.spec.ts
index dc5d230fc..e58607426 100644
--- a/tests/import/openapi/missing-info.spec.ts
+++ b/tests/import/openapi/missing-info.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid OpenAPI - Missing Info Section', () => {
   test('Handle OpenAPI specification missing required info section', async ({ page }) => {
     const openApiFile = path.resolve(__dirname, 'fixtures', 'openapi-missing-info.yaml');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,9 +15,6 @@ test.describe('Invalid OpenAPI - Missing Info Section', () => {
 
     await page.setInputFiles('input[type="file"]', openApiFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // The OpenAPI parser might handle missing info gracefully with defaults
     const hasError = await page.getByText('Unsupported collection format').first().isVisible();
 
diff --git a/tests/import/openapi/operation-name-with-newlines-fix.spec.ts b/tests/import/openapi/operation-name-with-newlines-fix.spec.ts
index 6ca401c26..72d621be9 100644
--- a/tests/import/openapi/operation-name-with-newlines-fix.spec.ts
+++ b/tests/import/openapi/operation-name-with-newlines-fix.spec.ts
@@ -12,7 +12,8 @@ test.describe('OpenAPI Newline Handling', () => {
     const openApiFile = path.resolve(__dirname, 'fixtures', 'openapi-newline-in-operation-name.yaml');
 
     // start the import process
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // wait for the import collection modal to appear
     const importModal = page.getByTestId('import-collection-modal');
@@ -21,13 +22,14 @@ test.describe('OpenAPI Newline Handling', () => {
     // upload the OpenAPI file with problematic operation names
     await page.setInputFiles('input[type="file"]', openApiFile);
 
-    // verify that the collection location modal appears (OpenAPI files go directly to location modal)
-    const locationModal = page.getByTestId('import-collection-location-modal');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.getByText('Newline Test Collection')).toBeVisible();
 
     // select a location
     await page.locator('#collection-location').fill(await createTmpDir('newline-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     // verify the collection was imported successfully
     await expect(page.locator('#sidebar-collection-name').getByText('Newline Test Collection')).toBeVisible();
diff --git a/tests/import/openapi/path-based-grouping.spec.ts b/tests/import/openapi/path-based-grouping.spec.ts
index 9f98939bc..9a2494d63 100644
--- a/tests/import/openapi/path-based-grouping.spec.ts
+++ b/tests/import/openapi/path-based-grouping.spec.ts
@@ -12,7 +12,8 @@ test.describe('OpenAPI Path-Based Grouping', () => {
     const openApiFile = path.resolve(__dirname, 'fixtures', 'openapi-path-grouping.json');
 
     // Start the import process
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByTestId('import-collection-modal');
@@ -21,11 +22,9 @@ test.describe('OpenAPI Path-Based Grouping', () => {
     // Upload the OpenAPI file
     await page.setInputFiles('input[type="file"]', openApiFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-    // Verify that the collection location modal appears
-    const locationModal = page.getByTestId('import-collection-location-modal');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.getByText('Path Grouping Test API')).toBeVisible();
 
     // Select path-based grouping from dropdown
@@ -34,7 +33,7 @@ test.describe('OpenAPI Path-Based Grouping', () => {
 
     // Select a location and import
     await page.locator('#collection-location').fill(await createTmpDir('path-grouping-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     // Verify the collection was imported successfully
     await expect(page.locator('#sidebar-collection-name').getByText('Path Grouping Test API')).toBeVisible();
diff --git a/tests/import/postman/import-postman-v20.spec.ts b/tests/import/postman/import-postman-v20.spec.ts
index d107d47de..4611405a1 100644
--- a/tests/import/postman/import-postman-v20.spec.ts
+++ b/tests/import/postman/import-postman-v20.spec.ts
@@ -11,7 +11,8 @@ test.describe('Import Postman Collection v2.0', () => {
   test('Import Postman Collection v2.0 successfully', async ({ page, createTmpDir }) => {
     const postmanFile = path.resolve(__dirname, 'fixtures', 'postman-v20.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -20,11 +21,9 @@ test.describe('Import Postman Collection v2.0', () => {
 
     await page.setInputFiles('input[type="file"]', postmanFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-    // Verify that the Import Collection modal is displayed (for location selection)
-    const locationModal = page.getByRole('dialog');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
     // Wait for collection to appear in the location modal
@@ -32,7 +31,7 @@ test.describe('Import Postman Collection v2.0', () => {
 
     // Select a location and import
     await page.locator('#collection-location').fill(await createTmpDir('postman-v20-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     // Verify the collection was imported successfully
     await expect(page.locator('#sidebar-collection-name').getByText('Postman v2.0 Collection')).toBeVisible();
diff --git a/tests/import/postman/import-postman-v21.spec.ts b/tests/import/postman/import-postman-v21.spec.ts
index cc4312446..be2c3f986 100644
--- a/tests/import/postman/import-postman-v21.spec.ts
+++ b/tests/import/postman/import-postman-v21.spec.ts
@@ -11,7 +11,8 @@ test.describe('Import Postman Collection v2.1', () => {
   test('Import Postman Collection v2.1 successfully', async ({ page, createTmpDir }) => {
     const postmanFile = path.resolve(__dirname, 'fixtures', 'postman-v21.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -20,11 +21,9 @@ test.describe('Import Postman Collection v2.1', () => {
 
     await page.setInputFiles('input[type="file"]', postmanFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
-    // Verify that the Import Collection modal is displayed (for location selection)
-    const locationModal = page.getByRole('dialog');
+    // Wait for location modal to appear after file processing
+    const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+    await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
     // Wait for collection to appear in the location modal
@@ -32,7 +31,7 @@ test.describe('Import Postman Collection v2.1', () => {
 
     // Select a location and import
     await page.locator('#collection-location').fill(await createTmpDir('postman-v21-test'));
-    await page.getByRole('button', { name: 'Import', exact: true }).click();
+    await locationModal.getByRole('button', { name: 'Import' }).click();
 
     // Verify the collection was imported successfully
     await expect(page.locator('#sidebar-collection-name').getByText('Postman v2.1 Collection')).toBeVisible();
diff --git a/tests/import/postman/import-postman-with-examples.spec.ts b/tests/import/postman/import-postman-with-examples.spec.ts
index 7fca83f0e..8181c58ea 100644
--- a/tests/import/postman/import-postman-with-examples.spec.ts
+++ b/tests/import/postman/import-postman-with-examples.spec.ts
@@ -35,7 +35,8 @@ test.describe('Import Postman Collection with Examples', () => {
     }, { importDir });
 
     await test.step('Open import collection modal', async () => {
-      await page.getByRole('button', { name: 'Import Collection' }).click();
+      await page.locator('.plus-icon-button').click();
+      await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
     });
 
     await test.step('Wait for import modal and verify title', async () => {
@@ -47,10 +48,10 @@ test.describe('Import Postman Collection with Examples', () => {
     await test.step('Upload Postman collection file using hidden file input', async () => {
       // The "choose a file" button triggers a hidden file input, so we can directly set files on it
       await page.setInputFiles('input[type="file"]', postmanFile);
-    });
 
-    await test.step('Wait for file processing to complete', async () => {
-      await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
+      // Wait for location modal to appear after file processing
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+      await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     });
 
     await test.step('Verify no parsing errors occurred', async () => {
@@ -61,22 +62,22 @@ test.describe('Import Postman Collection with Examples', () => {
     });
 
     await test.step('Verify location selection modal appears', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
     });
 
     await test.step('Verify collection name appears in location modal', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await expect(locationModal.getByText('collection with examples')).toBeVisible();
     });
 
     await test.step('Click Browse link to select collection folder', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await locationModal.getByText('Browse').click();
     });
 
     await test.step('Complete import by clicking import button', async () => {
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await locationModal.getByRole('button', { name: 'Import' }).click();
     });
 
diff --git a/tests/import/postman/invalid-json.spec.ts b/tests/import/postman/invalid-json.spec.ts
index 5263dec9e..f47d1d2f1 100644
--- a/tests/import/postman/invalid-json.spec.ts
+++ b/tests/import/postman/invalid-json.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid Postman Collection - Invalid JSON', () => {
   test('Handle invalid JSON syntax', async ({ page }) => {
     const postmanFile = path.resolve(__dirname, 'fixtures', 'postman-invalid-schema.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,9 +15,6 @@ test.describe('Invalid Postman Collection - Invalid JSON', () => {
 
     await page.setInputFiles('input[type="file"]', postmanFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for error message
     const hasError = await page.getByText('Unsupported collection format').first().isVisible();
 
diff --git a/tests/import/postman/invalid-missing-info.spec.ts b/tests/import/postman/invalid-missing-info.spec.ts
index d1f571382..a71ac4388 100644
--- a/tests/import/postman/invalid-missing-info.spec.ts
+++ b/tests/import/postman/invalid-missing-info.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid Postman Collection - Missing Info', () => {
   test('Handle Postman collection missing required info field', async ({ page }) => {
     const postmanFile = path.resolve(__dirname, 'fixtures', 'postman-invalid-missing-info.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,9 +15,6 @@ test.describe('Invalid Postman Collection - Missing Info', () => {
 
     await page.setInputFiles('input[type="file"]', postmanFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for error message
     const hasError = await page.getByText('Unsupported collection format').first().isVisible();
     expect(hasError).toBe(true);
diff --git a/tests/import/postman/invalid-schema.spec.ts b/tests/import/postman/invalid-schema.spec.ts
index ac549b0e0..bd8d26eb1 100644
--- a/tests/import/postman/invalid-schema.spec.ts
+++ b/tests/import/postman/invalid-schema.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid Postman Collection - Invalid Schema', () => {
   test('Handle Postman collection with invalid schema version', async ({ page }) => {
     const postmanFile = path.resolve(__dirname, 'fixtures', 'postman-invalid-schema.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,9 +15,6 @@ test.describe('Invalid Postman Collection - Invalid Schema', () => {
 
     await page.setInputFiles('input[type="file"]', postmanFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for error message
     const hasError = await page.getByText('Unsupported collection format').first().isVisible();
     expect(hasError).toBe(true);
diff --git a/tests/import/postman/malformed-structure.spec.ts b/tests/import/postman/malformed-structure.spec.ts
index 9facbac62..30cf4c540 100644
--- a/tests/import/postman/malformed-structure.spec.ts
+++ b/tests/import/postman/malformed-structure.spec.ts
@@ -5,7 +5,8 @@ test.describe('Invalid Postman Collection - Malformed Structure', () => {
   test('Handle malformed Postman collection structure', async ({ page }) => {
     const postmanFile = path.resolve(__dirname, 'fixtures', 'postman-malformed.json');
 
-    await page.getByRole('button', { name: 'Import Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
     // Wait for import collection modal to be ready
     const importModal = page.getByRole('dialog');
@@ -14,9 +15,6 @@ test.describe('Invalid Postman Collection - Malformed Structure', () => {
 
     await page.setInputFiles('input[type="file"]', postmanFile);
 
-    // Wait for the loader to disappear
-    await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
-
     // Check for error message
     const hasError = await page.getByText('Unsupported collection format').first().isVisible();
     expect(hasError).toBe(true);
diff --git a/tests/import/wsdl/import-wsdl.spec.ts b/tests/import/wsdl/import-wsdl.spec.ts
index 23bdd4ab9..71dd220fb 100644
--- a/tests/import/wsdl/import-wsdl.spec.ts
+++ b/tests/import/wsdl/import-wsdl.spec.ts
@@ -13,7 +13,8 @@ test.describe('Import WSDL Collection', () => {
     const wsdlFile = path.join(testDataDir, 'wsdl.xml');
 
     await test.step('Open import collection modal', async () => {
-      await page.getByRole('button', { name: 'Import Collection' }).click();
+      await page.locator('.plus-icon-button').click();
+      await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
       // Wait for import collection modal to be ready
       const importModal = page.getByRole('dialog');
@@ -23,18 +24,19 @@ test.describe('Import WSDL Collection', () => {
     await test.step('Choose WSDL XML file', async () => {
       await page.setInputFiles('input[type="file"]', wsdlFile);
 
-      // Wait for the loader to disappear
-      await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
+      // Wait for location modal to appear after file processing
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+      await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     });
 
     await test.step('Select the location for the collection and submit to import', async () => {
       // Verify that the location selection modal is displayed to import the collection
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
       // select a location
       await page.locator('#collection-location').fill(await createTmpDir('wsdl-xml-test'));
-      await page.getByRole('button', { name: 'Import', exact: true }).click();
+      await locationModal.getByRole('button', { name: 'Import' }).click();
       await expect(page.locator('#sidebar-collection-name').getByText('TestWSDLServiceXML')).toBeVisible();
     });
 
@@ -69,7 +71,8 @@ test.describe('Import WSDL Collection', () => {
     const wsdlFile = path.join(testDataDir, 'wsdl-bruno.json');
 
     await test.step('Open import collection modal', async () => {
-      await page.getByRole('button', { name: 'Import Collection' }).click();
+      await page.locator('.plus-icon-button').click();
+      await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
 
       // Wait for import collection modal to be ready
       const importModal = page.getByRole('dialog');
@@ -79,13 +82,14 @@ test.describe('Import WSDL Collection', () => {
     await test.step('Choose WSDL JSON file', async () => {
       await page.setInputFiles('input[type="file"]', wsdlFile);
 
-      // Wait for the loader to disappear
-      await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
+      // Wait for location modal to appear after file processing
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
+      await locationModal.waitFor({ state: 'visible', timeout: 10000 });
     });
 
     await test.step('Select the location for the collection and submit to import', async () => {
       // Verify that the location selection modal is displayed to import the collection
-      const locationModal = page.getByRole('dialog');
+      const locationModal = page.locator('[data-testid="import-collection-location-modal"]');
       await expect(locationModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
 
       // Wait for collection to appear in the location modal
@@ -93,7 +97,7 @@ test.describe('Import WSDL Collection', () => {
 
       // select a location
       await page.locator('#collection-location').fill(await createTmpDir('wsdl-json-test'));
-      await page.getByRole('button', { name: 'Import', exact: true }).click();
+      await locationModal.getByRole('button', { name: 'Import' }).click();
     });
 
     await test.step('Verify that the collection was imported successfully', async () => {
diff --git a/tests/interpolation/prompt-variables/fixtures/client.pfx b/tests/interpolation/prompt-variables/fixtures/client.pfx
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/interpolation/prompt-variables/fixtures/collection/bruno.json b/tests/interpolation/prompt-variables/fixtures/collection/bruno.json
new file mode 100644
index 000000000..d6e156d89
--- /dev/null
+++ b/tests/interpolation/prompt-variables/fixtures/collection/bruno.json
@@ -0,0 +1,22 @@
+{
+  "version": "1",
+  "name": "prompt-variables-interpolation",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ],
+  "size": 0.0008153915405273438,
+  "filesCount": 4,
+  "clientCertificates": {
+    "enabled": true,
+    "certs": [
+      {
+        "domain": "localhost:8081",
+        "type": "pfx",
+        "pfxFilePath": "../client.pfx",
+        "passphrase": "{{?Enter Client CA Password}}"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/tests/interpolation/prompt-variables/fixtures/collection/collection.bru b/tests/interpolation/prompt-variables/fixtures/collection/collection.bru
new file mode 100644
index 000000000..cfd684a5f
--- /dev/null
+++ b/tests/interpolation/prompt-variables/fixtures/collection/collection.bru
@@ -0,0 +1,13 @@
+auth {
+  mode: basic
+}
+
+auth:basic {
+  username: auth_unsername
+  password: {{?Enter Collection Auth Password}}
+}
+
+vars:pre-request {
+  collectionVar: {{?Enter Collection Variable}}
+  ~collectionVarDisabled: {{?Should Not Prompt collectionVarDisabled}}
+}
diff --git a/tests/interpolation/prompt-variables/fixtures/collection/environments/local.bru b/tests/interpolation/prompt-variables/fixtures/collection/environments/local.bru
new file mode 100644
index 000000000..8dda9e2b6
--- /dev/null
+++ b/tests/interpolation/prompt-variables/fixtures/collection/environments/local.bru
@@ -0,0 +1,4 @@
+vars {
+  collectionEnvVar: {{?Enter Collection Env Variable}}
+  ~collectionEnvVarDisabled: {{?Should Not Prompt collectionEnvVarDisabled}}
+}
diff --git a/tests/interpolation/prompt-variables/fixtures/collection/http-folder/folder.bru b/tests/interpolation/prompt-variables/fixtures/collection/http-folder/folder.bru
new file mode 100644
index 000000000..f4fe94680
--- /dev/null
+++ b/tests/interpolation/prompt-variables/fixtures/collection/http-folder/folder.bru
@@ -0,0 +1,22 @@
+meta {
+  name: http-folder
+}
+
+headers {
+  folderHeaderVar: {{?Enter Folder Header Variable}}
+  ~folderHeaderVarDisabled: {{?Should Not Prompt folderHeaderVarDisabled}}
+}
+
+auth {
+  mode: basic
+}
+
+auth:basic {
+  username: auth_username
+  password: {{?Enter Folder Auth Password}}
+}
+
+vars:pre-request {
+  folderVar: {{?Enter Folder Variable}}
+  ~folderVarDisabled: {{?Should Not Prompt folderVarDisabled}}
+}
diff --git a/tests/interpolation/prompt-variables/fixtures/collection/http-folder/http-request-without-ca.bru b/tests/interpolation/prompt-variables/fixtures/collection/http-folder/http-request-without-ca.bru
new file mode 100644
index 000000000..1c27bf4f6
--- /dev/null
+++ b/tests/interpolation/prompt-variables/fixtures/collection/http-folder/http-request-without-ca.bru
@@ -0,0 +1,43 @@
+meta {
+  name: http-request-without-ca
+  type: http
+  seq: 2
+}
+
+post {
+  url: http://localhost:8081/api/echo/json?query={{?Enter Query Variable}}
+  body: json
+  auth: inherit
+}
+
+params:query {
+  query: {{?Enter Query Variable}}
+}
+
+headers {
+  Content-Type: application/json
+  ~x-disabled-header: {{?Should Not Prompt request x-disabled-header}}
+}
+
+body:json {
+  {
+    "body": "{{?Enter Body Variable}}",
+    "bodyNumber": {{?Enter Number Variable}},
+    "bodyBoolean": {{?Enter Boolean Variable}},
+    "repeat-1": "{{?Enter Body Variable}}",
+    "requestVar": "{{requestVar}}",
+    "folderVar": "{{folderVar}}",
+    "collectionVar": "{{collectionVar}}",
+    "collectionEnvVar": "{{collectionEnvVar}}",
+    "globalEnvVar": "{{globalEnvVar}}",
+    "folderHeader": "{{folderHeader}}"
+  }
+}
+
+body:form-urlencoded {
+  formurlencoded: {{?Should Not Prompt body mode form-urlencoded}}
+}
+
+vars:pre-request {
+  requestVar: {{?Enter Request Variable}}
+}
diff --git a/tests/interpolation/prompt-variables/fixtures/collection/http-folder/https-request-with-ca.bru b/tests/interpolation/prompt-variables/fixtures/collection/http-folder/https-request-with-ca.bru
new file mode 100644
index 000000000..02fdb490c
--- /dev/null
+++ b/tests/interpolation/prompt-variables/fixtures/collection/http-folder/https-request-with-ca.bru
@@ -0,0 +1,17 @@
+meta {
+  name: https-request-with-ca
+  type: http
+  seq: 1
+}
+
+post {
+  url: https://localhost:8081/api/echo/json
+  body: json
+  auth: inherit
+}
+
+body:json {
+  {
+    "body": "test"
+  }
+}
diff --git a/tests/interpolation/prompt-variables/http-request-prompt-variables.spec.ts b/tests/interpolation/prompt-variables/http-request-prompt-variables.spec.ts
new file mode 100644
index 000000000..6f9a38146
--- /dev/null
+++ b/tests/interpolation/prompt-variables/http-request-prompt-variables.spec.ts
@@ -0,0 +1,124 @@
+import { test, expect } from '../../../playwright';
+import { closeAllCollections } from '../../utils/page';
+
+test.describe('Prompt Variables Interpolation', () => {
+  test.afterAll(async ({ pageWithUserData: page }) => {
+    // cleanup: close all collections
+    await closeAllCollections(page);
+  });
+
+  // without client certificate - no HTTPS
+  test('Verifying if the prompt variables are prompted correctly for the http request - without client certificate', async ({ pageWithUserData: page }) => {
+    let promptVariablesModal;
+    let promptInputs;
+
+    await test.step('Open collection and navigate to the http request with prompt variables', async () => {
+      // Open collection and accept sandbox mode
+      await page.locator('#sidebar-collection-name').filter({ hasText: 'prompt-variables-interpolation' }).click();
+
+      // Navigate to the request
+      await page.locator('.collection-item-name').filter({ hasText: 'http-folder' }).click();
+      await page.locator('.collection-item-name').filter({ hasText: 'http-request-without-ca' }).click();
+    });
+
+    await test.step('Send the request and verify the prompt variables modal is visible', async () => {
+      // Send the request
+      await page.getByTestId('send-arrow-icon').click();
+
+      promptVariablesModal = page.getByRole('dialog').filter({ has: page.locator('.bruno-modal-header-title').getByText('Input Required') });
+      await promptVariablesModal.waitFor({ state: 'visible' });
+    });
+
+    await test.step('Verify duplicate prompt variables are not allowed', async () => {
+      // Enter the prompt variables
+      promptInputs = promptVariablesModal.getByTestId('prompt-variable-input-container');
+      await expect(promptInputs).toHaveCount(11);
+    });
+
+    await test.step('Verify disabled / non selected modes prompt variables are not prompted', async () => {
+      // verify that any prompt added to the inactive fields starting with label "Should Not Prompt" are not displayed
+      // eg: 1. Headers - disabled or hierarchical overrides should not be displayed
+      // 2. Vars - respects hierarchical overrides, eg: request var > folder var > collection var > global env var
+      // 3. Body - only prompts from selected body mode should be displayed eg: json
+      // 4. Auth - only prompts from selected mode should be displayed eg: basic, respects hierarchical overrides
+      // 5. Client Cert - only prompts from current domain config should be displayed
+      await expect(promptInputs.filter({ hasText: 'Should Not Prompt', exact: true })).toHaveCount(0);
+    });
+
+    await test.step('Fill the prompt variables and send the request', async () => {
+      await promptInputs.filter({ hasText: 'Enter Query Variable' }).locator('input').fill('queryPromptValue');
+      await promptInputs.filter({ hasText: 'Enter Body Variable' }).locator('input').fill('bodyPromptValue');
+      await promptInputs.filter({ hasText: 'Enter Number Variable' }).locator('input').fill('123');
+      await promptInputs.filter({ hasText: 'Enter Boolean Variable' }).locator('input').fill('true');
+      await promptInputs.filter({ hasText: 'Enter Request Variable' }).locator('input').fill('requestVarPromptValue');
+      await promptInputs.filter({ hasText: 'Enter Folder Variable' }).locator('input').fill('folderVarPromptValue');
+      await promptInputs.filter({ hasText: 'Enter Collection Variable' }).locator('input').fill('collectionVarPromptValue');
+      await promptInputs.filter({ hasText: 'Enter Collection Env Variable' }).locator('input').fill('collectionEnvVarPromptValue');
+      await promptInputs.filter({ hasText: 'Enter Global Env Variable' }).locator('input').fill('globalEnvVarPromptValue');
+      await promptInputs.filter({ hasText: 'Enter Folder Auth Password' }).locator('input').fill('folderAuthPasswordValue');
+      await promptInputs.filter({ hasText: 'Enter Folder Header Variable' }).locator('input').fill('folderHeaderVarPromptValue');
+
+      // Submit the prompt variables
+      await promptVariablesModal.getByRole('button', { name: 'Continue' }).click();
+    });
+
+    await test.step('Verify the request is sent with the correct variables', async () => {
+      // Verify the response status code
+      await expect(page.getByTestId('response-status-code')).toHaveText(/200/);
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"folderVar": "folderVarPromptValue"').first()).toBeVisible();
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"collectionVar": "collectionVarPromptValue"').first()).toBeVisible();
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"collectionEnvVar": "collectionEnvVarPromptValue"').first()).toBeVisible();
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"globalEnvVar": "globalEnvVarPromptValue"').first()).toBeVisible();
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"requestVar": "requestVarPromptValue"').first()).toBeVisible();
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"body": "bodyPromptValue"').first()).toBeVisible();
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"repeat-1": "bodyPromptValue"').first()).toBeVisible();
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"bodyNumber": 123').first()).toBeVisible();
+      await expect(page.locator('.response-pane').locator('.CodeMirror-line').getByText('"bodyBoolean": true').first()).toBeVisible();
+    });
+  });
+
+  // with client certificate - HTTPS
+  test('Verifying if the prompt variables are prompted correctly for the http request - with client certificate', async ({ pageWithUserData: page }) => {
+    let promptVariablesModal;
+    let promptInputs;
+
+    await test.step('Open collection and navigate to the http request with prompt variables', async () => {
+      // Open collection and accept sandbox mode
+      await page.locator('#sidebar-collection-name').filter({ hasText: 'prompt-variables-interpolation' }).click();
+
+      // Navigate to the request
+      await page.locator('.collection-item-name').filter({ hasText: 'http-folder' }).click();
+      await page.locator('.collection-item-name').filter({ hasText: 'https-request-with-ca' }).click();
+    });
+
+    await test.step('Send the request and verify the prompt variables modal is visible', async () => {
+      // Send the request
+      await page.getByTestId('send-arrow-icon').click();
+
+      promptVariablesModal = page.getByRole('dialog').filter({ has: page.locator('.bruno-modal-header-title').getByText('Input Required') });
+      await promptVariablesModal.waitFor({ state: 'visible' });
+    });
+
+    await test.step('Verify disabled / non selected modes prompt variables are not prompted', async () => {
+      promptInputs = promptVariablesModal.getByTestId('prompt-variable-input-container');
+      // verify that any prompt added to the inactive fields starting with label "Should Not Prompt" are not displayed
+      // eg: 1. Headers - disabled or hierarchical overrides should not be displayed
+      // 2. Vars - respects hierarchical overrides, eg: request var > folder var > collection var > global env var
+      // 3. Body - only prompts from selected body mode should be displayed eg: json
+      // 4. Auth - only prompts from selected mode should be displayed eg: basic, respects hierarchical overrides
+      // 5. Client Cert - only prompts from current domain config should be displayed
+      await expect(promptInputs.filter({ hasText: 'Should Not Prompt', exact: true })).toHaveCount(0);
+      await expect(promptInputs.filter({ hasText: 'Enter Client CA Password', exact: true })).toHaveCount(1);
+    });
+
+    await test.step('Fill the prompt variables and send the request', async () => {
+      await promptInputs.filter({ hasText: 'Enter Client CA Password' }).locator('input').fill('clientCAPasswordValue');
+      // leave the rest of the prompt variables empty
+
+      // Submit the prompt variables
+      await promptVariablesModal.getByRole('button', { name: 'Continue' }).click();
+    });
+
+    // @TODO: setup a valid certificate and server required to verify the request is sent with the correct variables
+  });
+});
diff --git a/tests/interpolation/prompt-variables/init-user-data/collection-security.json b/tests/interpolation/prompt-variables/init-user-data/collection-security.json
new file mode 100644
index 000000000..1da5d2e2f
--- /dev/null
+++ b/tests/interpolation/prompt-variables/init-user-data/collection-security.json
@@ -0,0 +1,10 @@
+{
+  "collections": [
+    {
+      "path": "{{projectRoot}}/tests/interpolation/prompt-variables/fixtures/collection",
+      "securityConfig": {
+        "jsSandboxMode": "safe"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/interpolation/prompt-variables/init-user-data/global-environments.json b/tests/interpolation/prompt-variables/init-user-data/global-environments.json
new file mode 100644
index 000000000..ddd3cda8a
--- /dev/null
+++ b/tests/interpolation/prompt-variables/init-user-data/global-environments.json
@@ -0,0 +1,27 @@
+{
+  "environments": [
+    {
+      "uid": "FlaexlO7lcH7UtEpWsVyz",
+      "name": "E2E_Global",
+      "variables": [
+        {
+          "uid": "lflBDSYBdHkUedYhBF4Ty",
+          "name": "globalEnvVar",
+          "value": "{{?Enter Global Env Variable}}",
+          "type": "text",
+          "secret": false,
+          "enabled": true
+        },
+        {
+          "uid": "lflBDSYBdHkUedYhBF4Ty",
+          "name": "globalEnvVarDisabled",
+          "value": "{{?Should Not Prompt globalEnvVarDisabled}}",
+          "type": "text",
+          "secret": false,
+          "enabled": false
+        }
+      ]
+    }
+  ],
+  "activeGlobalEnvironmentUid": "FlaexlO7lcH7UtEpWsVyz"
+}
\ No newline at end of file
diff --git a/tests/interpolation/prompt-variables/init-user-data/preferences.json b/tests/interpolation/prompt-variables/init-user-data/preferences.json
new file mode 100644
index 000000000..6ced499c9
--- /dev/null
+++ b/tests/interpolation/prompt-variables/init-user-data/preferences.json
@@ -0,0 +1,6 @@
+{
+  "maximized": false,
+  "lastOpenedCollections": [
+    "{{projectRoot}}/tests/interpolation/prompt-variables/fixtures/collection"
+  ]
+}
\ No newline at end of file
diff --git a/tests/interpolation/prompt-variables/init-user-data/ui-state-snapshot.json b/tests/interpolation/prompt-variables/init-user-data/ui-state-snapshot.json
new file mode 100644
index 000000000..e14888ed2
--- /dev/null
+++ b/tests/interpolation/prompt-variables/init-user-data/ui-state-snapshot.json
@@ -0,0 +1,8 @@
+{
+  "collections": [
+    {
+      "pathname": "{{projectRoot}}/tests/interpolation/prompt-variables/fixtures/collection",
+      "selectedEnvironment": "local"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/onboarding/sample-collection.spec.ts b/tests/onboarding/sample-collection.spec.ts
index 78d89a38b..3ca2ea70b 100644
--- a/tests/onboarding/sample-collection.spec.ts
+++ b/tests/onboarding/sample-collection.spec.ts
@@ -7,30 +7,29 @@ const env = {
 
 test.describe('Onboarding', () => {
   test('should create sample collection on first launch', async ({ launchElectronApp, createTmpDir }) => {
-
     // Use a fresh app instance to avoid contamination from previous tests
     const userDataPath = await createTmpDir('onboarding-fresh');
     const app = await launchElectronApp({ userDataPath, dotEnv: env });
     const page = await app.firstWindow();
-    
+
     // Verify sample collection appears in sidebar
     const sampleCollection = page.locator('#sidebar-collection-name').getByText('Sample API Collection');
     await expect(sampleCollection).toBeVisible();
-    
+
     // Click on the sample collection to open it
     await sampleCollection.click();
     const modeSaveButton = page.getByRole('button', { name: 'Save' });
     await expect(modeSaveButton).toBeVisible();
     await modeSaveButton.click();
-    
+
     // Verify the sample request is visible and clickable
     const request = page.locator('.collection-item-name').getByText('Get Users');
     await expect(request).toBeVisible();
     await request.click();
-    
+
     // Verify the URL is set correctly
     await expect(page.locator('#request-url')).toContainText('https://jsonplaceholder.typicode.com/users');
-    
+
     // Clean up
     await app.close();
   });
@@ -40,7 +39,7 @@ test.describe('Onboarding', () => {
     const userDataPath = await createTmpDir('duplicate-collections');
     const app = await launchElectronApp({ userDataPath, dotEnv: env });
     const page = await app.firstWindow();
-    
+
     // First launch - verify sample collection is created
     const sampleCollection = page.locator('#sidebar-collection-name').getByText('Sample API Collection');
     await expect(sampleCollection).toBeVisible();
@@ -48,12 +47,12 @@ test.describe('Onboarding', () => {
     const modeSaveButton = page.getByRole('button', { name: 'Save' });
     await expect(modeSaveButton).toBeVisible();
     await modeSaveButton.click();
-    
+
     // Verify the sample request
     const request = page.locator('.collection-item-name').getByText('Get Users');
     await expect(request).toBeVisible();
     await request.click();
-    
+
     // Verify the URL is set correctly
     await expect(page.locator('#request-url')).toContainText('https://jsonplaceholder.typicode.com/users');
 
@@ -67,16 +66,16 @@ test.describe('Onboarding', () => {
     // Verify only one sample collection exists
     const sampleCollections = newPage.locator('#sidebar-collection-name').getByText('Sample API Collection');
     await expect(sampleCollections).toHaveCount(1);
-    
+
     // Verify the collection still works after restart
     await sampleCollections.click();
     const request2 = newPage.locator('.collection-item-name').getByText('Get Users');
     await expect(request2).toBeVisible();
     await request2.click();
-    
+
     // Verify the URL is still correct after restart
     await expect(newPage.locator('#request-url')).toContainText('https://jsonplaceholder.typicode.com/users');
-    
+
     // Clean up
     await newApp.close();
   });
@@ -85,29 +84,27 @@ test.describe('Onboarding', () => {
     const userDataPath = await createTmpDir('first-launch');
     const app = await launchElectronApp({ userDataPath, dotEnv: env });
     const page = await app.firstWindow();
-    
+
     // First launch - sample collection should be created
-    const sampleCollection = page.locator('.collection-name').filter({ hasText: 'Sample API Collection' });
+    const sampleCollection = page.getByTestId('collections').locator('.collection-name').filter({ hasText: 'Sample API Collection' });
     await expect(sampleCollection).toBeVisible();
-    
-    // User closes the sample collection (hover on the collection and open context menu)
+
+    // User removes the sample collection from workspace (hover on the collection and open context menu)
     await sampleCollection.hover();
     await sampleCollection.locator('.collection-actions .icon').click();
 
-    
-    // Close the sample collection
-    const closeOption = page.locator('.dropdown-item').getByText('Close');
-    await expect(closeOption).toBeVisible();
-    await closeOption.click();
-    
-    // Handle the confirmation dialog - click the 'Close' button to confirm
-    const confirmCloseButton = page.getByRole('button', { name: 'Close' });
-    await expect(confirmCloseButton).toBeVisible();
-    await confirmCloseButton.click();
-    
+    // Remove the sample collection
+    const removeOption = page.locator('.dropdown-item').getByText('Remove');
+    await expect(removeOption).toBeVisible();
+    await removeOption.click();
+
+    // Confirm removal in the modal
+    const removeModal = page.getByRole('dialog').filter({ has: page.getByText('Remove Collection') });
+    await removeModal.getByRole('button', { name: 'Remove' }).click();
+
     // Verify collection is closed (no longer visible in sidebar)
     await expect(sampleCollection).not.toBeVisible();
-  
+
     // Restart app - sample collection should NOT be recreated
     const newApp = await reuseOrLaunchElectronApp({ userDataPath, dotEnv: env });
     const newPage = await newApp.firstWindow();
@@ -127,7 +124,7 @@ test.describe('Onboarding', () => {
     // This test simulates old users who already have a collection opened
     const brunoTestbench = page.locator('#sidebar-collection-name').getByText('bruno-testbench');
     await expect(brunoTestbench).toBeVisible();
-    
+
     // Verify no sample collection was created since user already has collections
     const sampleCollection = page.locator('#sidebar-collection-name').getByText('Sample API Collection');
     await expect(sampleCollection).not.toBeVisible();
diff --git a/tests/preferences/autosave/autosave.spec.ts b/tests/preferences/autosave/autosave.spec.ts
new file mode 100644
index 000000000..7be6572bb
--- /dev/null
+++ b/tests/preferences/autosave/autosave.spec.ts
@@ -0,0 +1,198 @@
+import { test, expect } from '../../../playwright';
+import { createCollection, closeAllCollections, createRequest } from '../../utils/page';
+
+test.describe('Autosave', () => {
+  test.afterEach(async ({ page }) => {
+    await closeAllCollections(page);
+  });
+
+  test('should automatically save request changes when autosave is enabled', async ({ page, createTmpDir }) => {
+    const collectionName = 'autosave-test';
+
+    await test.step('Create collection and request', async () => {
+      await createCollection(page, collectionName, await createTmpDir('autosave-collection'), {
+        openWithSandboxMode: 'safe'
+      });
+      await expect(page.locator('#sidebar-collection-name').filter({ hasText: collectionName })).toBeVisible();
+
+      await createRequest(page, 'Test Request', collectionName);
+      await page.locator('.collection-item-name').filter({ hasText: 'Test Request' }).click();
+
+      // Set initial URL and save
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('https://api.example.com');
+      await page.keyboard.press('Control+s');
+
+      // Verify no draft indicator
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Test Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+
+    await test.step('Enable autosave in preferences', async () => {
+      // Open preferences
+      await page.locator('.status-bar button[data-trigger="preferences"]').click();
+
+      const preferencesModal = page.locator('.bruno-modal-card').filter({ hasText: 'Preferences' });
+      await expect(preferencesModal).toBeVisible();
+
+      // Enable autosave checkbox
+      const autoSaveCheckbox = preferencesModal.locator('#autoSaveEnabled');
+      await autoSaveCheckbox.check();
+
+      // Save preferences
+      await preferencesModal.locator('button[type="submit"]').click();
+
+      // Wait for preferences to close
+      await expect(preferencesModal).not.toBeVisible();
+    });
+
+    await test.step('Make changes and verify autosave', async () => {
+      // Make a change to the URL
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.press('End');
+      await page.keyboard.type('/users');
+
+      // Verify draft indicator appears
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Test Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+
+      // Wait for autosave to trigger (interval + some buffer)
+      await page.waitForTimeout(1000);
+
+      // Verify draft indicator disappears after autosave
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+
+    await test.step('Verify changes persisted', async () => {
+      // Close and reopen the request tab to verify persistence
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Test Request' }) });
+      await requestTab.locator('.close-icon').click();
+
+      // Reopen request
+      await page.locator('.collection-item-name').filter({ hasText: 'Test Request' }).click();
+
+      // Verify URL contains our changes
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const urlContent = await urlEditor.locator('.CodeMirror-line').first().textContent();
+      expect(urlContent).toContain('api.example.com/users');
+    });
+
+    await test.step('Disable autosave in preferences', async () => {
+      // Open preferences from status bar
+      await page.locator('.status-bar button[data-trigger="preferences"]').click();
+
+      // Wait for preferences modal
+      const preferencesModal = page.locator('.bruno-modal-card').filter({ hasText: 'Preferences' });
+      await expect(preferencesModal).toBeVisible();
+
+      // Disable autosave checkbox
+      const autoSaveCheckbox = preferencesModal.locator('#autoSaveEnabled');
+      await autoSaveCheckbox.uncheck();
+
+      // Save preferences
+      await preferencesModal.locator('button[type="submit"]').click();
+
+      // Wait for preferences to close
+      await expect(preferencesModal).not.toBeVisible();
+    });
+
+    await test.step('Make changes and verify no autosave when disabled', async () => {
+      // Make a change to the URL
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.press('End');
+      await page.keyboard.type('/posts');
+
+      // Verify draft indicator appears
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Test Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+
+      // Wait a bit (longer than autosave interval would be)
+      await page.waitForTimeout(1500);
+
+      // Draft indicator should still be visible (autosave is disabled)
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+
+      // Save the request
+      await page.keyboard.press('Control+s');
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+  });
+
+  test('should autosave existing drafts when autosave is enabled', async ({ page, createTmpDir }) => {
+    const collectionName = 'autosave-existing-drafts-test';
+
+    await test.step('Create collection and request with initial URL', async () => {
+      await createCollection(page, collectionName, await createTmpDir('autosave-existing-drafts-collection'), {
+        openWithSandboxMode: 'safe'
+      });
+      await expect(page.locator('#sidebar-collection-name').filter({ hasText: collectionName })).toBeVisible();
+
+      await createRequest(page, 'Draft Request', collectionName);
+      await page.locator('.collection-item-name').filter({ hasText: 'Draft Request' }).click();
+
+      // Set initial URL and save
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('https://api.example.com');
+      await page.keyboard.press('Control+s');
+
+      // Verify no draft indicator
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Draft Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+
+    await test.step('Make changes to create a draft (without saving)', async () => {
+      // Make a change to the URL
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.press('End');
+      await page.keyboard.type('/existing-draft');
+
+      // Verify draft indicator appears
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Draft Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+    });
+
+    await test.step('Enable autosave and verify existing draft is saved', async () => {
+      // Open preferences
+      await page.locator('.status-bar button[data-trigger="preferences"]').click();
+
+      const preferencesModal = page.locator('.bruno-modal-card').filter({ hasText: 'Preferences' });
+      await expect(preferencesModal).toBeVisible();
+
+      // Enable autosave checkbox
+      const autoSaveCheckbox = preferencesModal.locator('#autoSaveEnabled');
+      await autoSaveCheckbox.check();
+
+      // Save preferences
+      await preferencesModal.locator('button[type="submit"]').click();
+
+      // Wait for preferences to close
+      await expect(preferencesModal).not.toBeVisible();
+
+      // Wait for autosave to trigger for existing draft
+      await page.waitForTimeout(1000);
+
+      // Verify draft indicator disappears (existing draft was auto-saved)
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Draft Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+
+    await test.step('Verify changes persisted', async () => {
+      // Close and reopen the request tab to verify persistence
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Draft Request' }) });
+      await requestTab.locator('.close-icon').click();
+
+      // Reopen request
+      await page.locator('.collection-item-name').filter({ hasText: 'Draft Request' }).click();
+
+      // Verify URL contains our changes
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const urlContent = await urlEditor.locator('.CodeMirror-line').first().textContent();
+      expect(urlContent).toContain('api.example.com/existing-draft');
+    });
+  });
+});
diff --git a/tests/preferences/default-collection-location/default-collection-location.spec.js b/tests/preferences/default-collection-location/default-collection-location.spec.js
index 3eeda754f..edb751bd9 100644
--- a/tests/preferences/default-collection-location/default-collection-location.spec.js
+++ b/tests/preferences/default-collection-location/default-collection-location.spec.js
@@ -56,14 +56,17 @@ test.describe('Default Collection Location Feature', () => {
 
   test('Should use default location in Create Collection modal', async ({ pageWithUserData: page }) => {
     // test Create Collection modal
-    await page.locator('[data-testid="create-collection"]').click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
 
-    // verify the default location is pre-filled
+    // verify the default location is pre-filled (if location input is visible)
     const collectionLocationInput = page.getByLabel('Location');
-    await expect(collectionLocationInput).toHaveValue('/tmp/bruno-collections');
+    if (await collectionLocationInput.isVisible()) {
+      await expect(collectionLocationInput).toHaveValue('/tmp/bruno-collections');
+    }
 
     // cancel the collection creation
-    await page.getByRole('button', { name: 'Cancel' }).click();
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Cancel' }).click();
 
     // wait for 2 seconds
     await page.waitForTimeout(2000);
@@ -71,12 +74,19 @@ test.describe('Default Collection Location Feature', () => {
 
   test('Should use default location in Clone Collection modal', async ({ pageWithUserData: page }) => {
     // open the clone collection modal
-    await page.locator('[data-testid="collection-actions"]').click();
-    await page.getByTestId('clone-collection').click();
+    const collection = page.locator('.collection-name').first();
+    await collection.hover();
+    await collection.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Clone' }).click();
 
     // verify the default location is pre-filled
     const cloneLocationInput = page.getByLabel('Location');
-    await expect(cloneLocationInput).toHaveValue('/tmp/bruno-collections');
+    if (await cloneLocationInput.isVisible()) {
+      await expect(cloneLocationInput).toHaveValue('/tmp/bruno-collections');
+    }
+
+    // cancel the clone operation
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Cancel' }).click();
 
     // wait for 2 seconds
     await page.waitForTimeout(2000);
diff --git a/tests/preferences/support-links.spec.js b/tests/preferences/support-links.spec.js
index d3a585c67..550b4ba02 100644
--- a/tests/preferences/support-links.spec.js
+++ b/tests/preferences/support-links.spec.js
@@ -1,27 +1,27 @@
 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();
-   
-   // Go to Support tab
-   await page.getByRole('tab', { name: 'Support' }).click();
+  // Open Preferences
+  await page.getByLabel('Open Preferences').click();
 
-   // Verify all support links with correct URL
-   const locator_twitter = page.getByRole('link', { name: 'Twitter' });
-   expect(await locator_twitter.getAttribute('href')).toEqual('https://twitter.com/use_bruno');
+  // Go to Support tab
+  await page.getByRole('tab', { name: 'Support' }).click();
 
-   const locator_github = page.getByRole('link', { name: 'GitHub', exact: true });
-   expect(await locator_github.getAttribute('href')).toEqual('https://github.com/usebruno/bruno');
+  // Verify all support links with correct URL
+  const locator_twitter = page.getByRole('link', { name: 'Twitter' });
+  expect(await locator_twitter.getAttribute('href')).toEqual('https://twitter.com/use_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_github = page.getByRole('link', { name: 'GitHub', exact: true });
+  expect(await locator_github.getAttribute('href')).toEqual('https://github.com/usebruno/bruno');
 
-   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_discord = page.getByRole('link', { name: 'Discord', exact: true });
+  expect(await locator_discord.getAttribute('href')).toEqual('https://discord.com/invite/KgcZUncpjq');
 
-   const locator_documentation = page.getByRole('link', { name: 'Documentation', exact: true });
-   expect(await locator_documentation.getAttribute('href')).toEqual('https://docs.usebruno.com');
+  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');
 
   await page.locator('[data-test-id="modal-close-button"]').click();
 });
diff --git a/tests/request/copy-request/copy-folder.spec.ts b/tests/request/copy-request/copy-folder.spec.ts
new file mode 100644
index 000000000..247b038a0
--- /dev/null
+++ b/tests/request/copy-request/copy-folder.spec.ts
@@ -0,0 +1,92 @@
+import { test, expect } from '../../../playwright';
+import { closeAllCollections, createCollection } from '../../utils/page';
+
+test.describe('Copy and Paste Folders', () => {
+  test.afterAll(async ({ page }) => {
+    await closeAllCollections(page);
+  });
+
+  test('should copy and paste a folder within the same collection', async ({ page, createTmpDir }) => {
+    await createCollection(page, 'test-collection', await createTmpDir('test-collection'), { openWithSandboxMode: 'safe' });
+    const collection = page.locator('.collection-name').filter({ hasText: 'test-collection' });
+
+    // Create a new folder with a request inside
+    await collection.locator('.collection-actions').hover();
+    await collection.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'New Folder' }).click();
+    await page.locator('#folder-name').fill('folder-to-copy');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    const folder = page.locator('.collection-item-name').filter({ hasText: 'folder-to-copy' });
+    await expect(folder).toBeVisible();
+
+    // Add a request to the folder
+    await folder.hover();
+    await folder.locator('.menu-icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'New Request' }).click();
+    await page.getByPlaceholder('Request Name').fill('request-in-folder');
+    await page.locator('#new-request-url .CodeMirror').click();
+    await page.locator('textarea').fill('https://echo.usebruno.com/test');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    await folder.click();
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'request-in-folder' })).toBeVisible();
+
+    // Copy the folder
+    await folder.hover();
+    await folder.locator('.menu-icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Copy' }).click();
+
+    // Paste into the collection root
+    await collection.hover();
+    await collection.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Paste' }).click();
+
+    // Verify the pasted folder appears
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'folder-to-copy' })).toHaveCount(2);
+  });
+
+  test('should copy and paste a folder into a different collection', async ({ page, createTmpDir }) => {
+    // Create second collection
+    await createCollection(page, 'test-collection-2', await createTmpDir('test-collection-2'), { openWithSandboxMode: 'safe' });
+    const collection2 = page.locator('.collection-name').filter({ hasText: 'test-collection-2' });
+
+    // Paste the folder from clipboard into the new collection
+    await collection2.hover();
+    await collection2.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Paste' }).click();
+
+    // Verify the pasted folder appears in the new collection
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'folder-to-copy' })).toHaveCount(3);
+  });
+
+  test('should paste folder into another folder', async ({ page }) => {
+    const collection = page.locator('.collection-name').filter({ hasText: 'test-collection-2' });
+    const folderToCopy = page.locator('.collection-item-name').filter({ hasText: 'folder-to-copy' }).first();
+
+    // Create a target folder
+    await collection.locator('.collection-actions').hover();
+    await collection.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'New Folder' }).click();
+    await page.locator('#folder-name').fill('target-folder');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    const targetFolder = page.locator('.collection-item-name').filter({ hasText: 'target-folder' });
+    await expect(targetFolder).toBeVisible();
+    await targetFolder.click();
+
+    // Copy folder-to-copy
+    await folderToCopy.hover();
+    await folderToCopy.locator('.menu-icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Copy' }).click();
+    await folderToCopy.click();
+
+    // Paste into target folder
+    await targetFolder.hover();
+    await targetFolder.locator('.menu-icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Paste' }).click();
+
+    // Verify folder was pasted inside target folder
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'folder-to-copy' })).toHaveCount(4);
+  });
+});
diff --git a/tests/request/copy-request/copy-request.spec.ts b/tests/request/copy-request/copy-request.spec.ts
index 1646a4969..bd913b4cd 100644
--- a/tests/request/copy-request/copy-request.spec.ts
+++ b/tests/request/copy-request/copy-request.spec.ts
@@ -50,7 +50,6 @@ test.describe('Copy and Paste Requests', () => {
     await folder.locator('.menu-icon').click();
     await page.locator('.dropdown-item').filter({ hasText: 'Paste' }).click();
 
-    await page.waitForTimeout(2000);
     await expect(page.locator('.collection-item-name').filter({ hasText: 'original-request' })).toHaveCount(3);
   });
 
diff --git a/tests/request/copy-request/keyboard-shortcuts.spec.ts b/tests/request/copy-request/keyboard-shortcuts.spec.ts
new file mode 100644
index 000000000..9a3f20ed7
--- /dev/null
+++ b/tests/request/copy-request/keyboard-shortcuts.spec.ts
@@ -0,0 +1,93 @@
+import { test, expect } from '../../../playwright';
+import { closeAllCollections, createCollection } from '../../utils/page';
+
+test.describe('Copy and Paste with Keyboard Shortcuts', () => {
+  test.afterAll(async ({ page }) => {
+    await closeAllCollections(page);
+  });
+
+  test('should copy and paste request using keyboard shortcuts', async ({ page, createTmpDir }) => {
+    await createCollection(page, 'keyboard-test', await createTmpDir('keyboard-test'), { openWithSandboxMode: 'safe' });
+    const collection = page.locator('.collection-name').filter({ hasText: 'keyboard-test' });
+
+    // Create a request
+    await collection.locator('.collection-actions').hover();
+    await collection.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'New Request' }).click();
+    await page.getByPlaceholder('Request Name').fill('test-request');
+    await page.locator('#new-request-url .CodeMirror').click();
+    await page.locator('textarea').fill('https://echo.usebruno.com');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    const requestItem = page.locator('.collection-item-name').filter({ hasText: 'test-request' });
+    await expect(requestItem).toBeVisible();
+
+    // Focus the request item
+    await requestItem.click();
+    await requestItem.focus();
+
+    // Wait for keyboard focus indicator
+    await expect(requestItem).toHaveClass(/item-keyboard-focused/);
+
+    // Use Cmd+C on Mac, Ctrl+C on Windows/Linux
+    const modifier = process.platform === 'darwin' ? 'Meta' : 'Control';
+    await page.keyboard.press(`${modifier}+KeyC`);
+
+    // Verify copy success (toast message)
+    await expect(page.getByText(/copied to clipboard/i).first()).toBeVisible();
+
+    // Focus the collection to paste
+    await collection.click();
+    await collection.focus();
+
+    // Use Cmd+V on Mac, Ctrl+V on Windows/Linux
+    await page.keyboard.press(`${modifier}+KeyV`);
+
+    // Verify paste success
+    await expect(page.getByText(/pasted successfully/i).first()).toBeVisible();
+
+    // Verify the pasted request appears
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'test-request' })).toHaveCount(2);
+  });
+
+  test('should copy and paste folder using keyboard shortcuts', async ({ page }) => {
+    const collection = page.locator('.collection-name').filter({ hasText: 'keyboard-test' });
+
+    // Create a folder
+    await collection.locator('.collection-actions').hover();
+    await collection.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'New Folder' }).click();
+    await page.locator('#folder-name').fill('test-folder');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    const folder = page.locator('.collection-item-name').filter({ hasText: 'test-folder' });
+    await expect(folder).toBeVisible();
+
+    // Focus the folder
+    await folder.click();
+    await folder.focus();
+
+    // Wait for keyboard focus indicator
+    await expect(folder).toHaveClass(/item-keyboard-focused/);
+
+    // Use keyboard shortcut to copy
+    const modifier = process.platform === 'darwin' ? 'Meta' : 'Control';
+    await page.keyboard.press(`${modifier}+KeyC`);
+
+    // Verify copy success
+    await expect(page.getByText(/copied to clipboard/i).first()).toBeVisible();
+
+    // Focus the collection to paste
+    await collection.click();
+    await collection.focus();
+
+    // Use keyboard shortcut to paste
+    await page.keyboard.press(`${modifier}+KeyV`);
+
+    // Verify paste success
+    await expect(page.getByText(/pasted successfully/i).first()).toBeVisible();
+
+    // Verify the pasted folder appears
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'test-folder' })).toHaveCount(2);
+  });
+});
diff --git a/tests/request/delete-request/delete-request-sequence-updation.spec.ts b/tests/request/delete-request/delete-request-sequence-updation.spec.ts
new file mode 100644
index 000000000..185da85be
--- /dev/null
+++ b/tests/request/delete-request/delete-request-sequence-updation.spec.ts
@@ -0,0 +1,55 @@
+import { test, expect } from '../../../playwright';
+import { closeAllCollections, createCollection, createRequest, deleteRequest } from '../../utils/page';
+
+test.describe('Delete Request Sequence Updation', () => {
+  test.afterAll(async ({ page }) => {
+    await closeAllCollections(page);
+  });
+
+  test('Maintain correct sequence after deleting requests', async ({ page, createTmpDir }) => {
+    const collectionName = 'test-collection';
+
+    // Create a collection
+    await createCollection(page, collectionName, await createTmpDir(collectionName), { openWithSandboxMode: 'safe' });
+
+    // Create request-a
+    await createRequest(page, 'request-a', collectionName);
+
+    // Create request-b
+    await createRequest(page, 'request-b', collectionName);
+
+    // Create request-c
+    await createRequest(page, 'request-c', collectionName);
+
+    // Create request-d
+    await createRequest(page, 'request-d', collectionName);
+
+    // Verify all requests are created in order
+    const allRequests = page.locator('.collection-item-name');
+    await expect(allRequests.nth(0)).toContainText('request-a');
+    await expect(allRequests.nth(1)).toContainText('request-b');
+    await expect(allRequests.nth(2)).toContainText('request-c');
+    await expect(allRequests.nth(3)).toContainText('request-d');
+
+    // Delete request-b
+    await deleteRequest(page, 'request-b', collectionName);
+
+    // Delete request-c
+    await deleteRequest(page, 'request-c', collectionName);
+
+    // Verify remaining requests are in correct order (a and d)
+    const remainingRequests = page.locator('.collection-item-name');
+    await expect(remainingRequests.nth(0)).toContainText('request-a');
+    await expect(remainingRequests.nth(1)).toContainText('request-d');
+
+    // Create request-e
+    await createRequest(page, 'request-e', collectionName);
+
+    // Verify request-e is created at the last position (3rd position: a, d, e)
+    const finalRequests = page.locator('.collection-item-name');
+    await expect(finalRequests.nth(0)).toContainText('request-a');
+    await expect(finalRequests.nth(1)).toContainText('request-d');
+    await expect(finalRequests.nth(2)).toContainText('request-e');
+    await expect(finalRequests).toHaveCount(3);
+  });
+});
diff --git a/tests/request/encoding/curl-encoding.spec.ts b/tests/request/encoding/curl-encoding.spec.ts
index 255d22a55..c6a7b7f78 100644
--- a/tests/request/encoding/curl-encoding.spec.ts
+++ b/tests/request/encoding/curl-encoding.spec.ts
@@ -18,11 +18,15 @@ test.describe('Code Generation URL Encoding', () => {
     page,
     createTmpDir
   }) => {
-    await page.locator('.dropdown-icon').click();
-    await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    // Use plus icon button in new workspace UI
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
     await page.getByLabel('Name').fill('unencoded-test-collection');
-    await page.getByLabel('Location').fill(await createTmpDir('unencoded-test-collection'));
-    await page.getByRole('button', { name: 'Create', exact: true }).click();
+    const locationInput = page.getByLabel('Location');
+    if (await locationInput.isVisible()) {
+      await locationInput.fill(await createTmpDir('unencoded-test-collection'));
+    }
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
 
     await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'unencoded-test-collection' })).toBeVisible();
     await page.locator('#sidebar-collection-name').filter({ hasText: 'unencoded-test-collection' }).click();
@@ -60,11 +64,15 @@ test.describe('Code Generation URL Encoding', () => {
     page,
     createTmpDir
   }) => {
-    await page.locator('.dropdown-icon').click();
-    await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    // Use plus icon button in new workspace UI
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
     await page.getByLabel('Name').fill('encoded-test-collection');
-    await page.getByLabel('Location').fill(await createTmpDir('encoded-test-collection'));
-    await page.getByRole('button', { name: 'Create', exact: true }).click();
+    const locationInput = page.getByLabel('Location');
+    if (await locationInput.isVisible()) {
+      await locationInput.fill(await createTmpDir('encoded-test-collection'));
+    }
+    await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
 
     await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'encoded-test-collection' })).toBeVisible();
     await page.locator('#sidebar-collection-name').filter({ hasText: 'encoded-test-collection' }).click();
diff --git a/tests/request/newlines/newlines-persistence.spec.ts b/tests/request/newlines/newlines-persistence.spec.ts
new file mode 100644
index 000000000..249ee7ab5
--- /dev/null
+++ b/tests/request/newlines/newlines-persistence.spec.ts
@@ -0,0 +1,79 @@
+import { test, expect } from '../../../playwright';
+import { openCollectionAndAcceptSandbox } from '../../utils/page/actions';
+import { getTableCell } from '../../utils/page/locators';
+
+test('should persist request with newlines across app restarts', async ({ createTmpDir, launchElectronApp }) => {
+  const userDataPath = await createTmpDir('newlines-persistence-userdata');
+  const collectionPath = await createTmpDir('newlines-persistence-collection');
+
+  // Create collection and request
+  const app1 = await launchElectronApp({ userDataPath });
+  const page = await app1.firstWindow();
+
+  await page.locator('.plus-icon-button').click();
+  await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
+  await page.locator('.bruno-modal').getByLabel('Name').fill('newlines-persistence');
+  await page.locator('.bruno-modal').getByLabel('Location').fill(collectionPath);
+  await page.locator('.bruno-modal').getByRole('button', { name: 'Create' }).click();
+
+  const collection = page.getByTestId('collections').locator('.collection-name').filter({ hasText: 'newlines-persistence' });
+  await collection.locator('.collection-actions').hover();
+  await collection.locator('.collection-actions .icon').click();
+  await page.locator('.dropdown-item').filter({ hasText: 'New Request' }).click();
+  await page.getByPlaceholder('Request Name').fill('persistence-test');
+  await page.locator('#new-request-url').locator('.CodeMirror').click();
+  await page.locator('#new-request-url').locator('textarea').fill('https://httpbin.org/get');
+  await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
+
+  await openCollectionAndAcceptSandbox(page, 'newlines-persistence', 'safe');
+  await page.locator('.collection-item-name').filter({ hasText: 'persistence-test' }).dblclick();
+
+  // Add query param
+  await page.getByRole('tab', { name: 'Params' }).click();
+  await page.getByRole('button', { name: /Add.*Param/i }).click();
+
+  const paramRow = page.locator('table tbody tr').last();
+  await getTableCell(paramRow, 0).locator('input[type="text"]').fill('queryParamKey');
+
+  // Add header with newlines
+  await page.getByRole('tab', { name: 'Headers' }).click();
+  await page.getByRole('button', { name: /Add.*Header/i }).click();
+
+  const headerRow = page.locator('table tbody tr').last();
+  await getTableCell(headerRow, 0).locator('.CodeMirror').click();
+  await getTableCell(headerRow, 0).locator('textarea').fill('headerKey');
+  await getTableCell(headerRow, 1).locator('.CodeMirror').click();
+  await getTableCell(headerRow, 1).locator('textarea').fill('header\nValue');
+
+  // Add Pre Request var with newlines
+  await page.getByRole('tab', { name: 'Vars' }).click();
+  await page.locator('.btn-add-var').click();
+  const preReqRow = page.locator('table tbody tr').first();
+  await getTableCell(preReqRow, 0).locator('input[type="text"]').fill('preRequestVar');
+  await getTableCell(preReqRow, 1).locator('.CodeMirror').click();
+  await getTableCell(preReqRow, 1).locator('textarea').fill('pre\nRequest\nValue');
+
+  await page.keyboard.press('Meta+s');
+  await app1.close();
+
+  // Verify persistence after restart
+  const app2 = await launchElectronApp({ userDataPath });
+  const page2 = await app2.firstWindow();
+
+  await page2.getByTestId('collections').locator('.collection-name').filter({ hasText: 'newlines-persistence' }).click();
+  await page2.locator('.collection-item-name').filter({ hasText: 'persistence-test' }).dblclick();
+
+  // Verify params persisted
+  await page2.getByRole('tab', { name: 'Params' }).click();
+  await expect(page2.locator('table tbody tr')).toHaveCount(1);
+
+  // Verify headers persisted
+  await page2.getByRole('tab', { name: 'Headers' }).click();
+  await expect(page2.locator('table tbody tr')).toHaveCount(1);
+
+  // Verify vars persisted
+  await page2.getByRole('tab', { name: 'Vars' }).click();
+  await expect(page2.locator('table tbody tr')).toHaveCount(1);
+
+  await app2.close();
+});
diff --git a/tests/request/save/save.spec.ts b/tests/request/save/save.spec.ts
index 3cd18df30..a40d3161f 100644
--- a/tests/request/save/save.spec.ts
+++ b/tests/request/save/save.spec.ts
@@ -9,11 +9,14 @@ const isRequestSaved = async (saveButton: Locator) => {
 };
 
 const setup = async (page: Page, createTmpDir: (tag?: string | undefined) => Promise<string>) => {
-  await page.locator('.dropdown-icon').click();
-  await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+  await page.locator('.plus-icon-button').click();
+  await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
   await page.getByLabel('Name').fill('source-collection');
-  await page.getByLabel('Location').fill(await createTmpDir('source-collection'));
-  await page.getByRole('button', { name: 'Create', exact: true }).click();
+  const locationInput = page.getByLabel('Location');
+  if (await locationInput.isVisible()) {
+    await locationInput.fill(await createTmpDir('source-collection'));
+  }
+  await page.locator('.bruno-modal').getByRole('button', { name: 'Create', exact: true }).click();
   await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'source-collection' })).toBeVisible();
   await page.locator('#sidebar-collection-name').filter({ hasText: 'source-collection' }).click();
   await page.getByLabel('Safe Mode').check();
diff --git a/tests/request/tests/custom-search/custom-search.spec.ts b/tests/request/tests/custom-search/custom-search.spec.ts
index b6c620224..9806782b4 100644
--- a/tests/request/tests/custom-search/custom-search.spec.ts
+++ b/tests/request/tests/custom-search/custom-search.spec.ts
@@ -2,7 +2,7 @@ import { test, expect } from '../../../../playwright';
 
 test.describe('Custom Search Functionality in Scripts Tab', () => {
   test('should open search box when Cmd+F or Ctrl+F is pressed in scripts tab', async ({ pageWithUserData: page }) => {
-    await page.getByTitle('custom-search').click();
+    await page.getByTestId('collections').locator('#sidebar-collection-name').filter({ hasText: 'custom-search' }).click();
 
     await page.getByText('search-test-request').click();
 
@@ -62,7 +62,7 @@ test.describe('Custom Search Functionality in Scripts Tab', () => {
   });
 
   test('should handle search in different script editors independently', async ({ pageWithUserData: page }) => {
-    await page.getByTitle('custom-search').click();
+    await page.getByTestId('collections').locator('#sidebar-collection-name').filter({ hasText: 'custom-search' }).click();
 
     await page.getByText('search-test-request').click();
 
@@ -96,7 +96,7 @@ test.describe('Custom Search Functionality in Scripts Tab', () => {
   });
 
   test('should maintain search state when switching between tabs', async ({ pageWithUserData: page }) => {
-    await page.getByTitle('custom-search').click();
+    await page.getByTestId('collections').locator('#sidebar-collection-name').filter({ hasText: 'custom-search' }).click();
 
     await page.getByText('search-test-request').click();
 
diff --git a/tests/response/response-actions.spec.ts b/tests/response/response-actions.spec.ts
new file mode 100644
index 000000000..7a92d79ee
--- /dev/null
+++ b/tests/response/response-actions.spec.ts
@@ -0,0 +1,51 @@
+import { test, expect } from '../../playwright';
+import { closeAllCollections, createCollection } from '../utils/page/actions';
+
+test.describe('Response Pane Actions', () => {
+  test.afterAll(async ({ page }) => {
+    // cleanup: close all collections
+    await closeAllCollections(page);
+  });
+
+  test('should copy response to clipboard', async ({ page, createTmpDir }) => {
+    const collectionName = 'response-copy-test';
+
+    await test.step('Create collection and request', async () => {
+      // Create collection
+      await createCollection(page, collectionName, await createTmpDir(collectionName), { openWithSandboxMode: 'safe' });
+
+      // Create request
+      const collection = page.locator('.collection-name').filter({ hasText: collectionName });
+      await collection.locator('.collection-actions').hover();
+      await collection.locator('.collection-actions .icon').click();
+      await page.locator('.dropdown-item').filter({ hasText: 'New Request' }).click();
+
+      await page.getByPlaceholder('Request Name').fill('copy-test');
+      await page.locator('#new-request-url .CodeMirror').click();
+      // Using httpbin.org for a simple JSON response
+      await page.locator('textarea').fill('https://httpbin.org/json');
+      await page.getByRole('button', { name: 'Create' }).click();
+    });
+
+    await test.step('Send request and wait for response', async () => {
+      // Send request
+      const sendButton = page.getByTestId('send-arrow-icon');
+      await sendButton.click();
+
+      // Wait for response
+      await expect(page.getByTestId('response-status-code')).toContainText('200', { timeout: 30000 });
+    });
+
+    await test.step('should copy response to clipboard', async () => {
+      // Find the copy button
+      const copyButton = page.locator('button[title="Copy response to clipboard"]');
+      await expect(copyButton).toBeVisible();
+
+      // Click the copy button
+      await copyButton.click();
+
+      // Verify toast notification appears
+      await expect(page.getByText('Response copied to clipboard')).toBeVisible();
+    });
+  });
+});
diff --git a/tests/runner/collection-run-report/collection-run-report.spec.ts b/tests/runner/collection-run-report/collection-run-report.spec.ts
index 42005729c..e106a91d2 100644
--- a/tests/runner/collection-run-report/collection-run-report.spec.ts
+++ b/tests/runner/collection-run-report/collection-run-report.spec.ts
@@ -12,7 +12,7 @@ function normalizeJunitReport(xmlContent: string): string {
     // Replace execution times with fixed value
     .replace(/time="[^"]*"/g, 'time="0.100"')
     // Replace file paths with normalized path
-    .replace(/name="[^"]*\/[^"]*"/g, 'name="/test/path/collection"');
+    .replace(/classname="[^"]*\/[^"]*"/g, 'classname="/test/path/collection"');
 }
 
 test.describe('Collection Run Report Tests', () => {
@@ -35,7 +35,6 @@ test.describe('Collection Run Report Tests', () => {
     // Verify report was generated
     expect(fs.existsSync(junitOutputPath)).toBe(true);
     const junitReportContent = fs.readFileSync(junitOutputPath, 'utf8');
-
     // Snapshot the normalized XML
     const normalizedJunitReport = normalizeJunitReport(junitReportContent);
     expect(normalizedJunitReport).toMatchSnapshot('cli-junit-report.xml');
diff --git a/tests/runner/collection-run-report/collection-run-report.spec.ts-snapshots/cli-junit-report-default-darwin.xml b/tests/runner/collection-run-report/collection-run-report.spec.ts-snapshots/cli-junit-report-default-darwin.xml
index daf9d79d4..a1a6d34a1 100644
--- a/tests/runner/collection-run-report/collection-run-report.spec.ts-snapshots/cli-junit-report-default-darwin.xml
+++ b/tests/runner/collection-run-report/collection-run-report.spec.ts-snapshots/cli-junit-report-default-darwin.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <testsuites>
-  <testsuite name="/test/path/collection" errors="0" failures="0" skipped="0" tests="4" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
+  <testsuite name="Get User Info" errors="0" failures="0" skipped="0" tests="4" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
     <testcase name="Status code is 200" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Response is an object" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Response has slideshow property" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Slideshow has title" status="pass" classname="/test/path/collection" time="0.100"/>
   </testsuite>
-  <testsuite name="/test/path/collection" errors="0" failures="1" skipped="0" tests="5" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
+  <testsuite name="Get UUID" errors="0" failures="1" skipped="0" tests="5" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
     <testcase name="This test will fail" status="fail" classname="/test/path/collection" time="0.100">
       <failure type="failure" message="expected 200 to equal 404"/>
     </testcase>
@@ -15,12 +15,12 @@
     <testcase name="Response has uuid property" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="UUID is a string" status="pass" classname="/test/path/collection" time="0.100"/>
   </testsuite>
-  <testsuite name="/test/path/collection" errors="0" failures="0" skipped="0" tests="3" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
+  <testsuite name="Login Request" errors="0" failures="0" skipped="0" tests="3" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
     <testcase name="Status code is 200" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Response has json field" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Response json has username" status="pass" classname="/test/path/collection" time="0.100"/>
   </testsuite>
-  <testsuite name="/test/path/collection" errors="0" failures="1" skipped="0" tests="2" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
+  <testsuite name="Logout Request" errors="0" failures="1" skipped="0" tests="2" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
     <testcase name="This test will also fail" status="fail" classname="/test/path/collection" time="0.100">
       <failure type="failure" message="expected 200 to equal 500"/>
     </testcase>
diff --git a/tests/runner/collection-run-report/collection-run-report.spec.ts-snapshots/cli-junit-report-default-linux.xml b/tests/runner/collection-run-report/collection-run-report.spec.ts-snapshots/cli-junit-report-default-linux.xml
index daf9d79d4..a1a6d34a1 100644
--- a/tests/runner/collection-run-report/collection-run-report.spec.ts-snapshots/cli-junit-report-default-linux.xml
+++ b/tests/runner/collection-run-report/collection-run-report.spec.ts-snapshots/cli-junit-report-default-linux.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <testsuites>
-  <testsuite name="/test/path/collection" errors="0" failures="0" skipped="0" tests="4" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
+  <testsuite name="Get User Info" errors="0" failures="0" skipped="0" tests="4" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
     <testcase name="Status code is 200" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Response is an object" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Response has slideshow property" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Slideshow has title" status="pass" classname="/test/path/collection" time="0.100"/>
   </testsuite>
-  <testsuite name="/test/path/collection" errors="0" failures="1" skipped="0" tests="5" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
+  <testsuite name="Get UUID" errors="0" failures="1" skipped="0" tests="5" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
     <testcase name="This test will fail" status="fail" classname="/test/path/collection" time="0.100">
       <failure type="failure" message="expected 200 to equal 404"/>
     </testcase>
@@ -15,12 +15,12 @@
     <testcase name="Response has uuid property" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="UUID is a string" status="pass" classname="/test/path/collection" time="0.100"/>
   </testsuite>
-  <testsuite name="/test/path/collection" errors="0" failures="0" skipped="0" tests="3" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
+  <testsuite name="Login Request" errors="0" failures="0" skipped="0" tests="3" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
     <testcase name="Status code is 200" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Response has json field" status="pass" classname="/test/path/collection" time="0.100"/>
     <testcase name="Response json has username" status="pass" classname="/test/path/collection" time="0.100"/>
   </testsuite>
-  <testsuite name="/test/path/collection" errors="0" failures="1" skipped="0" tests="2" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
+  <testsuite name="Logout Request" errors="0" failures="1" skipped="0" tests="2" timestamp="2024-01-01T00:00:00.000" hostname="test-host" time="0.100">
     <testcase name="This test will also fail" status="fail" classname="/test/path/collection" time="0.100">
       <failure type="failure" message="expected 200 to equal 500"/>
     </testcase>
diff --git a/tests/runner/collection-run.ts b/tests/runner/collection-run.ts
index d683712de..8d89b8618 100644
--- a/tests/runner/collection-run.ts
+++ b/tests/runner/collection-run.ts
@@ -1,27 +1,24 @@
 import { test, expect } from '../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../utils/page/index';
 
 test.describe.parallel('Collection Run', () => {
   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();
+    // Set up developer mode
+    await setSandboxMode(page, 'bruno-testbench', 'developer');
+
+    // Select environment
     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);
+    // Run the collection
+    await runCollection(page, 'bruno-testbench');
 
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Validate test results
+    await validateRunnerResults(page, {
+      failed: 0
+    });
   });
 
   test.fixme('Run bruno-testbench in Safe Mode', async ({ pageWithUserData: page }) => {
@@ -32,18 +29,41 @@ test.describe.parallel('Collection Run', () => {
     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();
+    const collectionContainer = page.getByTestId('collections').locator('.collection-name').filter({ hasText: 'bruno-testbench' });
+    await collectionContainer.locator('.collection-actions').hover();
+    await collectionContainer.locator('.collection-actions .icon').waitFor({ state: 'visible' });
+    await collectionContainer.locator('.collection-actions .icon').click();
     await page.getByText('Run', { exact: true }).click();
-    await page.getByRole('button', { name: 'Run Collection' }).click();
+    // Wait for the runner tab to open
+    // If there are existing results, reset first, otherwise wait for Run Collection button
+    const resetButton = page.getByRole('button', { name: 'Reset' });
+    const runCollectionButton = page.getByRole('button', { name: 'Run Collection' });
+
+    // Check if Reset button is visible (means there are existing results)
+    const resetVisible = await resetButton.isVisible().catch(() => false);
+    if (resetVisible) {
+      await resetButton.click();
+      // Wait a bit for the reset to complete
+      await page.waitForTimeout(500);
+    }
+
+    // Now wait for and click Run Collection button
+    await runCollectionButton.waitFor({ state: 'visible', timeout: 10000 });
+    await runCollectionButton.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);
+    // Parse and validate test results from filter buttons
+    const allButton = page.locator('button').filter({ hasText: /^All/ });
+    const passedButton = page.locator('button').filter({ hasText: /^Passed/ });
+    const failedButton = page.locator('button').filter({ hasText: /^Failed/ });
+    const skippedButton = page.locator('button').filter({ hasText: /^Skipped/ });
 
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    const totalRequests = parseInt(await allButton.locator('span').innerText());
+    const passed = parseInt(await passedButton.locator('span').innerText());
+    const failed = parseInt(await failedButton.locator('span').innerText());
+    const skipped = parseInt(await skippedButton.locator('span').innerText());
+
+    await expect(failed).toBe(0);
+    await expect(passed).toBe(totalRequests - skipped - failed);
   });
-});
\ No newline at end of file
+});
diff --git a/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_allow_fs/bruno.json b/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_allow_fs/bruno.json
new file mode 100644
index 000000000..6130abc78
--- /dev/null
+++ b/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_allow_fs/bruno.json
@@ -0,0 +1,14 @@
+{
+  "version": "1",
+  "name": "should_allow_fs",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ],
+  "scripts": {
+    "filesystemAccess": {
+      "allow": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_allow_fs/request.bru b/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_allow_fs/request.bru
new file mode 100644
index 000000000..2a2fd846a
--- /dev/null
+++ b/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_allow_fs/request.bru
@@ -0,0 +1,15 @@
+meta {
+  name: request
+  type: http
+  seq: 1
+}
+
+post {
+  url: https://echo.usebruno.com
+  body: none
+  auth: none
+}
+
+script:pre-request {
+  const fs = require('fs');
+}
\ No newline at end of file
diff --git a/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_disallow_fs/bruno.json b/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_disallow_fs/bruno.json
new file mode 100644
index 000000000..e751a8433
--- /dev/null
+++ b/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_disallow_fs/bruno.json
@@ -0,0 +1,14 @@
+{
+  "version": "1",
+  "name": "should_disallow_fs",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ],
+  "scripts": {
+    "filesystemAccess": {
+      "allow": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_disallow_fs/request.bru b/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_disallow_fs/request.bru
new file mode 100644
index 000000000..2a2fd846a
--- /dev/null
+++ b/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_disallow_fs/request.bru
@@ -0,0 +1,15 @@
+meta {
+  name: request
+  type: http
+  seq: 1
+}
+
+post {
+  url: https://echo.usebruno.com
+  body: none
+  auth: none
+}
+
+script:pre-request {
+  const fs = require('fs');
+}
\ No newline at end of file
diff --git a/tests/scripting/inbuilt-libraries/fs/fs.spec.ts b/tests/scripting/inbuilt-libraries/fs/fs.spec.ts
new file mode 100644
index 000000000..72471fbb7
--- /dev/null
+++ b/tests/scripting/inbuilt-libraries/fs/fs.spec.ts
@@ -0,0 +1,80 @@
+import { test } from '../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../utils/page';
+
+test.describe.serial('`fs` library', () => {
+  test.describe('should allow `fs` library', () => {
+    test('developer mode', async ({ pageWithUserData: page }) => {
+      test.setTimeout(2 * 60 * 1000);
+
+      // Set up developer mode
+      await setSandboxMode(page, 'should_allow_fs', 'developer');
+
+      // Run the collection
+      await runCollection(page, 'should_allow_fs');
+
+      // Validate test results
+      await validateRunnerResults(page, {
+        totalRequests: 1,
+        passed: 1,
+        failed: 0,
+        skipped: 0
+      });
+    });
+
+    test('safe mode', async ({ pageWithUserData: page }) => {
+      test.setTimeout(2 * 60 * 1000);
+
+      // Set up safe mode
+      await setSandboxMode(page, 'should_allow_fs', 'safe');
+
+      // Run the collection
+      await runCollection(page, 'should_allow_fs');
+
+      // Validate test results
+      await validateRunnerResults(page, {
+        totalRequests: 1,
+        passed: 0,
+        failed: 1,
+        skipped: 0
+      });
+    });
+  });
+
+  test.describe('should disallow `fs` library', () => {
+    test('developer mode', async ({ pageWithUserData: page }) => {
+      test.setTimeout(2 * 60 * 1000);
+
+      // Set up developer mode
+      await setSandboxMode(page, 'should_disallow_fs', 'developer');
+
+      // Run the collection
+      await runCollection(page, 'should_disallow_fs');
+
+      // Validate test results
+      await validateRunnerResults(page, {
+        totalRequests: 1,
+        passed: 0,
+        failed: 1,
+        skipped: 0
+      });
+    });
+
+    test('safe mode', async ({ pageWithUserData: page }) => {
+      test.setTimeout(2 * 60 * 1000);
+
+      // Set up safe mode
+      await setSandboxMode(page, 'should_disallow_fs', 'safe');
+
+      // Run the collection
+      await runCollection(page, 'should_disallow_fs');
+
+      // Validate test results
+      await validateRunnerResults(page, {
+        totalRequests: 1,
+        passed: 0,
+        failed: 1,
+        skipped: 0
+      });
+    });
+  });
+});
diff --git a/tests/scripting/inbuilt-libraries/fs/init-user-data/preferences.json b/tests/scripting/inbuilt-libraries/fs/init-user-data/preferences.json
new file mode 100644
index 000000000..31dc9acc8
--- /dev/null
+++ b/tests/scripting/inbuilt-libraries/fs/init-user-data/preferences.json
@@ -0,0 +1,7 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": [
+    "{{projectRoot}}/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_allow_fs",
+    "{{projectRoot}}/tests/scripting/inbuilt-libraries/fs/fixtures/collections/should_disallow_fs"
+  ]
+}
\ No newline at end of file
diff --git a/tests/scripting/inbuilt-libraries/jsonwebtoken/jsonwebtoken.spec.ts b/tests/scripting/inbuilt-libraries/jsonwebtoken/jsonwebtoken.spec.ts
index 74bb23c6d..dacdf563b 100644
--- a/tests/scripting/inbuilt-libraries/jsonwebtoken/jsonwebtoken.spec.ts
+++ b/tests/scripting/inbuilt-libraries/jsonwebtoken/jsonwebtoken.spec.ts
@@ -1,64 +1,40 @@
-import { test, expect } from '../../../../playwright';
+import { test } from '../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../utils/page';
 
 test.describe.serial('jwt collection success', () => {
   test('developer mode', async ({ pageWithUserData: page }) => {
-    // init dev mode
-    await page.getByTitle('jsonwebtoken').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
 
+    // Set up developer mode
+    await setSandboxMode(page, 'jsonwebtoken', 'developer');
+
     // Run the collection
-    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 });
+    await runCollection(page, 'jsonwebtoken');
 
-    // Parse and validate test results
-    const result = await page.getByText('Total Requests: ').innerText();
-    const matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-
-    await expect(parseInt(totalRequests)).toBe(7);
-    await expect(parseInt(passed)).toBe(7);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 7,
+      passed: 7,
+      failed: 0,
+      skipped: 0
+    });
   });
 
   test('safe mode', async ({ pageWithUserData: page }) => {
-    // init safe mode
-    await page.getByTitle('jsonwebtoken').click();
-    await page.getByText('Developer Mode').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
 
+    // Set up safe mode
+    await setSandboxMode(page, 'jsonwebtoken', 'safe');
+
     // Run the collection
-    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 });
+    await runCollection(page, 'jsonwebtoken');
 
-    // Parse and validate test results
-    const result = await page.getByText('Total Requests: ').innerText();
-    const matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-
-    await expect(parseInt(totalRequests)).toBe(7);
-    await expect(parseInt(passed)).toBe(7);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 7,
+      passed: 7,
+      failed: 0,
+      skipped: 0
+    });
   });
 });
diff --git a/tests/ssl/basic-ssl/tests/basic-ssl-success/basic-ssl-success.spec.ts b/tests/ssl/basic-ssl/tests/basic-ssl-success/basic-ssl-success.spec.ts
index 26eb6bf2f..292d59167 100644
--- a/tests/ssl/basic-ssl/tests/basic-ssl-success/basic-ssl-success.spec.ts
+++ b/tests/ssl/basic-ssl/tests/basic-ssl-success/basic-ssl-success.spec.ts
@@ -1,59 +1,40 @@
-import { test, expect } from '../../../../../playwright';
+import { test } from '../../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../../utils/page';
 
 test.describe.serial('basic ssl success', () => {
   test('developer mode', async ({ pageWithUserData: page }) => {
-
-    // init dev mode
-    await page.getByText('badssl').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up developer mode
+    await setSandboxMode(page, 'badssl', 'developer');
+
+    // Run the collection
+    await runCollection(page, 'badssl');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
 
   test('safe mode', async ({ pageWithUserData: page }) => {
-
-    // init safe mode
-    await page.getByText('Developer Mode').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
+    // Set up safe mode
+    await setSandboxMode(page, 'badssl', 'safe');
 
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Run the collection
+    await runCollection(page, 'badssl');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
-});
\ No newline at end of file
+});
diff --git a/tests/ssl/basic-ssl/tests/self-signed-rejected/self-signed-rejected.spec.ts b/tests/ssl/basic-ssl/tests/self-signed-rejected/self-signed-rejected.spec.ts
index 0674154a4..b9ceda07c 100644
--- a/tests/ssl/basic-ssl/tests/self-signed-rejected/self-signed-rejected.spec.ts
+++ b/tests/ssl/basic-ssl/tests/self-signed-rejected/self-signed-rejected.spec.ts
@@ -1,57 +1,40 @@
-import { test, expect } from '../../../../../playwright';
+import { test } from '../../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../../utils/page';
 
 test.describe.serial('self signed rejected', () => {
   test('developer mode', async ({ pageWithUserData: page }) => {
-    // init dev mode
-    await page.getByText('self-signed-badssl').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(0);
-    await expect(parseInt(failed)).toBe(1);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up developer mode
+    await setSandboxMode(page, 'self-signed-badssl', 'developer');
+
+    // Run the collection
+    await runCollection(page, 'self-signed-badssl');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 0,
+      failed: 1,
+      skipped: 0
+    });
   });
 
   test('safe mode', async ({ pageWithUserData: page }) => {
-    // init safe mode
-    await page.getByText('Developer Mode').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
+    // Set up safe mode
+    await setSandboxMode(page, 'self-signed-badssl', 'safe');
 
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(0);
-    await expect(parseInt(failed)).toBe(1);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Run the collection
+    await runCollection(page, 'self-signed-badssl');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 0,
+      failed: 1,
+      skipped: 0
+    });
   });
-});
\ No newline at end of file
+});
diff --git a/tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/self-signed-success-with-validation-disabled.spec.ts b/tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/self-signed-success-with-validation-disabled.spec.ts
index d8edf5a0a..4ce7da761 100644
--- a/tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/self-signed-success-with-validation-disabled.spec.ts
+++ b/tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/self-signed-success-with-validation-disabled.spec.ts
@@ -1,59 +1,40 @@
-import { test, expect } from '../../../../../playwright';
+import { test } from '../../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../../utils/page';
 
 test.describe.serial('self signed success with validation disabled', () => {
   test('developer mode', async ({ pageWithUserData: page }) => {
-
-    // init dev mode
-    await page.getByText('self-signed-badssl').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up developer mode
+    await setSandboxMode(page, 'self-signed-badssl', 'developer');
+
+    // Run the collection
+    await runCollection(page, 'self-signed-badssl');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
 
   test('safe mode', async ({ pageWithUserData: page }) => {
-    
-    // init safe mode
-    await page.getByText('Developer Mode').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
+    // Set up safe mode
+    await setSandboxMode(page, 'self-signed-badssl', 'safe');
 
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Run the collection
+    await runCollection(page, 'self-signed-badssl');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
-});
\ No newline at end of file
+});
diff --git a/tests/ssl/custom-ca-certs/server/helpers/certs.js b/tests/ssl/custom-ca-certs/server/helpers/certs.js
index 259a4f25e..c8a9a385a 100644
--- a/tests/ssl/custom-ca-certs/server/helpers/certs.js
+++ b/tests/ssl/custom-ca-certs/server/helpers/certs.js
@@ -11,10 +11,10 @@ function createCertsDir(certsDir) {
 
 function generateCertificates(certsDir) {
   execCommand('openssl version');
-  
+
   // Generate CA private key
   execCommand('openssl genrsa -out ca-key.pem 4096', certsDir);
-  
+
   // Create CA configuration file with proper CA extensions and subject (LibreSSL/OpenSSL compatible)
   const caConfigContent = `[req]
 distinguished_name = req_distinguished_name
@@ -33,15 +33,15 @@ basicConstraints = critical, CA:TRUE
 keyUsage = critical, keyCertSign, cRLSign
 subjectKeyIdentifier = hash
 authorityKeyIdentifier = keyid:always,issuer:always`;
-  
+
   fs.writeFileSync(path.join(certsDir, 'ca.conf'), caConfigContent);
-  
+
   // Generate CA certificate with proper CA extensions using config file (no -subj needed)
   execCommand('openssl req -new -x509 -key ca-key.pem -out ca-cert.pem -days 3650 -config ca.conf', certsDir);
-  
+
   // Generate server private key and CSR
   execCommand('openssl genrsa -out localhost-key.pem 4096', certsDir);
-  
+
   // Create server CSR configuration file
   const serverCsrConfigContent = `[req]
 distinguished_name = req_distinguished_name
@@ -53,10 +53,10 @@ ST = Dev
 L = Local
 O = Local Dev
 CN = localhost`;
-  
+
   fs.writeFileSync(path.join(certsDir, 'localhost-csr.conf'), serverCsrConfigContent);
   execCommand('openssl req -new -key localhost-key.pem -out localhost.csr -config localhost-csr.conf', certsDir);
-  
+
   // Create server certificate configuration file (LibreSSL/OpenSSL compatible)
   const serverConfigContent = `[req]
 distinguished_name = req_distinguished_name
@@ -83,27 +83,27 @@ DNS.2 = localhost.localdomain
 IP.1 = 127.0.0.1
 IP.2 = ::1
 IP.3 = ::ffff:127.0.0.1`;
-  
+
   fs.writeFileSync(path.join(certsDir, 'localhost.conf'), serverConfigContent);
   execCommand('openssl x509 -req -in localhost.csr -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -out localhost-cert.pem -days 730 -extensions v3_req -extfile localhost.conf', certsDir);
-  
+
   const platform = detectPlatform();
   if (platform === 'windows') {
     execCommand('openssl x509 -in ca-cert.pem -outform DER -out ca-cert.der', certsDir);
     execCommand('openssl pkcs12 -export -out localhost.p12 -inkey localhost-key.pem -in localhost-cert.pem -certfile ca-cert.pem -password pass:', certsDir);
     execCommand('openssl x509 -in localhost-cert.pem -outform DER -out localhost-cert.der', certsDir);
   }
-  
+
   if (platform !== 'windows') {
     execCommand('chmod 600 ca-key.pem localhost-key.pem', certsDir);
     execCommand('chmod 644 ca-cert.pem localhost-cert.pem', certsDir);
   }
-  
-  ['localhost.csr', 'localhost.conf', 'localhost-csr.conf', 'ca.conf', 'ca-cert.srl'].forEach(file => {
+
+  ['localhost.csr', 'localhost.conf', 'localhost-csr.conf', 'ca.conf', 'ca-cert.srl'].forEach((file) => {
     const filePath = path.join(certsDir, file);
     if (fs.existsSync(filePath)) fs.unlinkSync(filePath);
   });
-  
+
   // Validate certificate chain
   validateCertificateChain(certsDir);
 }
@@ -112,29 +112,29 @@ function validateCertificateChain(certsDir) {
   try {
     // Verify CA certificate is valid and has proper CA extensions
     const caVerifyOutput = execCommandSilent('openssl x509 -in ca-cert.pem -text -noout', certsDir).toString();
-    
+
     if (!caVerifyOutput.includes('CA:TRUE')) {
       throw new Error('CA certificate missing basicConstraints=CA:TRUE');
     }
-    
+
     if (!caVerifyOutput.includes('Certificate Sign')) {
       throw new Error('CA certificate missing keyCertSign in keyUsage');
     }
-    
+
     // Verify server certificate is valid and signed by CA
     const serverVerifyOutput = execCommandSilent('openssl x509 -in localhost-cert.pem -text -noout', certsDir).toString();
-    
+
     if (!serverVerifyOutput.includes('CA:FALSE')) {
       throw new Error('Server certificate should have basicConstraints=CA:FALSE');
     }
-    
+
     if (!serverVerifyOutput.includes('TLS Web Server Authentication')) {
       throw new Error('Server certificate missing serverAuth in extendedKeyUsage');
     }
-    
+
     // Verify certificate chain
     execCommandSilent('openssl verify -CAfile ca-cert.pem localhost-cert.pem', certsDir);
-    
+
     console.log('✅ Certificate chain validation passed');
   } catch (error) {
     console.error('❌ Certificate validation failed:', error.message);
@@ -193,7 +193,7 @@ function verifyCertificates(certsDir) {
   const platform = detectPlatform();
   // Core PEM files required for all platforms
   const requiredFiles = ['ca-cert.pem', 'ca-key.pem', 'localhost-cert.pem', 'localhost-key.pem'];
-  
+
   // Verify required PEM files exist
   for (const file of requiredFiles) {
     const filePath = path.join(certsDir, file);
@@ -201,7 +201,7 @@ function verifyCertificates(certsDir) {
       throw new Error(`missing certificate file: ${file}`);
     }
   }
-  
+
   // Check Windows-specific files but don't require them (they're optional fallbacks)
   if (platform === 'windows') {
     const windowsFiles = ['ca-cert.der', 'localhost.p12', 'localhost-cert.der'];
@@ -222,4 +222,3 @@ module.exports = {
   addCAToTruststore,
   verifyCertificates
 };
-
diff --git a/tests/ssl/custom-ca-certs/server/helpers/platform.js b/tests/ssl/custom-ca-certs/server/helpers/platform.js
index b1c88882e..806347a87 100644
--- a/tests/ssl/custom-ca-certs/server/helpers/platform.js
+++ b/tests/ssl/custom-ca-certs/server/helpers/platform.js
@@ -2,18 +2,18 @@ const { execSync } = require('node:child_process');
 const os = require('node:os');
 
 function execCommand(command, cwd = process.cwd()) {
-  return execSync(command, { 
-    cwd, 
+  return execSync(command, {
+    cwd,
     stdio: 'inherit',
-    timeout: 30000 
+    timeout: 30000
   });
 }
 
 function execCommandSilent(command, cwd = process.cwd()) {
-  return execSync(command, { 
-    cwd, 
+  return execSync(command, {
+    cwd,
     stdio: 'pipe',
-    timeout: 30000 
+    timeout: 30000
   });
 }
 
@@ -29,7 +29,7 @@ function detectPlatform() {
 
 function killProcessOnPort(port) {
   const platform = detectPlatform();
-  
+
   try {
     switch (platform) {
       case 'macos':
@@ -57,4 +57,4 @@ module.exports = {
   execCommandSilent,
   detectPlatform,
   killProcessOnPort
-};
\ No newline at end of file
+};
diff --git a/tests/ssl/custom-ca-certs/server/index.js b/tests/ssl/custom-ca-certs/server/index.js
index 4f22a7a7d..7d0725e83 100644
--- a/tests/ssl/custom-ca-certs/server/index.js
+++ b/tests/ssl/custom-ca-certs/server/index.js
@@ -6,11 +6,11 @@ const https = require('node:https');
 const { killProcessOnPort } = require('./helpers/platform');
 
 function createServer(certsDir, port = 8090) {
-  const serverOptions =  {
+  const serverOptions = {
     key: fs.readFileSync(path.join(certsDir, 'localhost-key.pem')),
     cert: fs.readFileSync(path.join(certsDir, 'localhost-cert.pem')),
     ca: fs.readFileSync(path.join(certsDir, 'ca-cert.pem'))
-  }
+  };
 
   const server = https.createServer(serverOptions, (req, res) => {
     res.setHeader('Content-Type', 'text/html; charset=UTF-8');
@@ -31,9 +31,9 @@ function createServer(certsDir, port = 8090) {
 function shutdownServer(server, cleanup) {
   const shutdown = (signal) => {
     console.log(`🛑 Received ${signal}, shutting down`);
-    
+
     if (cleanup) cleanup();
-    
+
     if (server) {
       server.close(() => process.exit(0));
     } else {
@@ -56,11 +56,10 @@ async function startServer() {
 
     console.log(`🌐 Creating server on port ${port}`);
     const server = await createServer(certsDir, port);
-    
+
     shutdownServer(server, () => {
       console.log('✨ Server cleanup completed');
     });
-
   } catch (error) {
     console.error('❌ Server startup failed:', error.message);
     process.exit(1);
@@ -71,4 +70,4 @@ if (require.main === module) {
   startServer();
 }
 
-module.exports = { startServer };
\ No newline at end of file
+module.exports = { startServer };
diff --git a/tests/ssl/custom-ca-certs/server/scripts/generate-certs.js b/tests/ssl/custom-ca-certs/server/scripts/generate-certs.js
index f470f77b8..9028e3748 100644
--- a/tests/ssl/custom-ca-certs/server/scripts/generate-certs.js
+++ b/tests/ssl/custom-ca-certs/server/scripts/generate-certs.js
@@ -13,7 +13,7 @@ const {
  */
 async function setup() {
   console.log('🔧 Setting up CA certificates for test server');
-  
+
   const certsDir = path.join(__dirname, '..', 'certs');
 
   try {
diff --git a/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/custom-invalid-ca-cert-in-config-with-defaults.spec.ts b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/custom-invalid-ca-cert-in-config-with-defaults.spec.ts
index 7b43ead19..6ca570362 100644
--- a/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/custom-invalid-ca-cert-in-config-with-defaults.spec.ts
+++ b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/custom-invalid-ca-cert-in-config-with-defaults.spec.ts
@@ -1,55 +1,40 @@
-import { test, expect } from '../../../../../playwright';
+import { test } from '../../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../../utils/page';
 
-test.describe.serial('custom invalid ca cert added to the config and keep default ca certs', () => {
+test.describe('custom invalid ca cert added to the config and keep default ca certs', () => {
   test('developer mode', async ({ pageWithUserData: page }) => {
-    // init dev mode
-    await page.getByText('custom-ca-certs').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up developer mode
+    await setSandboxMode(page, 'custom-ca-certs', 'developer');
+
+    // Run the collection
+    await runCollection(page, 'custom-ca-certs');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
 
   test('safe mode', async ({ pageWithUserData: page }) => {
-    // init safe mode
-    await page.getByText('Developer Mode').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up safe mode
+    await setSandboxMode(page, 'custom-ca-certs', 'safe');
+
+    // Run the collection
+    await runCollection(page, 'custom-ca-certs');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
-});
\ No newline at end of file
+});
diff --git a/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/custom-invalid-ca-cert-in-config.spec.ts b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/custom-invalid-ca-cert-in-config.spec.ts
index 9d89e0bc4..602c12b7f 100644
--- a/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/custom-invalid-ca-cert-in-config.spec.ts
+++ b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/custom-invalid-ca-cert-in-config.spec.ts
@@ -1,57 +1,40 @@
-import { test, expect } from '../../../../../playwright';
+import { test } from '../../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../../utils/page';
 
 test.describe.serial('custom invalid ca cert added to the config and NO default ca certs', () => {
   test('developer mode', async ({ pageWithUserData: page }) => {
-
-    // init dev mode
-    await page.getByText('custom-ca-certs').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(0);
-    await expect(parseInt(failed)).toBe(1);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up developer mode
+    await setSandboxMode(page, 'custom-ca-certs', 'developer');
+
+    // Run the collection
+    await runCollection(page, 'custom-ca-certs');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 0,
+      failed: 1,
+      skipped: 0
+    });
   });
 
   test('safe mode', async ({ pageWithUserData: page }) => {
-    
-    // init safe mode
-    await page.getByText('Developer Mode').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(0);
-    await expect(parseInt(failed)).toBe(1);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up safe mode
+    await setSandboxMode(page, 'custom-ca-certs', 'safe');
+
+    // Run the collection
+    await runCollection(page, 'custom-ca-certs');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 0,
+      failed: 1,
+      skipped: 0
+    });
   });
-});
\ No newline at end of file
+});
diff --git a/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/custom-valid-ca-cert-in-config-with-defaults.spec.ts b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/custom-valid-ca-cert-in-config-with-defaults.spec.ts
index 97db83b44..23c17354b 100644
--- a/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/custom-valid-ca-cert-in-config-with-defaults.spec.ts
+++ b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/custom-valid-ca-cert-in-config-with-defaults.spec.ts
@@ -1,57 +1,40 @@
-import { test, expect } from '../../../../../playwright';
+import { test } from '../../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../../utils/page';
 
-test.describe.serial('custom valid ca cert added to the config and keep default ca certs', () => {
+test.describe('custom valid ca cert added to the config and keep default ca certs', () => {
   test('developer mode', async ({ pageWithUserData: page }) => {
-
-    // init dev mode
-    await page.getByText('custom-ca-certs').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up developer mode
+    await setSandboxMode(page, 'custom-ca-certs', 'developer');
+
+    // Run the collection
+    await runCollection(page, 'custom-ca-certs');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
 
   test('safe mode', async ({ pageWithUserData: page }) => {
-    
-    // init safe mode
-    await page.getByText('Developer Mode').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up safe mode
+    await setSandboxMode(page, 'custom-ca-certs', 'safe');
+
+    // Run the collection
+    await runCollection(page, 'custom-ca-certs');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
-});
\ No newline at end of file
+});
diff --git a/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/custom-valid-ca-cert-in-config.spec.ts b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/custom-valid-ca-cert-in-config.spec.ts
index 35a7776b2..7675401ce 100644
--- a/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/custom-valid-ca-cert-in-config.spec.ts
+++ b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/custom-valid-ca-cert-in-config.spec.ts
@@ -1,57 +1,40 @@
-import { test, expect } from '../../../../../playwright';
+import { test } from '../../../../../playwright';
+import { setSandboxMode, runCollection, validateRunnerResults } from '../../../../utils/page';
 
-test.describe.serial('custom valid ca cert added to the config and NO default ca certs', () => {
+test.describe('custom valid ca cert added to the config and NO default ca certs', () => {
   test('developer mode', async ({ pageWithUserData: page }) => {
-
-    // init dev mode
-    await page.getByText('custom-ca-certs').click();
-    await page.getByLabel('Developer Mode(use only if').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up developer mode
+    await setSandboxMode(page, 'custom-ca-certs', 'developer');
+
+    // Run the collection
+    await runCollection(page, 'custom-ca-certs');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
 
   test('safe mode', async ({ pageWithUserData: page }) => {
-    
-    // init safe mode
-    await page.getByText('Developer Mode').click();
-    await page.getByLabel('Safe Mode').check();
-    await page.getByRole('button', { name: 'Save' }).click();
-
     test.setTimeout(2 * 60 * 1000);
-    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 matches = result.match(/Total Requests: (\d+), Passed: (\d+), Failed: (\d+), Skipped: (\d+)/);
-    if (!matches) {
-      throw new Error('Could not parse test results');
-    }
-    const [totalRequests, passed, failed, skipped] = matches.slice(1);
-    await expect(parseInt(totalRequests)).toBe(1);
-    await expect(parseInt(passed)).toBe(1);
-    await expect(parseInt(failed)).toBe(0);
-    await expect(parseInt(skipped)).toBe(0);
-    await expect(parseInt(passed)).toBe(parseInt(totalRequests) - parseInt(skipped) - parseInt(failed));
+    // Set up safe mode
+    await setSandboxMode(page, 'custom-ca-certs', 'safe');
+
+    // Run the collection
+    await runCollection(page, 'custom-ca-certs');
+
+    // Validate test results
+    await validateRunnerResults(page, {
+      totalRequests: 1,
+      passed: 1,
+      failed: 0,
+      skipped: 0
+    });
   });
-});
\ No newline at end of file
+});
diff --git a/tests/start/app-open.spec.ts b/tests/start/app-open.spec.ts
index 326ff895c..d2df08383 100644
--- a/tests/start/app-open.spec.ts
+++ b/tests/start/app-open.spec.ts
@@ -1,5 +1,9 @@
 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();
+test('Check if the workspace name is visible in the sidebar', async ({ page }) => {
+  // Wait for the app to be loaded
+  await page.locator('[data-app-state="loaded"]').waitFor({ timeout: 30000 });
+
+  // Wait for the workspace name container to be visible (contains workspace name like "My Workspace" or "Default Workspace")
+  await expect(page.locator('.workspace-name-container')).toBeVisible();
 });
diff --git a/tests/utils/page/actions.ts b/tests/utils/page/actions.ts
index 0dcd11505..fd41eab73 100644
--- a/tests/utils/page/actions.ts
+++ b/tests/utils/page/actions.ts
@@ -1,4 +1,5 @@
 import { test, expect } from '../../../playwright';
+import { buildCommonLocators } from './locators';
 
 /**
  * Close all collections
@@ -7,20 +8,20 @@ import { test, expect } from '../../../playwright';
  */
 const closeAllCollections = async (page) => {
   await test.step('Close all collections', async () => {
-    const numberOfCollections = await page.locator('.collection-name').count();
+    const numberOfCollections = await page.locator('[data-testid="collections"] .collection-name').count();
 
     for (let i = 0; i < numberOfCollections; i++) {
-      await page.locator('.collection-name').first().locator('.collection-actions').click();
-      await page.locator('.dropdown-item').getByText('Close').click();
-      // Wait for the close collection modal to be visible
-      await page.locator('.bruno-modal-header-title', { hasText: 'Close Collection' }).waitFor({ state: 'visible' });
+      await page.locator('[data-testid="collections"] .collection-name').first().locator('.collection-actions').click();
+      await page.locator('.dropdown-item').getByText('Remove').click();
+      // Wait for the remove collection modal to be visible
+      await page.locator('.bruno-modal-header-title', { hasText: 'Remove Collection' }).waitFor({ state: 'visible' });
       await page.locator('.bruno-modal-footer .submit').click();
-      // Wait for the close collection modal to be hidden
-      await page.locator('.bruno-modal-header-title', { hasText: 'Close Collection' }).waitFor({ state: 'hidden' });
+      // Wait for the remove collection modal to be hidden
+      await page.locator('.bruno-modal-header-title', { hasText: 'Remove Collection' }).waitFor({ state: 'hidden' });
     }
 
-    // Wait until no collections are left open
-    await expect(page.locator('.collection-name')).toHaveCount(0);
+    // Wait until no collections are left open (check sidebar only)
+    await expect(page.getByTestId('collections').locator('.collection-name')).toHaveCount(0);
   });
 };
 
@@ -61,13 +62,16 @@ type CreateCollectionOptions = {
  */
 const createCollection = async (page, collectionName: string, collectionLocation: string, options: CreateCollectionOptions = {}) => {
   await test.step(`Create collection "${collectionName}"`, async () => {
-    await page.locator('.collection-dropdown .dropdown-icon').click();
-    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    await page.locator('.plus-icon-button').click();
+    await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Create collection' }).click();
 
     const createCollectionModal = page.locator('.bruno-modal-card').filter({ hasText: 'Create Collection' });
 
     await createCollectionModal.getByLabel('Name').fill(collectionName);
-    await createCollectionModal.getByLabel('Location').fill(collectionLocation);
+    const locationInput = createCollectionModal.getByLabel('Location');
+    if (await locationInput.isVisible()) {
+      await locationInput.fill(collectionLocation);
+    }
     await createCollectionModal.getByRole('button', { name: 'Create', exact: true }).click();
 
     await createCollectionModal.waitFor({ state: 'detached' });
@@ -78,4 +82,52 @@ const createCollection = async (page, collectionName: string, collectionLocation
   });
 };
 
-export { closeAllCollections, openCollectionAndAcceptSandbox, createCollection };
+/**
+ * Create a request in a collection
+ * @param page - The page object
+ * @param requestName - The name of the request to create
+ * @param collectionName - The name of the collection
+ * @returns void
+ */
+const createRequest = async (page, requestName: string, collectionName: string) => {
+  await test.step(`Create request "${requestName}" in collection "${collectionName}"`, async () => {
+    const locators = buildCommonLocators(page);
+    const collection = locators.sidebar.collection(collectionName);
+
+    await collection.hover();
+    await locators.actions.collectionActions(collectionName).click();
+    await locators.dropdown.item('New Request').click();
+    await page.getByPlaceholder('Request Name').fill(requestName);
+    await locators.modal.button('Create').click();
+    await expect(locators.sidebar.request(requestName)).toBeVisible();
+  });
+};
+
+/**
+ * Delete a request from a collection
+ * @param page - The page object
+ * @param requestName - The name of the request to delete
+ * @param collectionName - The name of the collection
+ * @returns void
+ */
+const deleteRequest = async (page, requestName: string, collectionName: string) => {
+  await test.step(`Delete request "${requestName}" from collection "${collectionName}"`, async () => {
+    const locators = buildCommonLocators(page);
+
+    // Click on the collection first to open it if it's closed
+    await locators.sidebar.collection(collectionName).click();
+
+    // Find the request within the collection's context
+    // Use the collection container (.collection-name) scoped to sidebar to scope the search
+    const collectionContainer = page.getByTestId('collections').locator('.collection-name').filter({ hasText: collectionName });
+    const collectionWrapper = collectionContainer.locator('..');
+    const request = collectionWrapper.locator('.collection-item-name').filter({ hasText: requestName });
+
+    await request.locator('.menu-icon').click();
+    await locators.dropdown.item('Delete').click();
+    await locators.modal.button('Delete').click();
+    await expect(request).not.toBeVisible();
+  });
+};
+
+export { closeAllCollections, openCollectionAndAcceptSandbox, createCollection, createRequest, deleteRequest };
diff --git a/tests/utils/page/index.ts b/tests/utils/page/index.ts
index 485f1b10a..69b3d32f1 100644
--- a/tests/utils/page/index.ts
+++ b/tests/utils/page/index.ts
@@ -1 +1,2 @@
 export * from './actions';
+export * from './runner';
diff --git a/tests/utils/page/locators.ts b/tests/utils/page/locators.ts
index cf9d200ca..833913ef3 100644
--- a/tests/utils/page/locators.ts
+++ b/tests/utils/page/locators.ts
@@ -6,6 +6,7 @@ export const buildCommonLocators = (page: Page) => ({
     .locator('.infotip')
     .filter({ hasText: /^Save/ }),
   sidebar: {
+    collectionsContainer: () => page.getByTestId('collections'),
     collection: (name: string) => page.locator('#sidebar-collection-name').filter({ hasText: name }),
     folder: (name: string) => page.locator('.collection-item-name').filter({ hasText: name }),
     request: (name: string) => page.locator('.collection-item-name').filter({ hasText: name }),
@@ -15,11 +16,12 @@ export const buildCommonLocators = (page: Page) => ({
       // Using .locator('..') gets the parent element of the folder's collection-item-name div.
       const folderWrapper = page.locator('.collection-item-name').filter({ hasText: folderName }).locator('..');
       return folderWrapper.locator('.collection-item-name').filter({ hasText: requestName });
-    }
+    },
+    closeAllCollectionsButton: () => page.getByTestId('close-all-collections-button')
   },
   actions: {
     collectionActions: (collectionName: string) =>
-      page.locator('.collection-name')
+      page.getByTestId('collections').locator('.collection-name')
         .filter({ hasText: collectionName })
         .locator('.collection-actions .icon'),
     collectionItemActions: (itemName: string) =>
@@ -40,7 +42,15 @@ export const buildCommonLocators = (page: Page) => ({
   },
   modal: {
     title: (title: string) => page.locator('.bruno-modal-header-title').filter({ hasText: title }),
-    button: (name: string) => page.getByRole('button', { name: name, exact: true })
+    byTitle: (title: string) => page.locator('.bruno-modal').filter({ has: page.locator('.bruno-modal-header-title').filter({ hasText: title }) }),
+    button: (name: string) => page.locator('.bruno-modal').getByRole('button', { name: name, exact: true }),
+    closeButton: () => page.locator('.bruno-modal').getByTestId('modal-close-button')
+  },
+  environment: {
+    selector: () => page.getByTestId('environment-selector-trigger'),
+    collectionTab: () => page.getByTestId('env-tab-collection'),
+    globalTab: () => page.getByTestId('env-tab-global'),
+    envOption: (name: string) => page.locator('.dropdown-item').getByText(name, { exact: true })
   }
 });
 
@@ -65,3 +75,33 @@ export const buildWebsocketCommonLocators = (page: Page) => ({
     clearResponse: () => page.getByRole('button', { name: 'Clear Response' })
   }
 });
+
+export const getTableCell = (row, index) => row.locator('td').nth(index);
+
+export const buildGrpcCommonLocators = (page: Page) => ({
+  ...buildCommonLocators(page),
+  method: {
+    dropdownTrigger: () => page.getByTestId('grpc-method-dropdown-trigger'),
+    indicator: () => page.getByTestId('grpc-method-indicator')
+  },
+  request: {
+    queryUrlContainer: () => page.getByTestId('grpc-query-url-container'),
+    sendButton: () => page.getByTestId('grpc-send-request-button'),
+    messagesContainer: () => page.getByTestId('grpc-messages-container'),
+    addMessageButton: () => page.getByTestId('grpc-add-message-button'),
+    sendMessage: (index: number) => page.getByTestId(`grpc-send-message-${index}`),
+    endConnectionButton: () => page.getByTestId('grpc-end-connection-button'),
+    cancelConnectionButton: () => page.getByTestId('grpc-cancel-connection-button')
+  },
+  response: {
+    statusCode: () => page.getByTestId('grpc-response-status-code'),
+    statusText: () => page.getByTestId('grpc-response-status-text'),
+    content: () => page.getByTestId('grpc-response-content'),
+    container: () => page.getByTestId('grpc-responses-container'),
+    singleResponse: () => page.getByTestId('grpc-single-response'),
+    accordion: () => page.getByTestId('grpc-responses-accordion'),
+    responseItem: (index: number) => page.getByTestId(`grpc-response-item-${index}`),
+    responseItems: () => page.locator('[data-testid^="grpc-response-item-"]'),
+    tabCount: () => page.getByTestId('tab-response-count')
+  }
+});
diff --git a/tests/utils/page/runner.ts b/tests/utils/page/runner.ts
new file mode 100644
index 000000000..a3aa1ae23
--- /dev/null
+++ b/tests/utils/page/runner.ts
@@ -0,0 +1,181 @@
+import { Page, expect } from '../../../playwright';
+
+/**
+ * Reads test result counts from the filter buttons in the runner results view
+ * @param page - The Playwright page object
+ * @returns An object with totalRequests, passed, failed, and skipped counts
+ */
+export const getRunnerResultCounts = async (page: Page) => {
+  const allButton = page.locator('button').filter({ hasText: /^All/ });
+  const passedButton = page.locator('button').filter({ hasText: /^Passed/ });
+  const failedButton = page.locator('button').filter({ hasText: /^Failed/ });
+  const skippedButton = page.locator('button').filter({ hasText: /^Skipped/ });
+
+  const totalRequests = parseInt(await allButton.locator('span').innerText());
+  const passed = parseInt(await passedButton.locator('span').innerText());
+  const failed = parseInt(await failedButton.locator('span').innerText());
+  const skipped = parseInt(await skippedButton.locator('span').innerText());
+
+  return { totalRequests, passed, failed, skipped };
+};
+
+/**
+ * Runs a collection by clicking the Run menu item and handling the runner tab
+ * Includes logic to reset existing results if present
+ * @param page - The Playwright page object
+ * @param collectionName - The name of the collection to run
+ * @returns void
+ */
+export const runCollection = async (page: Page, collectionName: string) => {
+  // Ensure collection is visible and loaded (scope to sidebar)
+  const collectionContainer = page.getByTestId('collections').locator('.collection-name').filter({ hasText: collectionName });
+  await collectionContainer.waitFor({ state: 'visible' });
+  // Wait a bit for the UI to stabilize
+  await page.waitForTimeout(300);
+
+  // Open collection actions menu
+  await collectionContainer.locator('.collection-actions').hover();
+  const icon = collectionContainer.locator('.collection-actions .icon');
+  await icon.waitFor({ state: 'visible', timeout: 5000 });
+  await page.waitForTimeout(200); // Small delay to ensure hover state is stable
+  await icon.click();
+
+  // Click Run menu item
+  await page.getByText('Run', { exact: true }).click();
+
+  // Handle runner tab - reset if needed, then run
+  const resetButton = page.getByRole('button', { name: 'Reset' });
+  const runCollectionButton = page.getByRole('button', { name: 'Run Collection' });
+
+  // Check if Reset button is visible (means there are existing results)
+  const resetVisible = await resetButton.isVisible().catch(() => false);
+  if (resetVisible) {
+    await resetButton.click();
+    // Wait a bit for the reset to complete
+    await page.waitForTimeout(500);
+  }
+
+  // Now wait for and click Run Collection button
+  await runCollectionButton.waitFor({ state: 'visible', timeout: 10000 });
+  await runCollectionButton.click();
+
+  // Wait for the run to complete
+  await page.getByRole('button', { name: 'Run Again' }).waitFor({ timeout: 2 * 60 * 1000 });
+};
+
+/**
+ * Sets up the JavaScript sandbox mode for a collection
+ * @param page - The Playwright page object
+ * @param collectionName - The name of the collection (can be title or text)
+ * @param mode - 'developer' or 'safe' mode
+ * @returns void
+ */
+export const setSandboxMode = async (page: Page, collectionName: string, mode: 'developer' | 'safe') => {
+  // Click on the collection name in the sidebar
+  // Use the collections testid to scope to the sidebar, then find the specific collection
+  const sidebarCollection = page.getByTestId('collections').locator('#sidebar-collection-name').filter({ hasText: collectionName }).first();
+
+  // Wait for the sidebar to be loaded
+  await page.waitForTimeout(500);
+
+  await sidebarCollection.click();
+
+  // Wait a moment for the UI to load
+  await page.waitForTimeout(300);
+
+  // Check if there's already a mode selected - if so, we need to click the badge to open settings tab
+  // Look for the Developer Mode or Safe Mode badge/button
+  const developerModeBadge = page.locator('.developer-mode').filter({ hasText: 'Developer Mode' });
+  const safeModeBadge = page.locator('.safe-mode').filter({ hasText: 'Safe Mode' });
+
+  const developerBadgeExists = await developerModeBadge.count().then((count) => count > 0).catch(() => false);
+  const safeBadgeExists = await safeModeBadge.count().then((count) => count > 0).catch(() => false);
+
+  // If a badge exists, click it to open the security settings tab
+  if (developerBadgeExists || safeBadgeExists) {
+    // Click the appropriate badge to open the security settings tab
+    if (developerBadgeExists) {
+      await developerModeBadge.click();
+    } else {
+      await safeModeBadge.click();
+    }
+
+    // Wait for the security settings tab to be active and form to be visible
+    // Look for the security settings content - it should have "JavaScript Sandbox" heading
+    await page.getByText('JavaScript Sandbox').waitFor({ state: 'visible', timeout: 10000 });
+    await page.waitForTimeout(300);
+  }
+  // If no badge exists, the modal should have appeared automatically (first time selection)
+
+  // Wait for security settings form to be visible - wait for either radio button
+  // These should be in the active tab (either modal or tab)
+  const safeModeRadio = page.getByLabel('Safe Mode');
+  const developerRadio = page.getByLabel('Developer Mode(use only if');
+
+  // Wait for at least one of them to be visible
+  await Promise.race([
+    safeModeRadio.waitFor({ state: 'visible', timeout: 10000 }).catch(() => {}),
+    developerRadio.waitFor({ state: 'visible', timeout: 10000 }).catch(() => {})
+  ]);
+
+  // Additional wait to ensure UI is stable
+  await page.waitForTimeout(300);
+
+  if (mode === 'developer') {
+    await developerRadio.waitFor({ state: 'visible', timeout: 5000 });
+    await developerRadio.check();
+  } else {
+    // For safe mode, check if developer mode is currently selected
+    const developerModeChecked = await developerRadio.isChecked().catch(() => false);
+
+    if (developerModeChecked) {
+      // Click the Developer Mode label text inside the security settings form
+      // Scope to the form container to avoid clicking the badge
+      // The form should have the "JavaScript Sandbox" heading, so scope to that container
+      const securityForm = page.locator('div').filter({ hasText: 'JavaScript Sandbox' }).locator('..').first();
+      const developerLabel = securityForm.locator('label').filter({ hasText: /^Developer Mode/ }).first();
+      await developerLabel.waitFor({ state: 'visible', timeout: 5000 });
+      await developerLabel.click();
+      // Wait for UI to update
+      await page.waitForTimeout(300);
+    }
+
+    // Ensure Safe Mode radio is visible and check it
+    await safeModeRadio.waitFor({ state: 'visible', timeout: 5000 });
+    await safeModeRadio.check();
+  }
+
+  await page.getByRole('button', { name: 'Save' }).click();
+};
+
+/**
+ * Validates runner results against expected counts
+ * @param page - The Playwright page object
+ * @param expected - Expected counts
+ * @returns void
+ */
+export const validateRunnerResults = async (page: Page,
+  expected: {
+    totalRequests?: number;
+    passed?: number;
+    failed?: number;
+    skipped?: number;
+  }) => {
+  const { totalRequests, passed, failed, skipped } = await getRunnerResultCounts(page);
+
+  if (expected.totalRequests !== undefined) {
+    await expect(totalRequests).toBe(expected.totalRequests);
+  }
+  if (expected.passed !== undefined) {
+    await expect(passed).toBe(expected.passed);
+  }
+  if (expected.failed !== undefined) {
+    await expect(failed).toBe(expected.failed);
+  }
+  if (expected.skipped !== undefined) {
+    await expect(skipped).toBe(expected.skipped);
+  }
+
+  // Validate that passed + failed + skipped = totalRequests
+  await expect(passed).toBe(totalRequests - skipped - failed);
+};
diff --git a/tests/variable-tooltip/variable-tooltip.spec.ts b/tests/variable-tooltip/variable-tooltip.spec.ts
new file mode 100644
index 000000000..c89eabb47
--- /dev/null
+++ b/tests/variable-tooltip/variable-tooltip.spec.ts
@@ -0,0 +1,467 @@
+import { test, expect } from '../../playwright';
+import { createCollection, closeAllCollections, createRequest } from '../utils/page';
+
+test.describe('Variable Tooltip', () => {
+  test.afterEach(async ({ page }) => {
+    await closeAllCollections(page);
+  });
+
+  test('should test tooltip functionality with environment variables', async ({ page, createTmpDir }) => {
+    const collectionName = 'tooltip-test';
+
+    await test.step('Create collection and add environment variables', async () => {
+      await createCollection(page, collectionName, await createTmpDir('tooltip-collection'), {
+        openWithSandboxMode: 'safe'
+      });
+      await expect(page.locator('#sidebar-collection-name').filter({ hasText: collectionName })).toBeVisible();
+
+      // Open environment settings
+      await page.locator('[data-testid="environment-selector-trigger"]').click();
+      await expect(page.locator('[data-testid="env-tab-collection"]')).toHaveClass(/active/);
+
+      // Create environment
+      await page.locator('button[id="create-env"]').click();
+      await page.locator('input[name="name"]').fill('Test Env');
+      await page.getByRole('button', { name: 'Create' }).click();
+
+      // Add apiKey variable
+      await page.locator('button[data-testid="add-variable"]').click();
+      await page.locator('input[name="0.name"]').fill('apiKey');
+      await page.locator('tr').filter({ has: page.locator('input[name="0.name"]') }).locator('.CodeMirror').click();
+      await page.keyboard.type('test-key-123');
+
+      // Add secretToken variable
+      await page.locator('button[data-testid="add-variable"]').click();
+      await page.locator('input[name="1.name"]').fill('secretToken');
+      await page.locator('tr').filter({ has: page.locator('input[name="1.name"]') }).locator('.CodeMirror').click();
+      await page.keyboard.type('secret-xyz');
+      await page.locator('input[name="1.secret"]').check();
+
+      // Save and close
+      await page.getByRole('button', { name: 'Save' }).click();
+      await page.getByText('×').click();
+    });
+
+    await test.step('Create request and test tooltip', async () => {
+      // Create request using utility method
+      await createRequest(page, 'Test Request', collectionName);
+
+      // Set the URL
+      await page.locator('.collection-item-name').filter({ hasText: 'Test Request' }).click();
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('https://api.example.com?key={{apiKey}}');
+      await page.keyboard.press('Control+s');
+    });
+
+    await test.step('Test basic tooltip', async () => {
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const apiKeyVar = urlEditor.locator('.cm-variable-valid').filter({ hasText: 'apiKey' }).first();
+
+      await apiKeyVar.hover();
+
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+      await expect(tooltip.locator('.var-name')).toContainText('apiKey');
+      await expect(tooltip.locator('.var-scope-badge')).toContainText('Environment');
+      await expect(tooltip.locator('.var-value-editable-display')).toContainText('test-key-123');
+      await expect(tooltip.locator('.copy-button')).toBeVisible();
+    });
+
+    await test.step('Test secret variable with toggle', async () => {
+      // Move mouse away to dismiss any active tooltip
+      await page.mouse.move(0, 0);
+
+      // Add header with secret
+      await page.getByRole('tab', { name: 'Headers' }).click();
+      await page.locator('button.btn-action').filter({ hasText: 'Add Header' }).click();
+
+      const headerNameEditor = page.locator('table tbody tr').first().locator('td').first().locator('.CodeMirror');
+      await headerNameEditor.click();
+      await page.keyboard.type('Authorization');
+
+      const headerValueEditor = page.locator('table tbody tr').first().locator('td').nth(1).locator('.CodeMirror');
+      await headerValueEditor.click();
+      await page.keyboard.type('Bearer {{secretToken}}');
+      await page.keyboard.press('Control+s');
+
+      // Test tooltip with secret
+      const secretVar = headerValueEditor.locator('.cm-variable-valid').filter({ hasText: 'secretToken' }).first();
+      await secretVar.hover();
+
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+
+      // Verify masked
+      const valueDisplay = tooltip.locator('.var-value-editable-display');
+      const maskedText = await valueDisplay.textContent();
+      // Check that value is masked (contains bullet points and not the actual value)
+      expect(maskedText).not.toContain('secret-xyz');
+      expect(maskedText?.length).toBeGreaterThan(0);
+
+      // Test toggle
+      const toggleButton = tooltip.locator('.secret-toggle-button');
+      await expect(toggleButton).toBeVisible();
+      await toggleButton.click();
+      await expect(valueDisplay).toContainText('secret-xyz');
+
+      // Toggle back
+      await toggleButton.click();
+      const remaskedText = await valueDisplay.textContent();
+      expect(remaskedText).not.toContain('secret-xyz');
+      expect(remaskedText?.length).toBeGreaterThan(0);
+    });
+  });
+
+  test('should test tooltip with variable references', async ({ page, createTmpDir }) => {
+    const collectionName = 'tooltip-reference-test';
+
+    await test.step('Create collection with interdependent variables', async () => {
+      await createCollection(page, collectionName, await createTmpDir('tooltip-ref-collection'), {
+        openWithSandboxMode: 'safe'
+      });
+      await expect(page.locator('#sidebar-collection-name').filter({ hasText: collectionName })).toBeVisible();
+
+      // Open environment settings
+      await page.locator('[data-testid="environment-selector-trigger"]').click();
+      await expect(page.locator('[data-testid="env-tab-collection"]')).toHaveClass(/active/);
+
+      // Create environment
+      await page.locator('button[id="create-env"]').click();
+      await page.locator('input[name="name"]').fill('Ref Test Env');
+      await page.getByRole('button', { name: 'Create' }).click();
+
+      // Add host variable
+      await page.locator('button[data-testid="add-variable"]').click();
+      await page.locator('input[name="0.name"]').fill('host');
+      await page.locator('tr').filter({ has: page.locator('input[name="0.name"]') }).locator('.CodeMirror').click();
+      await page.keyboard.type('api.example.com');
+
+      // Add endpoint that references host
+      await page.locator('button[data-testid="add-variable"]').click();
+      await page.locator('input[name="1.name"]').fill('endpoint');
+      await page.locator('tr').filter({ has: page.locator('input[name="1.name"]') }).locator('.CodeMirror').click();
+      await page.keyboard.type('https://{{host}}/users');
+
+      // Save and close
+      await page.getByRole('button', { name: 'Save' }).click();
+      await page.getByText('×').click();
+    });
+
+    await test.step('Create request with variable references', async () => {
+      // Create request using utility method
+      await createRequest(page, 'Ref Test Request', collectionName);
+
+      // Set the URL
+      await page.locator('.collection-item-name').filter({ hasText: 'Ref Test Request' }).click();
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('{{endpoint}}');
+      await page.keyboard.press('Control+s');
+    });
+
+    await test.step('Test variable referencing other variables', async () => {
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const endpointVar = urlEditor.locator('.cm-variable-valid').filter({ hasText: 'endpoint' }).first();
+
+      await endpointVar.hover();
+
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+      await expect(tooltip.locator('.var-name')).toContainText('endpoint');
+
+      // Should show resolved value
+      await expect(tooltip.locator('.var-value-editable-display')).toContainText('https://api.example.com/users');
+
+      // Should have copy button
+      await expect(tooltip.locator('.copy-button')).toBeVisible();
+    });
+
+    await test.step('Test editing variable with references', async () => {
+      // Move mouse away to dismiss any active tooltip
+      await page.mouse.move(0, 0);
+
+      // URL editor is always visible at the top
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const endpointVar = urlEditor.locator('.cm-variable-valid').filter({ hasText: 'endpoint' }).first();
+
+      await endpointVar.hover();
+
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+
+      // Click on value to edit
+      const valueDisplay = tooltip.locator('.var-value-editable-display');
+      await valueDisplay.click();
+
+      // Should show editor with raw value (not resolved)
+      const editor = tooltip.locator('.var-value-editor .CodeMirror');
+      await expect(editor).toBeVisible();
+
+      // Verify it shows the raw value with variable references
+      // focus on the editor
+      const editorContent = await editor.locator('.CodeMirror-line').textContent();
+      expect(editorContent).toContain('{{host}}');
+
+      // Edit the value
+      await page.keyboard.press('End');
+      await page.keyboard.type('/posts');
+
+      // Click outside to save
+      await page.locator('body').click();
+
+      // Move mouse away and back to get fresh tooltip
+      await page.mouse.move(0, 0);
+
+      // Hover again to verify the change
+      await endpointVar.hover();
+
+      const newTooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(newTooltip).toBeVisible();
+
+      // Should show updated resolved value
+      await expect(newTooltip.locator('.var-value-editable-display')).toContainText('https://api.example.com/users/posts');
+    });
+
+    await test.step('Test copy button', async () => {
+      // Move mouse away to dismiss any active tooltip
+      await page.mouse.move(0, 0);
+
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const endpointVar = urlEditor.locator('.cm-variable-valid').filter({ hasText: 'endpoint' }).first();
+
+      await endpointVar.hover();
+
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+
+      const copyButton = tooltip.locator('.copy-button');
+      await expect(copyButton).toBeVisible();
+
+      // Click copy button
+      await copyButton.click();
+
+      // Should show success state (checkmark)
+      await expect(copyButton.locator('svg polyline')).toBeVisible({ timeout: 1000 });
+
+      // Wait for it to revert back to copy icon
+      await expect(copyButton.locator('svg rect')).toBeVisible();
+    });
+  });
+
+  test('should handle runtime and process.env variables', async ({ page, createTmpDir }) => {
+    const collectionName = 'tooltip-readonly-test';
+
+    await test.step('Create collection and request', async () => {
+      await createCollection(page, collectionName, await createTmpDir('tooltip-readonly-collection'), {
+        openWithSandboxMode: 'safe'
+      });
+      await expect(page.locator('#sidebar-collection-name').filter({ hasText: collectionName })).toBeVisible();
+
+      // Create environment
+      await page.locator('[data-testid="environment-selector-trigger"]').click();
+      await page.locator('button[id="create-env"]').click();
+      await page.locator('input[name="name"]').fill('Readonly Env');
+      await page.getByRole('button', { name: 'Create' }).click();
+      await page.getByRole('button', { name: 'Save' }).click();
+      await page.getByText('×').click();
+
+      // Create request using utility method
+      await createRequest(page, 'Readonly Test', collectionName);
+
+      // Set the URL
+      await page.locator('.collection-item-name').filter({ hasText: 'Readonly Test' }).click();
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('https://example.com');
+      await page.keyboard.press('Control+s');
+    });
+
+    await test.step('Test process.env variable tooltip', async () => {
+      // Move mouse away to dismiss any active tooltip
+      await page.mouse.move(0, 0);
+
+      // Add a process.env variable in URL (URL editor is always visible at the top)
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.press('End');
+      await page.keyboard.type('?env={{process.env.HOME}}');
+      await page.keyboard.press('Control+s');
+
+      // Hover over process.env variable
+      const processEnvVar = urlEditor.locator('.cm-variable-valid, .cm-variable-invalid').filter({ hasText: 'process.env.HOME' }).first();
+      await processEnvVar.hover();
+
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+      await expect(tooltip.locator('.var-name')).toContainText('process.env.HOME');
+      await expect(tooltip.locator('.var-scope-badge')).toContainText('Process Env');
+
+      // Should show read-only note
+      await expect(tooltip.locator('.var-readonly-note')).toContainText('read-only');
+
+      // Should have copy button but not be editable
+      await expect(tooltip.locator('.copy-button')).toBeVisible();
+      await expect(tooltip.locator('.var-value-editor')).not.toBeVisible();
+    });
+  });
+
+  test('should auto-save request when creating variable via tooltip', async ({ page, createTmpDir }) => {
+    const collectionName = 'draft-autosave-test';
+
+    await test.step('Setup collection and request', async () => {
+      await createCollection(page, collectionName, await createTmpDir('draft-autosave'), {
+        openWithSandboxMode: 'safe'
+      });
+
+      // Create request using utility method
+      await createRequest(page, 'Autosave Test', collectionName);
+
+      // Set the URL
+      await page.locator('.collection-item-name').filter({ hasText: 'Autosave Test' }).click();
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('https://api.example.com');
+      await page.keyboard.press('Control+s');
+    });
+
+    await test.step('Edit URL to create draft with undefined variable', async () => {
+      // Edit the URL to add a variable reference
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.press('End');
+      await page.keyboard.type('/users/{{myApiKey}}');
+
+      // Verify draft indicator appears (unsaved changes) in the request tab
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Autosave Test' }) });
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+    });
+
+    await test.step('Create variable via tooltip - should auto-save entire request', async () => {
+      // Hover over the undefined variable {{myApiKey}}
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const undefinedVar = urlEditor.locator('.cm-variable-invalid').filter({ hasText: 'myApiKey' }).first();
+      await undefinedVar.hover();
+
+      // Tooltip should appear
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+      await expect(tooltip.locator('.var-name')).toContainText('myApiKey');
+      await expect(tooltip.locator('.var-scope-badge')).toContainText('Request');
+
+      // Click to edit the variable
+      const valueDisplay = tooltip.locator('.var-value-editable-display');
+      await valueDisplay.click();
+
+      // Type value
+      const editor = tooltip.locator('.var-value-editor .CodeMirror');
+      await expect(editor).toBeVisible();
+      await page.keyboard.type('secret-key-123');
+
+      // Click outside to close editor - this will auto-save the entire request
+      await page.locator('body').click();
+    });
+
+    await test.step('Verify request was auto-saved with URL changes and new variable', async () => {
+      // Move mouse away
+      await page.mouse.move(0, 0);
+
+      // Verify variable is now valid (green) in the URL
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const validVar = urlEditor.locator('.cm-variable-valid').filter({ hasText: 'myApiKey' });
+      await expect(validVar).toBeVisible();
+
+      // Hover to verify value was saved
+      await validVar.first().hover();
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+      await expect(tooltip.locator('.var-value-editable-display')).toContainText('secret-key-123');
+
+      // Move mouse away
+      await page.mouse.move(0, 0);
+
+      // Verify the URL changes were also saved
+      const urlContent = await urlEditor.locator('.CodeMirror-line').first().textContent();
+      expect(urlContent).toContain('api.example.com/users');
+      expect(urlContent).toContain('myApiKey');
+
+      // Verify draft indicator is GONE (everything was auto-saved)
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Autosave Test' }) });
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+      await expect(requestTab.locator('.close-icon')).toBeVisible();
+    });
+
+    await test.step('Verify variable exists in Vars tab', async () => {
+      // Check variable is saved to file - should appear in the Vars tab
+      await page.getByRole('tab', { name: 'Vars' }).click();
+
+      // The variable should exist in the saved file
+      const varsTable = page.locator('table').first();
+      await expect(varsTable).toBeVisible();
+
+      const varRow = varsTable.locator('tbody tr').first();
+      await expect(varRow).toBeVisible();
+
+      // Check variable name
+      const varNameInput = varRow.locator('td').first().locator('input[type="text"]');
+      await expect(varNameInput).toBeVisible();
+      await expect(varNameInput).toHaveValue('myApiKey');
+
+      // Check variable value
+      const varValueTd = varRow.locator('td').nth(1);
+      const varValue = varValueTd.locator('.CodeMirror');
+      await expect(varValue).toBeVisible();
+      const varValueContent = await varValue.locator('.CodeMirror-line').textContent();
+      expect(varValueContent).toContain('secret-key-123');
+    });
+  });
+
+  test('should handle invalid variable names with warning', async ({ page, createTmpDir }) => {
+    const collectionName = 'invalid-var-test';
+
+    await test.step('Setup collection and request', async () => {
+      await createCollection(page, collectionName, await createTmpDir('invalid-var-collection'), {
+        openWithSandboxMode: 'safe'
+      });
+
+      // Create request using utility method
+      await createRequest(page, 'Invalid Var Test', collectionName);
+
+      // Set the URL
+      await page.locator('.collection-item-name').filter({ hasText: 'Invalid Var Test' }).click();
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('https://api.example.com');
+      await page.keyboard.press('Control+s');
+    });
+
+    await test.step('Test invalid variable name with space', async () => {
+      await page.getByRole('tab', { name: 'Body' }).click();
+
+      // Select JSON body mode
+      await page.locator('.body-mode-selector').click();
+      await page.locator('.dropdown-item').filter({ hasText: 'JSON' }).click();
+
+      const bodyEditor = page.locator('.CodeMirror').last();
+      await bodyEditor.click();
+
+      await bodyEditor.evaluate((el: any) => {
+        const cm = el.CodeMirror;
+        cm.setValue('{\n  "userId": "{{user id}}"\n}');
+      });
+      await page.keyboard.press('Control+s');
+
+      // Hover over the invalid variable
+      await page.mouse.move(0, 0);
+      const invalidVar = bodyEditor.locator('.cm-variable-invalid, .cm-variable-valid').filter({ hasText: 'user id' }).first();
+      await invalidVar.hover();
+
+      // Verify tooltip shows warning and hides input
+      const tooltip = page.locator('.CodeMirror-brunoVarInfo').first();
+      await expect(tooltip).toBeVisible();
+      await expect(tooltip.locator('.var-name')).toContainText('user id');
+      await expect(tooltip.locator('.var-warning-note')).toBeVisible();
+      await expect(tooltip.locator('.var-value-editable-display')).not.toBeVisible();
+    });
+  });
+});
diff --git a/tests/websockets/persistence.spec.ts b/tests/websockets/persistence.spec.ts
index e32cf9ba8..29ebabe62 100644
--- a/tests/websockets/persistence.spec.ts
+++ b/tests/websockets/persistence.spec.ts
@@ -35,7 +35,7 @@ test.describe.serial('persistence', () => {
   });
 
   test('save new websocket url', async ({ pageWithUserData: page }) => {
-    const replacementUrl = 'ws://localhost:8082';
+    const replacementUrl = 'ws://localhost:8083';
     const locators = buildWebsocketCommonLocators(page);
 
     const clearText = async (text: string) => {
diff --git a/tests/websockets/variable-interpolation/fixtures/collection/bruno.json b/tests/websockets/variable-interpolation/fixtures/collection/bruno.json
new file mode 100644
index 000000000..4c234e8d5
--- /dev/null
+++ b/tests/websockets/variable-interpolation/fixtures/collection/bruno.json
@@ -0,0 +1,10 @@
+{
+  "version": "1",
+  "name": "variable-interpolation",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ]
+}
+
diff --git a/tests/websockets/variable-interpolation/fixtures/collection/environments/Test.bru b/tests/websockets/variable-interpolation/fixtures/collection/environments/Test.bru
new file mode 100644
index 000000000..96602df69
--- /dev/null
+++ b/tests/websockets/variable-interpolation/fixtures/collection/environments/Test.bru
@@ -0,0 +1,5 @@
+vars {
+  url: websocket
+  data: test-data
+}
+
diff --git a/tests/websockets/variable-interpolation/fixtures/collection/ws-interpolation-test.bru b/tests/websockets/variable-interpolation/fixtures/collection/ws-interpolation-test.bru
new file mode 100644
index 000000000..9e612ed5e
--- /dev/null
+++ b/tests/websockets/variable-interpolation/fixtures/collection/ws-interpolation-test.bru
@@ -0,0 +1,20 @@
+meta {
+  name: ws-interpolation-test
+  type: ws
+  seq: 1
+}
+
+ws {
+  url: wss://echo.{{url}}.org
+  auth: inherit
+}
+
+body:ws {
+  name: message 1
+  content: '''
+    {
+      "test": "{{data}}"
+    }
+  '''
+}
+
diff --git a/tests/websockets/variable-interpolation/init-user-data/preferences.json b/tests/websockets/variable-interpolation/init-user-data/preferences.json
new file mode 100644
index 000000000..a9d9eb467
--- /dev/null
+++ b/tests/websockets/variable-interpolation/init-user-data/preferences.json
@@ -0,0 +1,10 @@
+{
+  "maximized": false,
+  "lastOpenedCollections": [
+    "{{projectRoot}}/tests/websockets/variable-interpolation/fixtures/collection"
+  ],
+  "beta": {
+    "websocket": true
+  }
+}
+
diff --git a/tests/websockets/variable-interpolation/variable-interpolation.spec.ts b/tests/websockets/variable-interpolation/variable-interpolation.spec.ts
new file mode 100644
index 000000000..ca2bede78
--- /dev/null
+++ b/tests/websockets/variable-interpolation/variable-interpolation.spec.ts
@@ -0,0 +1,109 @@
+import { test, expect } from '../../../playwright';
+import { buildWebsocketCommonLocators } from '../../utils/page/locators';
+import { closeAllCollections, openCollectionAndAcceptSandbox } from '../../utils/page';
+
+const BRU_REQ_NAME = /^ws-interpolation-test$/;
+const MAX_CONNECTION_TIME = 10000; // Increased timeout for external server
+
+test.describe.serial('WebSocket Variable Interpolation', () => {
+  test.afterAll(async ({ pageWithUserData: page }) => {
+    await closeAllCollections(page);
+  });
+
+  test('interpolates variables in WebSocket URL', async ({ pageWithUserData: page, restartApp }) => {
+    const locators = buildWebsocketCommonLocators(page);
+
+    // Open the collection and accept sandbox modal if it appears
+    await openCollectionAndAcceptSandbox(page, 'variable-interpolation', 'safe');
+
+    // Open the request
+    await expect(page.getByTitle(BRU_REQ_NAME)).toBeVisible();
+    await page.getByTitle(BRU_REQ_NAME).click();
+
+    // Select the test environment (which has url: websocket)
+    await page.locator('div.current-environment').click();
+    await expect(page.locator('.dropdown-item').filter({ hasText: 'Test' })).toBeVisible();
+    await page.locator('.dropdown-item').filter({ hasText: 'Test' }).click();
+    await expect(page.locator('.current-environment').filter({ hasText: /Test/ })).toBeVisible();
+
+    // Wait a bit for environment to be applied
+    await page.waitForTimeout(200);
+
+    // Connect WebSocket
+    await locators.connectionControls.connect().click();
+
+    // Wait for connection to establish
+    await expect(locators.connectionControls.disconnect()).toBeAttached({
+      timeout: MAX_CONNECTION_TIME
+    });
+
+    // Verify the connection message shows interpolated URL
+    // The URL should be wss://echo.websocket.org (not wss://echo.{{url}}.org)
+    await expect(locators.messages().first().getByText(/Connected to wss:\/\/echo\.websocket\.org/)).toBeAttached({
+      timeout: 2000
+    });
+  });
+
+  test('interpolates variables in WebSocket message content', async ({ pageWithUserData: page, restartApp }) => {
+    const locators = buildWebsocketCommonLocators(page);
+
+    // Wait for collection to be visible (it should auto-load from preferences)
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'variable-interpolation' })).toBeVisible({ timeout: 5000 });
+
+    // Check if sandbox modal is present and handle it
+    const sandboxModal = page.locator('.bruno-modal-card').filter({ has: page.locator('.bruno-modal-header-title', { hasText: 'JavaScript Sandbox' }) });
+    const isModalVisible = await sandboxModal.isVisible().catch(() => false);
+
+    if (isModalVisible) {
+      // Accept sandbox modal
+      await sandboxModal.getByLabel('Safe Mode').check();
+      await sandboxModal.locator('.bruno-modal-footer .submit').click();
+      await sandboxModal.waitFor({ state: 'detached' });
+    } else {
+      // Collection might already be open, just ensure it's clicked
+      await page.locator('#sidebar-collection-name').filter({ hasText: 'variable-interpolation' }).click();
+    }
+
+    // Wait a bit for any modals to fully close
+    await page.waitForTimeout(300);
+
+    // Open the request
+    await expect(page.getByTitle(BRU_REQ_NAME)).toBeVisible();
+    await page.getByTitle(BRU_REQ_NAME).click();
+
+    // Select the test environment (which has data: test-data)
+    await page.locator('div.current-environment').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Test' }).click();
+
+    // Clear any previous messages
+    await locators.toolbar.clearResponse().click();
+
+    // Send the request (connect + send messages)
+    await locators.runner().click();
+
+    // Wait for connection
+    await expect(locators.connectionControls.disconnect()).toBeAttached({
+      timeout: MAX_CONNECTION_TIME
+    });
+
+    // Wait a bit for messages to be sent and received (echo server echoes back)
+    await page.waitForTimeout(1000);
+
+    // Verify the sent message contains interpolated value
+    // Should send {"test": "test-data"} (not {"test": "{{data}}"})
+    const messages = locators.messages();
+
+    // Find the outgoing message with interpolated content
+    // The echo server will echo back the same message, so we should see it twice
+    const sentMessage = messages.filter({ hasText: 'test-data' }).first();
+    await expect(sentMessage).toBeAttached({ timeout: 2000 });
+
+    // Verify the message content shows interpolated value, not literal variable
+    const messageText = await sentMessage.locator('.text-ellipsis').textContent();
+    expect(messageText).toContain('test-data');
+    expect(messageText).not.toContain('{{data}}');
+
+    // Verify JSON structure is correct
+    expect(messageText).toMatch(/\{[\s\S]*"test"[\s\S]*"test-data"[\s\S]*\}/);
+  });
+});