From 7efaa427cabca837515a191b5eab98b19c4351ce Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Fri, 1 Aug 2025 13:50:13 +0530
Subject: [PATCH 01/18] feat: script to calculate locs of repo

---
 scripts/count-locs.js | 128 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100755 scripts/count-locs.js

diff --git a/scripts/count-locs.js b/scripts/count-locs.js
new file mode 100755
index 000000000..2e12afac8
--- /dev/null
+++ b/scripts/count-locs.js
@@ -0,0 +1,128 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+const PACKAGES_DIR = path.join(__dirname, '..', 'packages');
+const EXCLUDE_DIRS = ['node_modules', 'dist', 'build', '.next', 'coverage', '.git'];
+const EXCLUDE_PACKAGES = ['bruno-toml', 'bruno-tests', 'bruno-docs'];
+const CODE_EXTENSIONS = ['.js', '.jsx', '.ts', '.tsx', '.css', '.scss', '.json', '.md'];
+
+function countLinesInFile(filePath) {
+  try {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    return content.split('\n').length;
+  } catch (error) {
+    return 0;
+  }
+}
+
+function shouldExcludeDir(dirName) {
+  return EXCLUDE_DIRS.includes(dirName) || dirName.startsWith('.');
+}
+
+function isCodeFile(fileName) {
+  return CODE_EXTENSIONS.some(ext => fileName.endsWith(ext));
+}
+
+function countLinesInDirectory(dirPath) {
+  let totalLines = 0;
+  let fileCount = 0;
+  
+  function walkDir(currentPath) {
+    const items = fs.readdirSync(currentPath);
+    
+    for (const item of items) {
+      const itemPath = path.join(currentPath, item);
+      const stat = fs.statSync(itemPath);
+      
+      if (stat.isDirectory()) {
+        if (!shouldExcludeDir(item)) {
+          walkDir(itemPath);
+        }
+      } else if (stat.isFile() && isCodeFile(item)) {
+        const lines = countLinesInFile(itemPath);
+        totalLines += lines;
+        fileCount++;
+      }
+    }
+  }
+  
+  walkDir(dirPath);
+  return { totalLines, fileCount };
+}
+
+function getPackages() {
+  const packages = [];
+  const items = fs.readdirSync(PACKAGES_DIR);
+  
+  for (const item of items) {
+    const itemPath = path.join(PACKAGES_DIR, item);
+    const stat = fs.statSync(itemPath);
+    
+    if (stat.isDirectory() && !shouldExcludeDir(item) && !EXCLUDE_PACKAGES.includes(item)) {
+      packages.push({
+        name: item,
+        path: itemPath
+      });
+    }
+  }
+  
+  return packages;
+}
+
+function formatNumber(num) {
+  return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+}
+
+function printTable(data) {
+  // Calculate column widths
+  const nameWidth = Math.max(20, ...data.map(d => d.name.length));
+  const locWidth = 12;
+  const filesWidth = 12;
+  
+  // Header
+  console.log('\n┌' + '─'.repeat(nameWidth + 2) + '┬' + '─'.repeat(locWidth + 2) + '┬' + '─'.repeat(filesWidth + 2) + '┐');
+  console.log(`│ ${'Package'.padEnd(nameWidth)} │ ${'LOC'.padStart(locWidth)} │ ${'Files'.padStart(filesWidth)} │`);
+  console.log('├' + '─'.repeat(nameWidth + 2) + '┼' + '─'.repeat(locWidth + 2) + '┼' + '─'.repeat(filesWidth + 2) + '┤');
+  
+  // Data rows
+  let totalLOC = 0;
+  let totalFiles = 0;
+  
+  for (const row of data) {
+    console.log(`│ ${row.name.padEnd(nameWidth)} │ ${formatNumber(row.loc).padStart(locWidth)} │ ${formatNumber(row.files).padStart(filesWidth)} │`);
+    totalLOC += row.loc;
+    totalFiles += row.files;
+  }
+  
+  // Footer
+  console.log('├' + '─'.repeat(nameWidth + 2) + '┼' + '─'.repeat(locWidth + 2) + '┼' + '─'.repeat(filesWidth + 2) + '┤');
+  console.log(`│ ${'TOTAL'.padEnd(nameWidth)} │ ${formatNumber(totalLOC).padStart(locWidth)} │ ${formatNumber(totalFiles).padStart(filesWidth)} │`);
+  console.log('└' + '─'.repeat(nameWidth + 2) + '┴' + '─'.repeat(locWidth + 2) + '┴' + '─'.repeat(filesWidth + 2) + '┘\n');
+}
+
+function main() {
+  console.log('Counting lines of code in Bruno packages...\n');
+  
+  const packages = getPackages();
+  const results = [];
+  
+  for (const pkg of packages) {
+    process.stdout.write(`Analyzing ${pkg.name}...`);
+    const { totalLines, fileCount } = countLinesInDirectory(pkg.path);
+    results.push({
+      name: pkg.name,
+      loc: totalLines,
+      files: fileCount
+    });
+    process.stdout.write(' Done\n');
+  }
+  
+  // Sort by LOC descending
+  results.sort((a, b) => b.loc - a.loc);
+  
+  printTable(results);
+}
+
+main();
\ No newline at end of file

From da2f2519ece5751de643fc870fad2611c4031cfc Mon Sep 17 00:00:00 2001
From: sanish-bruno <sanish@usebruno.com>
Date: Tue, 5 Aug 2025 17:17:38 +0530
Subject: [PATCH 02/18] feat: add Playwright testing guide for Bruno
 application

---
 docs/playwright-testing-guide.md | 470 +++++++++++++++++++++++++++++++
 1 file changed, 470 insertions(+)
 create mode 100644 docs/playwright-testing-guide.md

diff --git a/docs/playwright-testing-guide.md b/docs/playwright-testing-guide.md
new file mode 100644
index 000000000..c0de8ad3d
--- /dev/null
+++ b/docs/playwright-testing-guide.md
@@ -0,0 +1,470 @@
+# Playwright Testing Guide for Bruno
+
+This guide explains how to create and run Playwright test cases for the Bruno application using the UI.
+
+## Table of Contents
+
+- [Overview](#overview)
+- [Prerequisites](#prerequisites)
+- [Creating Tests Using Codegen](#creating-tests-using-codegen)
+- [Manual Test Creation](#manual-test-creation)
+- [Test Structure and Organization](#test-structure-and-organization)
+- [Available Test Fixtures](#available-test-fixtures)
+- [Running Tests](#running-tests)
+- [Best Practices](#best-practices)
+- [Examples](#examples)
+- [Troubleshooting](#troubleshooting)
+
+## Overview
+
+Bruno uses Playwright for end-to-end testing of its Electron application. The testing setup includes custom fixtures for Electron app testing and utilities for managing test data.
+
+## Prerequisites
+
+- Node.js installed
+- All dependencies installed (`npm install`)
+- Electron app can be built and run
+
+## Creating Tests Using Codegen
+
+The easiest way to create tests is using Playwright's codegen feature, which records your UI interactions and generates test code.
+
+### Using the Built-in Codegen Script
+
+```bash
+# Generate a test with a specific name
+npm run test:codegen my-new-test
+
+# Generate a test without specifying a name (will prompt for input)
+npm run test:codegen
+```
+
+### What Happens During Codegen
+
+1. The Electron app launches automatically
+2. Playwright Inspector opens in a separate window
+3. You interact with the Bruno UI
+4. Actions are recorded and converted to test code
+5. The generated test file is saved in `e2e-tests/`
+
+### Codegen Workflow
+
+1. **Start Recording**: Run the codegen command
+2. **Interact with UI**: Perform the actions you want to test
+3. **Add Assertions**: Use the inspector to add assertions
+4. **Save Test**: The test file is automatically generated
+5. **Review and Refine**: Edit the generated test as needed
+
+## Manual Test Creation
+
+You can also create tests manually by following the established patterns.
+
+### Basic Test Structure
+
+```typescript
+import { test, expect } from '../../playwright';
+
+test('Test description', async ({ page }) => {
+  // Test steps here
+  await page.getByLabel('Some Label').click();
+
+  // Assertions
+  await expect(page.getByText('Expected Text')).toBeVisible();
+});
+```
+
+### Test with Temporary Data
+
+```typescript
+import { test, expect } from '../../playwright';
+
+test('Test with temporary data', async ({ page, createTmpDir }) => {
+  // Create temporary directory for test data
+  const testDir = await createTmpDir('test-collection');
+
+  // Test steps
+  await page.getByLabel('Create Collection').click();
+  await page.getByLabel('Name').fill('test-collection');
+  await page.getByLabel('Location').fill(testDir);
+
+  // Assertions
+  await expect(page.getByText('test-collection')).toBeVisible();
+});
+```
+
+## Test Structure and Organization
+
+### Directory Structure
+
+```
+e2e-tests/
+├── 001-sanity-tests/          # Basic functionality tests
+│   ├── 001-home-screen.spec.ts
+│   └── 002-create-new-collection-and-new-request.spec.ts
+├── 002-feature-tests/         # Specific feature tests
+├── 003-integration-tests/     # Complex workflow tests
+└── bruno-testbench/           # Test utilities and helpers
+```
+
+### Naming Conventions
+
+- **Files**: Use descriptive names with `.spec.ts` extension
+- **Tests**: Use clear, descriptive test names
+- **Folders**: Use numbered prefixes for ordering
+
+### Test File Template
+
+```typescript
+import { test, expect } from '../../playwright';
+
+test.describe('Feature Name', () => {
+  test('should perform specific action', async ({ page }) => {
+    // Arrange
+    // Act
+    // Assert
+  });
+
+  test('should handle error case', async ({ page }) => {
+    // Test error scenarios
+  });
+});
+```
+
+## Available Test Fixtures
+
+The Bruno Playwright setup provides several custom fixtures:
+
+### Core Fixtures
+
+- `page`: Main page for testing
+- `context`: Browser context
+- `electronApp`: Electron application instance
+
+### Utility Fixtures
+
+- `createTmpDir`: Creates temporary directories for test data
+- `newPage`: Creates a new page instance
+- `pageWithUserData`: Page with custom user data
+- `launchElectronApp`: Launches a new Electron app instance
+- `reuseOrLaunchElectronApp`: Reuses existing app or launches new one
+
+### Using Fixtures
+
+```typescript
+test('Test with multiple fixtures', async ({ page, createTmpDir, electronApp }) => {
+  const testDir = await createTmpDir('test-data');
+
+  // Your test logic here
+});
+```
+
+## Running Tests
+
+### Basic Commands
+
+```bash
+# Run all tests
+npm run test:e2e
+
+# Run specific test file
+npx playwright test e2e-tests/001-sanity-tests/001-home-screen.spec.ts
+
+# Run tests in a specific folder
+npx playwright test e2e-tests/001-sanity-tests/
+```
+
+### Advanced Options
+
+```bash
+# Run with UI mode (for debugging)
+npx playwright test --ui
+
+# Run in headed mode (see browser)
+npx playwright test --headed
+
+# Run with specific browser
+npx playwright test --project="Bruno Electron App"
+
+# Run with debugging
+npx playwright test --debug
+
+# Run with trace recording
+npx playwright test --trace on
+```
+
+### CI/CD Integration
+
+```bash
+# Install browsers for CI
+npx playwright install
+
+# Run tests in CI mode
+npm run test:e2e
+```
+
+## Best Practices
+
+### 1. Use Semantic Selectors
+
+**Preferred:**
+
+```typescript
+await page.getByRole('button', { name: 'Create' }).click();
+await page.getByLabel('Collection Name').fill('test');
+await page.getByText('Success message').toBeVisible();
+```
+
+**Avoid:**
+
+```typescript
+await page.locator('.btn-primary').click();
+await page.locator('#collection-name').fill('test');
+```
+
+### 2. Create Isolated Tests
+
+Each test should be independent and not rely on other tests:
+
+```typescript
+test('should create collection', async ({ page, createTmpDir }) => {
+  const testDir = await createTmpDir('collection-test');
+
+  // Test creates its own data
+  await page.getByLabel('Create Collection').click();
+  await page.getByLabel('Name').fill('test-collection');
+  await page.getByLabel('Location').fill(testDir);
+
+  // Clean up happens automatically via createTmpDir
+});
+```
+
+### 3. Add Meaningful Assertions
+
+Always verify the expected outcomes:
+
+```typescript
+test('should save request successfully', async ({ page }) => {
+  // Arrange
+  await page.getByLabel('Create Collection').click();
+
+  // Act
+  await page.getByRole('button', { name: 'Save' }).click();
+
+  // Assert
+  await expect(page.getByText('Request saved successfully')).toBeVisible();
+  await expect(page.getByRole('tab', { name: 'GET request' })).toBeVisible();
+});
+```
+
+### 4. Handle Async Operations
+
+```typescript
+test('should wait for network requests', async ({ page }) => {
+  // Wait for specific network request
+  await page.waitForResponse((response) => response.url().includes('/api/endpoint'));
+
+  // Or wait for element to be stable
+  await page.waitForSelector('[data-testid="loading"]', { state: 'hidden' });
+});
+```
+
+### 5. Use Test Data Management
+
+```typescript
+test('should work with test data', async ({ page, createTmpDir }) => {
+  const testDir = await createTmpDir('test-data');
+
+  // Create test files
+  await fs.writeFile(path.join(testDir, 'test.bru'), testContent);
+
+  // Use in test
+  await page.getByLabel('Open Collection').click();
+  await page.getByText(testDir).click();
+});
+```
+
+## Examples
+
+### Example 1: Basic Collection Creation
+
+```typescript
+import { test, expect } from '../../playwright';
+
+test('should create a new collection', async ({ page, createTmpDir }) => {
+  const testDir = await createTmpDir('new-collection');
+
+  await page.getByLabel('Create Collection').click();
+  await page.getByLabel('Name').fill('My Test Collection');
+  await page.getByLabel('Location').fill(testDir);
+  await page.getByRole('button', { name: 'Create' }).click();
+
+  await expect(page.getByText('My Test Collection')).toBeVisible();
+});
+```
+
+### Example 2: Request Creation and Execution
+
+```typescript
+import { test, expect } from '../../playwright';
+
+test('should create and execute HTTP request', async ({ page, createTmpDir }) => {
+  const testDir = await createTmpDir('request-test');
+
+  // Create collection
+  await page.getByLabel('Create Collection').click();
+  await page.getByLabel('Name').fill('Request Test');
+  await page.getByLabel('Location').fill(testDir);
+  await page.getByRole('button', { name: 'Create' }).click();
+
+  // Create request
+  await page.locator('#create-new-tab').getByRole('img').click();
+  await page.getByPlaceholder('Request Name').fill('Test Request');
+  await page.locator('#new-request-url .CodeMirror').click();
+  await page.locator('textarea').fill('http://localhost:8081/ping');
+  await page.getByRole('button', { name: 'Create' }).click();
+
+  // Execute request
+  await page.locator('#send-request').getByRole('img').nth(2).click();
+
+  // Verify response
+  await expect(page.getByRole('main')).toContainText('200 OK');
+});
+```
+
+### Example 3: Environment Management
+
+```typescript
+import { test, expect } from '../../playwright';
+
+test('should create and use environment variables', async ({ page, createTmpDir }) => {
+  const testDir = await createTmpDir('env-test');
+
+  // Setup collection
+  await page.getByLabel('Create Collection').click();
+  await page.getByLabel('Name').fill('Environment Test');
+  await page.getByLabel('Location').fill(testDir);
+  await page.getByRole('button', { name: 'Create' }).click();
+
+  // Create environment
+  await page.getByRole('button', { name: 'Environments' }).click();
+  await page.getByRole('button', { name: 'Add Environment' }).click();
+  await page.getByLabel('Environment Name').fill('Development');
+  await page.getByRole('button', { name: 'Create' }).click();
+
+  // Add variable
+  await page.getByRole('button', { name: 'Add Variable' }).click();
+  await page.getByLabel('Variable Name').fill('API_URL');
+  await page.getByLabel('Variable Value').fill('http://localhost:3000');
+  await page.getByRole('button', { name: 'Save' }).click();
+
+  await expect(page.getByText('API_URL')).toBeVisible();
+});
+```
+
+## Troubleshooting
+
+### Common Issues
+
+1. **Electron App Not Starting**
+
+   ```bash
+   # Ensure dependencies are installed
+   npm install
+
+   # Try running the app manually first
+   npm run dev:electron
+   ```
+
+2. **Tests Timing Out**
+
+   ```typescript
+   // Increase timeout for specific test
+   test('slow test', async ({ page }) => {
+     test.setTimeout(60000); // 60 seconds
+     // Test steps
+   });
+   ```
+
+3. **Element Not Found**
+
+   ```typescript
+   // Wait for element to be present
+   await page.waitForSelector('[data-testid="element"]');
+
+   // Or use more specific selectors
+   await page.getByRole('button', { name: 'Exact Button Text' }).click();
+   ```
+
+4. **Flaky Tests**
+
+   ```typescript
+   // Use stable selectors
+   await page.getByTestId('stable-id').click();
+
+   // Wait for state changes
+   await page.waitForLoadState('networkidle');
+   ```
+
+### Debug Mode
+
+```bash
+# Run with debug mode
+npx playwright test --debug
+
+# Run specific test in debug mode
+npx playwright test --debug e2e-tests/001-sanity-tests/001-home-screen.spec.ts
+```
+
+### Trace Analysis
+
+```bash
+# Run with trace recording
+npx playwright test --trace on
+
+# View trace in browser
+npx playwright show-trace test-results/trace-*.zip
+```
+
+## Configuration
+
+The Playwright configuration is in `playwright.config.ts`:
+
+```typescript
+export default defineConfig({
+  testDir: './e2e-tests',
+  fullyParallel: false,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 1 : 0,
+  workers: process.env.CI ? undefined : 1,
+
+  projects: [
+    {
+      name: 'Bruno Electron App'
+    }
+  ],
+
+  webServer: [
+    {
+      command: 'npm run dev:web',
+      url: 'http://localhost:3000',
+      reuseExistingServer: !process.env.CI
+    },
+    {
+      command: 'npm start --workspace=packages/bruno-tests',
+      url: 'http://localhost:8081/ping',
+      reuseExistingServer: !process.env.CI
+    }
+  ]
+});
+```
+
+## Additional Resources
+
+- [Playwright Documentation](https://playwright.dev/)
+- [Playwright Test API](https://playwright.dev/docs/api/class-test)
+- [Electron Testing with Playwright](https://playwright.dev/docs/api/class-electronapplication)
+- [Bruno Project Structure](../readme.md)
+
+---
+
+For questions or issues with testing, please refer to the project's contributing guidelines or create an issue in the repository.

From cd80332de95f4b4a14ff4c83d2e0eeea37d9e4d9 Mon Sep 17 00:00:00 2001
From: bernborgess <bernborgesse@outlook.com>
Date: Wed, 3 Sep 2025 12:46:05 -0300
Subject: [PATCH 03/18] fix: Make globalShortcut only active when app is
 focused

---
 packages/bruno-electron/src/index.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/bruno-electron/src/index.js b/packages/bruno-electron/src/index.js
index 364860bd5..e9026d83c 100644
--- a/packages/bruno-electron/src/index.js
+++ b/packages/bruno-electron/src/index.js
@@ -169,12 +169,6 @@ app.on('ready', async () => {
     return { action: 'deny' };
   });
   
-  // Quick fix for Electron issue #29996: https://github.com/electron/electron/issues/29996
-  globalShortcut.register('Ctrl+=', () => {
-    mainWindow.webContents.setZoomLevel(mainWindow.webContents.getZoomLevel() + 1);
-  });
-
-
 
   mainWindow.webContents.on('did-finish-load', async () => {
     let ogSend = mainWindow.webContents.send;
@@ -218,3 +212,17 @@ app.on('window-all-closed', app.quit);
 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

From db35e7059c0573d7877a43485e2408df6cb0a5e6 Mon Sep 17 00:00:00 2001
From: Pragadesh-45 <54320162+Pragadesh-45@users.noreply.github.com>
Date: Sat, 6 Sep 2025 17:17:51 +0530
Subject: [PATCH 04/18] Merge pull request #5438 from
 Pragadesh-45/feat/multiline-values-for-env-vars

Feat/ Add Multiline Support for Enviroment Variables
---
 .../multiline-variables/collection/bruno.json |   5 +
 .../collection/collection.bru                 |   5 +
 .../collection/environments/Test.bru          |   8 ++
 .../collection/multiline-test.bru             |  44 +++++++
 .../collection/request.bru                    |  38 ++++++
 .../init-user-data/collection-security.json   |  10 ++
 .../init-user-data/preferences.json           |  28 +++++
 .../read-multiline-environment.spec.ts        |  35 ++++++
 .../write-multiline-variable.spec.ts          |  94 ++++++++++++++
 .../Environments/EnvironmentSelector/index.js |   4 +-
 .../EnvironmentVariables/index.js             |   5 +-
 .../EnvironmentVariables/index.js             |   4 +-
 .../ResponsePane/StatusCode/index.js          |   2 +-
 .../Sidebar/Collections/Collection/index.js   |   2 +-
 packages/bruno-lang/v2/src/envToJson.js       |  43 ++++++-
 packages/bruno-lang/v2/src/jsonToBru.js       |  19 +--
 packages/bruno-lang/v2/src/jsonToEnv.js       |   6 +-
 packages/bruno-lang/v2/src/utils.js           |  35 +++++-
 .../bruno-lang/v2/tests/envToJson.spec.js     | 112 +++++++++++++++++
 .../bruno-lang/v2/tests/jsonToEnv.spec.js     | 117 ++++++++++++++++--
 packages/bruno-lang/v2/tests/utils.spec.js    |  21 ++++
 21 files changed, 596 insertions(+), 41 deletions(-)
 create mode 100644 e2e-tests/environments/multiline-variables/collection/bruno.json
 create mode 100644 e2e-tests/environments/multiline-variables/collection/collection.bru
 create mode 100644 e2e-tests/environments/multiline-variables/collection/environments/Test.bru
 create mode 100644 e2e-tests/environments/multiline-variables/collection/multiline-test.bru
 create mode 100644 e2e-tests/environments/multiline-variables/collection/request.bru
 create mode 100644 e2e-tests/environments/multiline-variables/init-user-data/collection-security.json
 create mode 100644 e2e-tests/environments/multiline-variables/init-user-data/preferences.json
 create mode 100644 e2e-tests/environments/multiline-variables/read-multiline-environment.spec.ts
 create mode 100644 e2e-tests/environments/multiline-variables/write-multiline-variable.spec.ts
 create mode 100644 packages/bruno-lang/v2/tests/utils.spec.js

diff --git a/e2e-tests/environments/multiline-variables/collection/bruno.json b/e2e-tests/environments/multiline-variables/collection/bruno.json
new file mode 100644
index 000000000..b2f6c48cd
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/collection/bruno.json
@@ -0,0 +1,5 @@
+{
+  "version": "1",
+  "name": "multiline-variables",
+  "type": "collection"
+}
diff --git a/e2e-tests/environments/multiline-variables/collection/collection.bru b/e2e-tests/environments/multiline-variables/collection/collection.bru
new file mode 100644
index 000000000..66d9f88e4
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/collection/collection.bru
@@ -0,0 +1,5 @@
+meta {
+  name: multiline-variables
+  type: collection
+  version: 1.0.0
+}
\ No newline at end of file
diff --git a/e2e-tests/environments/multiline-variables/collection/environments/Test.bru b/e2e-tests/environments/multiline-variables/collection/environments/Test.bru
new file mode 100644
index 000000000..7a9190cd1
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/collection/environments/Test.bru
@@ -0,0 +1,8 @@
+vars {
+  host: https://www.httpfaker.org
+  multiline_data: '''
+    line1
+    line2
+    line3
+  '''
+}
diff --git a/e2e-tests/environments/multiline-variables/collection/multiline-test.bru b/e2e-tests/environments/multiline-variables/collection/multiline-test.bru
new file mode 100644
index 000000000..4f19735c9
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/collection/multiline-test.bru
@@ -0,0 +1,44 @@
+meta {
+  name: multiline-test
+  type: http
+  seq: 2
+}
+
+post {
+  url: {{host}}/api/echo
+  body: json
+  auth: none
+}
+
+body:json {
+  {{multiline_data_json}}
+}
+
+tests {
+  test("should post multiline data successfully", function() {
+    expect(res.getStatus()).to.equal(200);
+  });
+
+  test("should resolve multiline_data_json variable correctly", function() {
+    const body = res.getBody();
+    // HTTP Faker echo endpoint returns the request body in body.body
+    // Verify the multiline JSON variable was resolved and parsed correctly
+    expect(body.body.user.name).to.equal("John Doe");
+    expect(body.body.user.email).to.equal("john@example.com");
+    expect(body.body.user.preferences.theme).to.equal("dark");
+    expect(body.body.user.preferences.notifications).to.equal(true);
+  });
+
+  test("should preserve JSON structure from multiline variable", function() {
+    const body = res.getBody();
+    // Verify the complete JSON structure was preserved
+    expect(body.body.metadata.created).to.equal("2025-09-03");
+    expect(body.body.metadata.version).to.equal("1.0");
+  });
+
+  test("should resolve host variable in URL", function() {
+    const body = res.getBody();
+    // Verify the host variable was resolved in the request URL
+    expect(body.url).to.equal("https://www.httpfaker.org/api/echo");
+  });
+}
diff --git a/e2e-tests/environments/multiline-variables/collection/request.bru b/e2e-tests/environments/multiline-variables/collection/request.bru
new file mode 100644
index 000000000..1f82b0950
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/collection/request.bru
@@ -0,0 +1,38 @@
+meta {
+  name: request
+  type: http
+  seq: 1
+}
+
+post {
+  url: {{host}}/api/echo
+  body: text
+  auth: none
+}
+
+body:json {
+  Ping Test Request
+  Host: {{host}}
+  
+  Multiline Data:
+  {{multiline_data}}
+  
+  End of multiline content.
+}
+
+body:text {
+  {{host}}
+  {{multiline_data}}
+}
+
+tests {
+  test("should get 200 response", function() {
+    expect(res.getStatus()).to.equal(200);
+  });
+  
+  test("should resolve multiline_data variable correctly", function() {
+    const body = res.getBody();
+    // Verify the multiline variable was resolved and contains all three lines
+    expect(body.body).to.equal("https://www.httpfaker.org\nline1\nline2\nline3");
+  });
+}
diff --git a/e2e-tests/environments/multiline-variables/init-user-data/collection-security.json b/e2e-tests/environments/multiline-variables/init-user-data/collection-security.json
new file mode 100644
index 000000000..5f51bd286
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/init-user-data/collection-security.json
@@ -0,0 +1,10 @@
+{
+  "collections": [
+    {
+      "path": "{{projectRoot}}/e2e-tests/environments/multiline-variables/collection",
+      "securityConfig": {
+        "jsSandboxMode": "developer"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/e2e-tests/environments/multiline-variables/init-user-data/preferences.json b/e2e-tests/environments/multiline-variables/init-user-data/preferences.json
new file mode 100644
index 000000000..9374c16fd
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/init-user-data/preferences.json
@@ -0,0 +1,28 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": [
+    "{{projectRoot}}/e2e-tests/environments/multiline-variables/collection"
+  ],
+  "request": {
+    "sslVerification": false,
+    "customCaCertificate": {
+      "enabled": false,
+      "filePath": null
+    }
+  },
+  "font": {
+    "codeFont": "default"
+  },
+  "proxy": {
+    "enabled": false,
+    "protocol": "http",
+    "hostname": "",
+    "port": "",
+    "auth": {
+      "enabled": false,
+      "username": "",
+      "password": ""
+    },
+    "bypassProxy": ""
+  }
+}
\ No newline at end of file
diff --git a/e2e-tests/environments/multiline-variables/read-multiline-environment.spec.ts b/e2e-tests/environments/multiline-variables/read-multiline-environment.spec.ts
new file mode 100644
index 000000000..0e0856816
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/read-multiline-environment.spec.ts
@@ -0,0 +1,35 @@
+import { test, expect } from '../../../playwright';
+
+test.describe('Multiline Variables - Read Environment Test', () => {
+  test('should read existing multiline environment variables', async ({ pageWithUserData: page }) => {
+    test.setTimeout(30 * 1000);
+
+    // open the collection
+    await expect(page.getByTitle('multiline-variables')).toBeVisible();
+    await page.getByTitle('multiline-variables').click();
+
+    // open request
+    await expect(page.getByTitle('request', { exact: true })).toBeVisible();
+    await page.getByTitle('request', { exact: true }).click();
+
+    // open environment dropdown
+    await expect(page.getByTitle('No Environment')).toBeVisible();
+    await page.getByTitle('No Environment').click();
+
+    // select test environment
+    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();
+
+    // send request
+    const sendButton = page.locator('#send-request').getByRole('img').nth(2);
+    await expect(sendButton).toBeVisible();
+    await sendButton.click();
+    await expect(page.locator('.response-status-code.text-ok')).toBeVisible();
+    await expect(page.locator('.response-status-code')).toContainText('200');
+
+    // response pane should contain the expected multiline text in JSON body
+    const responsePane = page.locator('.response-pane');
+    await expect(responsePane).toContainText('"body": "https://www.httpfaker.org\\nline1\\nline2\\nline3"');
+  });
+});
diff --git a/e2e-tests/environments/multiline-variables/write-multiline-variable.spec.ts b/e2e-tests/environments/multiline-variables/write-multiline-variable.spec.ts
new file mode 100644
index 000000000..f2aff96fe
--- /dev/null
+++ b/e2e-tests/environments/multiline-variables/write-multiline-variable.spec.ts
@@ -0,0 +1,94 @@
+import { test, expect } from '../../../playwright';
+
+test.describe('Multiline Variables - Write Test', () => {
+  test('should create and use multiline environment variable dynamically', async ({ pageWithUserData: page }) => {
+    test.setTimeout(60 * 1000);
+
+    // open the collection
+    await expect(page.getByTitle('multiline-variables')).toBeVisible();
+    await page.getByTitle('multiline-variables').click();
+
+    // open request
+    await expect(page.getByTitle('multiline-test', { exact: true })).toBeVisible();
+    await page.getByTitle('multiline-test', { exact: true }).click();
+
+    // open environment dropdown
+    await expect(page.getByTitle('No Environment')).toBeVisible();
+    await page.getByTitle('No Environment').click();
+
+    // select test environment
+    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();
+
+    // select configure button from environment dropdown
+    await expect(page.getByTitle('Test', { exact: true })).toBeVisible();
+    await page.getByTitle('Test', { exact: true }).click();
+
+    // open environment configuration
+    await expect(page.locator('#Configure')).toBeVisible();
+    await page.locator('#Configure').click();
+
+    // add variable
+    await page.getByRole('button', { name: /Add.*Variable/i }).click();
+    const valueTextarea = page.locator('.bruno-modal-card textarea').last();
+    await expect(valueTextarea).toBeVisible();
+
+
+    const jsonValue = `{
+  "user": {
+    "name": "John Doe",
+    "email": "john@example.com",
+    "preferences": {
+      "theme": "dark",
+      "notifications": true
+    }
+  },
+  "metadata": {
+    "created": "2025-09-03",
+    "version": "1.0"
+  }
+}`;
+
+    // fill variable value
+    await valueTextarea.fill(jsonValue);
+    await page.keyboard.press('Shift+Tab');
+    await page.keyboard.type('multiline_data_json');
+
+    // save variable and close config
+    const saveVarButton = page.getByRole('button', { name: /Save/i });
+    await expect(saveVarButton).toBeVisible();
+    await saveVarButton.click();
+
+    await expect(page.locator('.close.cursor-pointer')).toBeVisible();
+    await page.locator('.close.cursor-pointer').click();
+
+    // send request
+    const sendButton = page.locator('#send-request').getByRole('img').nth(2);
+    await expect(sendButton).toBeVisible();
+    await sendButton.click();
+
+    // wait for response status
+    await expect(page.locator('.response-status-code.text-ok')).toBeVisible();
+    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}';
+    await expect(page.locator('.response-pane')).toContainText(`"body": ${JSON.stringify(expectedBody)}`);
+  });
+
+  // clean up created variable after test
+  test.afterEach(async () => {
+    const fs = require('fs');
+    const path = require('path');
+
+    const testBruPath = path.join(__dirname, 'collection/environments/Test.bru');
+    let content = fs.readFileSync(testBruPath, 'utf8');
+
+    // remove the multiline_data_json variable and its content
+    content = content.replace(/\s*multiline_data_json:\s*'''\s*[\s\S]*?\s*'''/g, '');
+
+    fs.writeFileSync(testBruPath, content);
+  });
+});
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
index 848048c13..a8246237c 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
@@ -19,7 +19,7 @@ const EnvironmentSelector = ({ collection }) => {
   const Icon = forwardRef((props, ref) => {
     return (
       <div ref={ref} className="current-environment flex items-center justify-center pl-3 pr-2 py-1 select-none">
-        <p className="text-nowrap truncate max-w-32">{activeEnvironment ? activeEnvironment.name : 'No Environment'}</p>
+        <p className="text-nowrap truncate max-w-32" title={activeEnvironment ? activeEnvironment.name : 'No Environment'}>{activeEnvironment ? activeEnvironment.name : 'No Environment'}</p>
         <IconCaretDown className="caret" size={14} strokeWidth={2} />
       </div>
     );
@@ -82,7 +82,7 @@ const EnvironmentSelector = ({ collection }) => {
             handleSettingsIconClick();
             dropdownTippyRef.current.hide();
           }}>
-            <div className="pr-2 text-gray-600">
+            <div className="pr-2 text-gray-600" id="Configure">
               <IconSettings size={18} strokeWidth={1.5} />
             </div>
             <span>Configure</span>
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 5ba3b0797..d02cc494a 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
@@ -5,7 +5,7 @@ import { IconTrash, IconAlertCircle, IconDeviceFloppy, IconRefresh, IconCircleCh
 import { useTheme } from 'providers/Theme';
 import { useDispatch, useSelector } from 'react-redux';
 import { selectEnvironment } from 'providers/ReduxStore/slices/collections/actions';
-import SingleLineEditor from 'components/SingleLineEditor';
+import MultiLineEditor from 'components/MultiLineEditor';
 import StyledWrapper from './StyledWrapper';
 import { uuid } from 'utils/common';
 import { useFormik } from 'formik';
@@ -214,7 +214,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
                 </td>
                 <td className="flex flex-row flex-nowrap items-center">
                   <div className="overflow-hidden grow w-full relative">
-                    <SingleLineEditor
+                    <MultiLineEditor
                       theme={storedTheme}
                       collection={_collection}
                       name={`${index}.value`}
@@ -253,6 +253,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
             ref={addButtonRef}
             className="btn-add-param text-link pr-2 py-3 mt-2 select-none"
             onClick={addVariable}
+            id="add-variable"
           >
             + Add Variable
           </button>
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 10ab9fba3..f539543dd 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
@@ -3,7 +3,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import { IconTrash, IconAlertCircle } from '@tabler/icons';
 import { useTheme } from 'providers/Theme';
 import { useDispatch } from 'react-redux';
-import SingleLineEditor from 'components/SingleLineEditor';
+import MultiLineEditor from 'components/MultiLineEditor';
 import StyledWrapper from './StyledWrapper';
 import { uuid } from 'utils/common';
 import { useFormik } from 'formik';
@@ -147,7 +147,7 @@ const EnvironmentVariables = ({ environment, setIsModified, originalEnvironmentV
                 </td>
                 <td className="flex flex-row flex-nowrap">
                   <div className="overflow-hidden grow w-full relative">
-                    <SingleLineEditor
+                    <MultiLineEditor
                       theme={storedTheme}
                       name={`${index}.value`}
                       value={variable.value}
diff --git a/packages/bruno-app/src/components/ResponsePane/StatusCode/index.js b/packages/bruno-app/src/components/ResponsePane/StatusCode/index.js
index 9287899b1..37f673636 100644
--- a/packages/bruno-app/src/components/ResponsePane/StatusCode/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/StatusCode/index.js
@@ -16,7 +16,7 @@ const StatusCode = ({ status }) => {
   };
 
   return (
-    <StyledWrapper className={getTabClassname(status)}>
+    <StyledWrapper className={`response-status-code ${getTabClassname(status)}`}>
       {status} {statusCodePhraseMap[status]}
     </StyledWrapper>
   );
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 0f44b467a..67ffcb68b 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
@@ -232,7 +232,7 @@ const Collection = ({ collection, searchText }) => {
             onClick={handleCollectionCollapse}
             onDoubleClick={handleCollectionDoubleClick}
           />
-          <div className="ml-1 w-full" id="sidebar-collection-name">
+          <div className="ml-1 w-full" id="sidebar-collection-name" title={collection.name}>
             {collection.name}
           </div>
           {isLoading ? <IconLoader2 className="animate-spin mx-1" size={18} strokeWidth={1.5} /> : null}
diff --git a/packages/bruno-lang/v2/src/envToJson.js b/packages/bruno-lang/v2/src/envToJson.js
index e88c593c1..b698c8bfc 100644
--- a/packages/bruno-lang/v2/src/envToJson.js
+++ b/packages/bruno-lang/v2/src/envToJson.js
@@ -1,6 +1,16 @@
 const ohm = require('ohm-js');
 const _ = require('lodash');
 
+// Env files use 4-space indentation for multiline content
+// vars {
+//   API_KEY: '''
+//     -----BEGIN PUBLIC KEY-----
+//     MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8
+//     HMR5LXFFrwXQFE6xUVhXrxUpx1TtfoGkRcU7LEWV
+//     -----END PUBLIC KEY-----
+//   '''
+// }
+const indentLevel = 4;
 const grammar = ohm.grammar(`Bru {
   BruEnvFile = (vars | secretvars)*
 
@@ -10,14 +20,20 @@ const grammar = ohm.grammar(`Bru {
   tagend = nl "}"
   optionalnl = ~tagend nl
   keychar = ~(tagend | st | nl | ":") any
-  valuechar = ~(nl | tagend) any
+  valuechar = ~(nl | tagend | multilinetextblockstart) any
+
+  multilinetextblockdelimiter = "'''"
+  multilinetextblockstart = "'''" nl
+  multilinetextblockend = nl st* "'''"
+  multilinetextblock = multilinetextblockstart multilinetextblockcontent multilinetextblockend
+  multilinetextblockcontent = (~multilinetextblockend any)*
 
   // Dictionary Blocks
   dictionary = st* "{" pairlist? tagend
   pairlist = optionalnl* pair (~tagend stnl* pair)* (~tagend space)*
   pair = st* key st* ":" st* value st*
   key = keychar*
-  value = valuechar*
+  value = multilinetextblock | valuechar*
 
   // Array Blocks
   array = st* "[" stnl* valuelist stnl* "]"
@@ -120,8 +136,31 @@ const sem = grammar.createSemantics().addAttribute('ast', {
     return chars.sourceString ? chars.sourceString.trim() : '';
   },
   value(chars) {
+    // .ctorName provides the name of the rule that matched the input
+    if (chars.ctorName === 'multilinetextblock') {
+      return chars.ast;
+    }
     return chars.sourceString ? chars.sourceString.trim() : '';
   },
+  multilinetextblockstart(_1, _2) {
+    return '';
+  },
+  multilinetextblockend(_1, _2, _3) {
+    return '';
+  },
+  multilinetextblockdelimiter(_) {
+    return '';
+  },
+  multilinetextblock(_1, content, _2) {
+    return content.ast
+      .split('\n')
+      .map((line) => line.slice(indentLevel)) // Remove 4-space indentation
+      .join('\n')
+      .trim();
+  },
+  multilinetextblockcontent(chars) {
+    return chars.sourceString;
+  },
   nl(_1, _2) {
     return '';
   },
diff --git a/packages/bruno-lang/v2/src/jsonToBru.js b/packages/bruno-lang/v2/src/jsonToBru.js
index cc0d56d9a..7531eb26b 100644
--- a/packages/bruno-lang/v2/src/jsonToBru.js
+++ b/packages/bruno-lang/v2/src/jsonToBru.js
@@ -1,6 +1,6 @@
 const _ = require('lodash');
 
-const { indentString } = require('./utils');
+const { indentString, getValueString } = require('./utils');
 
 const enabled = (items = [], key = "enabled") => items.filter((item) => item[key]);
 const disabled = (items = [], key = "enabled") => items.filter((item) => !item[key]);
@@ -16,23 +16,6 @@ const stripLastLine = (text) => {
   return text.replace(/(\r?\n)$/, '');
 };
 
-const getValueString = (value) => {
-  const hasNewLines = value?.includes('\n');
-
-  if (!hasNewLines) {
-    return value;
-  }
-
-  // Add one level of indentation to the contents of the multistring
-  const indentedLines = value
-    .split('\n')
-    .map((line) => `  ${line}`)
-    .join('\n');
-
-  // Join the lines back together with newline characters and enclose them in triple single quotes
-  return `'''\n${indentedLines}\n'''`;
-};
-
 const jsonToBru = (json) => {
   const { meta, http, grpc, params, headers, metadata, auth, body, script, tests, vars, assertions, settings, docs } = json;
 
diff --git a/packages/bruno-lang/v2/src/jsonToEnv.js b/packages/bruno-lang/v2/src/jsonToEnv.js
index 42d0a4281..185dc46bb 100644
--- a/packages/bruno-lang/v2/src/jsonToEnv.js
+++ b/packages/bruno-lang/v2/src/jsonToEnv.js
@@ -1,4 +1,5 @@
 const _ = require('lodash');
+const { getValueString, indentString } = require('./utils');
 
 const envToJson = (json) => {
   const variables = _.get(json, 'variables', []);
@@ -7,7 +8,8 @@ const envToJson = (json) => {
     .map((variable) => {
       const { name, value, enabled } = variable;
       const prefix = enabled ? '' : '~';
-      return `  ${prefix}${name}: ${value}`;
+
+      return indentString(`${prefix}${name}: ${getValueString(value)}`);
     });
 
   const secretVars = variables
@@ -15,7 +17,7 @@ const envToJson = (json) => {
     .map((variable) => {
       const { name, enabled } = variable;
       const prefix = enabled ? '' : '~';
-      return `  ${prefix}${name}`;
+      return indentString(`${prefix}${name}`);
     });
 
   if (!variables || !variables.length) {
diff --git a/packages/bruno-lang/v2/src/utils.js b/packages/bruno-lang/v2/src/utils.js
index 454d2099d..63e372824 100644
--- a/packages/bruno-lang/v2/src/utils.js
+++ b/packages/bruno-lang/v2/src/utils.js
@@ -7,12 +7,21 @@ const safeParseJson = (json) => {
   }
 };
 
+const normalizeNewlines = (str) => {
+  if (!str || typeof str !== 'string') {
+    return str || '';
+  }
+
+  // "\r\n" is windows, "\r" is old mac, "\n" is linux
+  return str.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+};
+
 const indentString = (str) => {
   if (!str || !str.length) {
     return str || '';
   }
 
-  return str
+  return normalizeNewlines(str)
     .split('\n')
     .map((line) => '  ' + line)
     .join('\n');
@@ -22,15 +31,33 @@ const outdentString = (str) => {
   if (!str || !str.length) {
     return str || '';
   }
-  
-  return str
+
+  return normalizeNewlines(str)
     .split('\n')
     .map((line) => line.replace(/^  /, ''))
     .join('\n');
 };
 
+const getValueString = (value) => {
+  // Handle null, undefined, and empty strings
+  if (!value) {
+    return '';
+  }
+
+  const hasNewLines = value?.includes('\n') || value?.includes('\r');
+
+  if (!hasNewLines) {
+    return value;
+  }
+
+  // Wrap multiline values in triple quotes with 2-space indentation
+  return `'''\n${indentString(value)}\n'''`;
+};
+
 module.exports = {
   safeParseJson,
+  normalizeNewlines,
   indentString,
-  outdentString
+  outdentString,
+  getValueString
 };
diff --git a/packages/bruno-lang/v2/tests/envToJson.spec.js b/packages/bruno-lang/v2/tests/envToJson.spec.js
index 9c97cd1fa..9c19dc211 100644
--- a/packages/bruno-lang/v2/tests/envToJson.spec.js
+++ b/packages/bruno-lang/v2/tests/envToJson.spec.js
@@ -313,4 +313,116 @@ vars:secret [access_key,access_secret,    access_password  ]
 
     expect(output).toEqual(expected);
   });
+
+  it('should parse multiline variable values', () => {
+    const input = `
+vars {
+  json_data: '''
+    {
+      "name": "test",
+      "value": 123
+    }
+  '''
+}`;
+
+    const output = parser(input);
+    const expected = {
+      variables: [
+        {
+          name: 'json_data',
+          value: '{\n  "name": "test",\n  "value": 123\n}',
+          enabled: true,
+          secret: false
+        }
+      ]
+    };
+
+    expect(output).toEqual(expected);
+  });
+
+  it('should parse multiline variable that has indentation', () => {
+    const input = `
+vars {
+  script: '''
+    function test() {
+      console.log("hello");
+      return true;
+    }
+  '''
+}`;
+
+    const output = parser(input);
+    const expected = {
+      variables: [
+        {
+          name: 'script',
+          value: 'function test() {\n  console.log("hello");\n  return true;\n}',
+          enabled: true,
+          secret: false
+        }
+      ]
+    };
+
+    expect(output).toEqual(expected);
+  });
+
+  it('should parse disabled multiline variable', () => {
+    const input = `
+vars {
+  ~disabled_multiline: '''
+    line 1
+    line 2
+    line 3
+  '''
+}`;
+
+    const output = parser(input);
+    const expected = {
+      variables: [
+        {
+          name: 'disabled_multiline',
+          value: 'line 1\nline 2\nline 3',
+          enabled: false,
+          secret: false
+        }
+      ]
+    };
+
+    expect(output).toEqual(expected);
+  });
+
+  it('should parse multiple multiline variables', () => {
+    const input = `
+vars {
+  config: '''
+    debug=true
+    port=3000
+  '''
+  template: '''
+    <html>
+      <body>Hello World</body>
+    </html>
+  '''
+}`;
+
+    const output = parser(input);
+    const expected = {
+      variables: [
+        {
+          name: 'config',
+          value: 'debug=true\nport=3000',
+          enabled: true,
+          secret: false
+        },
+        {
+          name: 'template',
+          value: '<html>\n  <body>Hello World</body>\n</html>',
+          enabled: true,
+          secret: false
+        }
+      ]
+    };
+
+    expect(output).toEqual(expected);
+  });
 });
diff --git a/packages/bruno-lang/v2/tests/jsonToEnv.spec.js b/packages/bruno-lang/v2/tests/jsonToEnv.spec.js
index 62b7aa269..940603094 100644
--- a/packages/bruno-lang/v2/tests/jsonToEnv.spec.js
+++ b/packages/bruno-lang/v2/tests/jsonToEnv.spec.js
@@ -1,7 +1,7 @@
 const parser = require('../src/jsonToEnv');
 
-describe('env parser', () => {
-  it('should parse empty vars', () => {
+describe('jsonToEnv', () => {
+  it('should stringify empty vars', () => {
     const input = {
       variables: []
     };
@@ -14,7 +14,7 @@ describe('env parser', () => {
     expect(output).toEqual(expected);
   });
 
-  it('should parse single var line', () => {
+  it('should stringify single var line', () => {
     const input = {
       variables: [
         {
@@ -33,7 +33,7 @@ describe('env parser', () => {
     expect(output).toEqual(expected);
   });
 
-  it('should parse multiple var lines', () => {
+  it('should stringify multiple var lines', () => {
     const input = {
       variables: [
         {
@@ -58,7 +58,7 @@ describe('env parser', () => {
     expect(output).toEqual(expected);
   });
 
-  it('should parse secret vars', () => {
+  it('should stringify secret vars', () => {
     const input = {
       variables: [
         {
@@ -86,7 +86,7 @@ vars:secret [
     expect(output).toEqual(expected);
   });
 
-  it('should parse multiple secret vars', () => {
+  it('should stringify multiple secret vars', () => {
     const input = {
       variables: [
         {
@@ -121,7 +121,7 @@ vars:secret [
     expect(output).toEqual(expected);
   });
 
-  it('should parse even if the only secret vars are present', () => {
+  it('should stringify even if the only secret vars are present', () => {
     const input = {
       variables: [
         {
@@ -137,6 +137,109 @@ vars:secret [
     const expected = `vars:secret [
   token
 ]
+`;
+    expect(output).toEqual(expected);
+  });
+
+  it('should stringify multiline variables', () => {
+    const input = {
+      variables: [
+        {
+          name: 'json_data',
+          value: '{\n  "name": "test",\n  "value": 123\n}',
+          enabled: true
+        }
+      ]
+    };
+
+    const output = parser(input);
+    const expected = `vars {
+  json_data: '''
+    {
+      "name": "test",
+      "value": 123
+    }
+  '''
+}
+`;
+    expect(output).toEqual(expected);
+  });
+
+  it('should stringify multiline variables containing indentation', () => {
+    const input = {
+      variables: [
+        {
+          name: 'script',
+          value: 'function test() {\n  console.log("hello");\n  return true;\n}',
+          enabled: true
+        }
+      ]
+    };
+
+    const output = parser(input);
+    const expected = `vars {
+  script: '''
+    function test() {
+      console.log("hello");
+      return true;
+    }
+  '''
+}
+`;
+    expect(output).toEqual(expected);
+  });
+
+  it('should stringify disabled multiline variable', () => {
+    const input = {
+      variables: [
+        {
+          name: 'disabled_multiline',
+          value: 'line 1\nline 2\nline 3',
+          enabled: false
+        }
+      ]
+    };
+
+    const output = parser(input);
+    const expected = `vars {
+  ~disabled_multiline: '''
+    line 1
+    line 2
+    line 3
+  '''
+}
+`;
+    expect(output).toEqual(expected);
+  });
+
+  it('should stringify multiple multiline variables', () => {
+    const input = {
+      variables: [
+        {
+          name: 'config',
+          value: 'debug=true\nport=3000',
+          enabled: true
+        },
+        {
+          name: 'template',
+          value: '<html>\n  <body>Hello World</body>\n</html>',
+          enabled: true
+        }
+      ]
+    };
+
+    const output = parser(input);
+    const expected = `vars {
+  config: '''
+    debug=true
+    port=3000
+  '''
+  template: '''
+    <html>
+      <body>Hello World</body>
+    </html>
+  '''
+}
 `;
     expect(output).toEqual(expected);
   });
diff --git a/packages/bruno-lang/v2/tests/utils.spec.js b/packages/bruno-lang/v2/tests/utils.spec.js
new file mode 100644
index 000000000..b9564c69d
--- /dev/null
+++ b/packages/bruno-lang/v2/tests/utils.spec.js
@@ -0,0 +1,21 @@
+const { getValueString } = require('../src/utils');
+
+describe('getValueString', () => {
+  it('returns single line value as-is', () => {
+    expect(getValueString('hello world')).toBe('hello world');
+  });
+
+  it('wraps multiline value in triple quotes with indentation', () => {
+    expect(getValueString('line1\nline2\nline3')).toBe("'''\n  line1\n  line2\n  line3\n'''");
+  });
+
+  it('normalizes different newline types', () => {
+    expect(getValueString('line1\r\nline2\rline3\nline4')).toBe("'''\n  line1\n  line2\n  line3\n  line4\n'''");
+  });
+
+  it('returns empty string for empty/null/undefined', () => {
+    expect(getValueString('')).toBe('');
+    expect(getValueString(null)).toBe('');
+    expect(getValueString(undefined)).toBe('');
+  });
+});

From 033c5cc0f7e4912d5767ac1771a79a735671a178 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Sun, 7 Sep 2025 03:05:11 +0530
Subject: [PATCH 05/18] Refactor tests

---
 .../001-persistent-env-test.spec.ts           | 33 -----------
 .../002-env-test-without-persistence.spec.ts  | 40 -------------
 .../collection/collection.bru                 |  0
 .../collection/environments/Env.bru           |  4 --
 .../init-user-data/preferences.json           |  6 --
 package-lock.json                             |  2 +-
 .../Environments/EnvironmentSelector/index.js |  2 +-
 .../EnvironmentVariables/index.js             |  2 +-
 .../EnvironmentSelector/index.js              |  2 +-
 .../components/RequestPane/QueryUrl/index.js  |  2 +
 playwright.config.ts                          |  2 +-
 playwright/codegen.ts                         |  2 +-
 .../create/create-collection.spec.ts          | 21 +++----
 .../cookies/cookie-persistence.spec.ts        |  0
 .../cookies/corrupted-passkey.spec.ts         |  0
 .../api-setEnvVar-with-persist.spec.ts        | 57 +++++++++++++++++++
 .../api-setEnvVar-without-persist.spec.ts     | 49 ++++++++++++++++
 .../collection/api-setEnvVar-with-persist.bru |  4 +-
 .../api-setEnvVar-without-persist.bru         |  4 +-
 .../api-setEnvVar}/collection/bruno.json      |  0
 .../collection/environments/Stage.bru         |  3 +-
 .../init-user-data/collection-security.json   | 10 ++++
 .../init-user-data/preferences.json           |  6 ++
 .../multiline-variables/collection/bruno.json |  0
 .../collection/collection.bru                 |  0
 .../collection/environments/Test.bru          |  0
 .../collection/multiline-test.bru             |  0
 .../collection/request.bru                    |  0
 .../init-user-data/collection-security.json   |  2 +-
 .../init-user-data/preferences.json           |  2 +-
 .../read-multiline-environment.spec.ts        |  3 +-
 .../write-multiline-variable.spec.ts          |  4 +-
 .../notifications/notifications.spec.js       |  0
 .../sidebar-toggle/sidebar-toggle.spec.js     |  0
 .../bruno/001-import-bruno-testbench.spec.ts  |  0
 .../002-import-bruno-corrupted-fails.spec.ts  |  0
 ...port-bruno-missing-required-schema.spec.ts |  0
 .../001-file-input-acceptance.spec.ts         |  0
 .../002-invalid-file-handling.spec.ts         |  0
 .../insomnia/001-import-insomnia-v4.spec.ts   |  0
 .../insomnia/002-import-insomnia-v5.spec.ts   |  0
 .../003-invalid-missing-collection.spec.ts    |  0
 .../insomnia/004-malformed-structure.spec.ts  |  0
 .../openapi/001-import-openapi-yaml.spec.ts   |  0
 .../openapi/002-import-openapi-json.spec.ts   |  0
 .../import}/openapi/003-missing-info.spec.ts  |  0
 .../openapi/004-malformed-yaml.spec.ts        |  0
 .../postman/001-import-postman-v21.spec.ts    |  0
 .../postman/002-import-postman-v20.spec.ts    |  0
 .../postman/003-invalid-missing-info.spec.ts  |  0
 .../postman/004-invalid-schema.spec.ts        |  0
 .../postman/005-malformed-structure.spec.ts   |  0
 .../import}/postman/006-invalid-json.spec.ts  |  0
 .../test-data/bruno-invalid-corrupted.json    |  0
 .../import}/test-data/bruno-malformed.json    |  0
 .../bruno-missing-required-fields.json        |  0
 .../import}/test-data/bruno-testbench.json    |  0
 .../import}/test-data/empty-file.json         |  0
 .../import}/test-data/insomnia-malformed.json |  0
 .../import}/test-data/insomnia-v4.json        |  0
 ...nsomnia-v5-invalid-missing-collection.yaml |  0
 .../import}/test-data/insomnia-v5.yaml        |  0
 .../import}/test-data/invalid-json.json       |  0
 .../import}/test-data/invalid.txt             |  0
 .../test-data/openapi-comprehensive.yaml      |  0
 .../test-data/openapi-invalid-version.yaml    |  0
 .../import}/test-data/openapi-malformed.yaml  |  0
 .../test-data/openapi-missing-info.yaml       |  0
 .../import}/test-data/openapi-simple.json     |  0
 .../postman-invalid-missing-info.json         |  0
 .../test-data/postman-invalid-schema.json     |  0
 .../import}/test-data/postman-malformed.json  |  0
 .../import}/test-data/postman-v20.json        |  0
 .../import}/test-data/postman-v21.json        |  0
 .../preferences/support-links.spec.js         |  6 +-
 .../runner/collection-run.ts                  |  2 +-
 .../runner}/init-user-data/preferences.json   |  0
 .../start/app-open.spec.ts                    |  0
 78 files changed, 154 insertions(+), 116 deletions(-)
 delete mode 100644 e2e-tests/persistent-env-tests/001-persistent-env-test.spec.ts
 delete mode 100644 e2e-tests/persistent-env-tests/002-env-test-without-persistence.spec.ts
 delete mode 100644 e2e-tests/persistent-env-tests/collection/collection.bru
 delete mode 100644 e2e-tests/persistent-env-tests/collection/environments/Env.bru
 delete mode 100644 e2e-tests/persistent-env-tests/init-user-data/preferences.json
 rename e2e-tests/001-sanity-tests/002-create-new-collection-and-new-request.spec.ts => tests/collection/create/create-collection.spec.ts (66%)
 rename e2e-tests/002-cookies-tests/001-cookie-persistence.spec.ts => tests/cookies/cookie-persistence.spec.ts (100%)
 rename e2e-tests/002-cookies-tests/002-corrupted-passkey.spec.ts => tests/cookies/corrupted-passkey.spec.ts (100%)
 create mode 100644 tests/environments/api-setEnvVar/api-setEnvVar-with-persist.spec.ts
 create mode 100644 tests/environments/api-setEnvVar/api-setEnvVar-without-persist.spec.ts
 rename e2e-tests/persistent-env-tests/collection/request.bru => tests/environments/api-setEnvVar/collection/api-setEnvVar-with-persist.bru (52%)
 rename e2e-tests/persistent-env-tests/collection/persist-env-request.bru => tests/environments/api-setEnvVar/collection/api-setEnvVar-without-persist.bru (56%)
 rename {e2e-tests/persistent-env-tests => tests/environments/api-setEnvVar}/collection/bruno.json (100%)
 rename {e2e-tests/persistent-env-tests => tests/environments/api-setEnvVar}/collection/environments/Stage.bru (74%)
 create mode 100644 tests/environments/api-setEnvVar/init-user-data/collection-security.json
 create mode 100644 tests/environments/api-setEnvVar/init-user-data/preferences.json
 rename {e2e-tests => tests}/environments/multiline-variables/collection/bruno.json (100%)
 rename {e2e-tests => tests}/environments/multiline-variables/collection/collection.bru (100%)
 rename {e2e-tests => tests}/environments/multiline-variables/collection/environments/Test.bru (100%)
 rename {e2e-tests => tests}/environments/multiline-variables/collection/multiline-test.bru (100%)
 rename {e2e-tests => tests}/environments/multiline-variables/collection/request.bru (100%)
 rename {e2e-tests => tests}/environments/multiline-variables/init-user-data/collection-security.json (55%)
 rename {e2e-tests => tests}/environments/multiline-variables/init-user-data/preferences.json (85%)
 rename {e2e-tests => tests}/environments/multiline-variables/read-multiline-environment.spec.ts (92%)
 rename {e2e-tests => tests}/environments/multiline-variables/write-multiline-variable.spec.ts (96%)
 rename {e2e-tests => tests}/footer/notifications/notifications.spec.js (100%)
 rename {e2e-tests => tests}/footer/sidebar-toggle/sidebar-toggle.spec.js (100%)
 rename {e2e-tests/import-tests => tests/import}/bruno/001-import-bruno-testbench.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/bruno/002-import-bruno-corrupted-fails.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/bruno/003-import-bruno-missing-required-schema.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/file-types/001-file-input-acceptance.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/file-types/002-invalid-file-handling.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/insomnia/001-import-insomnia-v4.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/insomnia/002-import-insomnia-v5.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/insomnia/003-invalid-missing-collection.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/insomnia/004-malformed-structure.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/openapi/001-import-openapi-yaml.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/openapi/002-import-openapi-json.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/openapi/003-missing-info.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/openapi/004-malformed-yaml.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/postman/001-import-postman-v21.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/postman/002-import-postman-v20.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/postman/003-invalid-missing-info.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/postman/004-invalid-schema.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/postman/005-malformed-structure.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/postman/006-invalid-json.spec.ts (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/bruno-invalid-corrupted.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/bruno-malformed.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/bruno-missing-required-fields.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/bruno-testbench.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/empty-file.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/insomnia-malformed.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/insomnia-v4.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/insomnia-v5-invalid-missing-collection.yaml (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/insomnia-v5.yaml (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/invalid-json.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/invalid.txt (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/openapi-comprehensive.yaml (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/openapi-invalid-version.yaml (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/openapi-malformed.yaml (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/openapi-missing-info.yaml (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/openapi-simple.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/postman-invalid-missing-info.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/postman-invalid-schema.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/postman-malformed.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/postman-v20.json (100%)
 rename {e2e-tests/import-tests => tests/import}/test-data/postman-v21.json (100%)
 rename e2e-tests/preferences/verify-support-links-in-preferences.spec.js => tests/preferences/support-links.spec.js (94%)
 rename e2e-tests/bruno-testbench/run-testbench-requests.spec.ts => tests/runner/collection-run.ts (97%)
 rename {e2e-tests/bruno-testbench => tests/runner}/init-user-data/preferences.json (100%)
 rename e2e-tests/001-sanity-tests/001-home-screen.spec.ts => tests/start/app-open.spec.ts (100%)

diff --git a/e2e-tests/persistent-env-tests/001-persistent-env-test.spec.ts b/e2e-tests/persistent-env-tests/001-persistent-env-test.spec.ts
deleted file mode 100644
index e319e178f..000000000
--- a/e2e-tests/persistent-env-tests/001-persistent-env-test.spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test.describe.serial('Persistent Environment Test', () => {
-  test.setTimeout(2 * 10 * 1000);
-
-  test('add env using script', async ({ pageWithUserData: page, restartApp }) => {
-    await page.locator('#sidebar-collection-name').click();
-    await page.getByRole('button', { name: 'Save' }).click();
-    await page.getByText('ping', { exact: true }).click();
-    await page.getByText('No Environment').click();
-    await page.getByRole('tooltip').locator('div').filter({ hasText: 'Env' }).nth(3).click();
-    await page.locator('#send-request').getByRole('img').nth(2).click();
-    await page.waitForTimeout(1000);
-    await page.locator('div').filter({ hasText: /^Env$/ }).nth(3).click();
-    await page.getByText('Configure', { exact: true }).click();
-    await expect(page.getByRole('row', { name: 'persistent-env-test' }).getByRole('cell').nth(3)).toBeVisible();
-    await page.getByText('×').click();
-
-    const newApp = await restartApp();
-    const newPage = await newApp.firstWindow();
-    await newPage.locator('#sidebar-collection-name').click();
-    await newPage.getByRole('button', { name: 'Save' }).click();
-    await newPage.getByText('ping', { exact: true }).click();
-    await newPage.getByText('No Environment').click();
-    await newPage.getByRole('tooltip').locator('div').filter({ hasText: 'Env' }).nth(3).click();
-    await newPage.locator('div').filter({ hasText: /^Env$/ }).nth(3).click();
-    await newPage.getByText('Configure', { exact: true }).click();
-    await expect(newPage.getByRole('row', { name: 'persistent-env-test' }).getByRole('cell').nth(3)).toBeVisible();
-    await newPage.getByText('×').click();
-    await newPage.waitForTimeout(1000);
-    await newPage.close();
-  });
-});
diff --git a/e2e-tests/persistent-env-tests/002-env-test-without-persistence.spec.ts b/e2e-tests/persistent-env-tests/002-env-test-without-persistence.spec.ts
deleted file mode 100644
index 4be151bb0..000000000
--- a/e2e-tests/persistent-env-tests/002-env-test-without-persistence.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { test, expect } from '../../playwright';
-
-test.describe.serial('Persistent Environment Test', () => {
-  test.setTimeout(2 * 10 * 1000);
-
-  test('add env using script', async ({ pageWithUserData: page, restartApp }) => {
-    await page.locator('#sidebar-collection-name').click();
-    await page.getByText('ping2', { exact: true }).click();
-    await page.getByText('Env', { exact: true }).click();
-    await page.getByText('Stage', { exact: true }).click();
-    await page.locator('#send-request').getByRole('img').nth(2).click();
-    await page.waitForTimeout(1000);
-    await page
-      .locator('div')
-      .filter({ hasText: /^Stage$/ })
-      .nth(3)
-      .click();
-    await page.getByText('Configure', { exact: true }).click();
-    await expect(page.getByRole('row', { name: 'persistent-env-test' }).getByRole('cell').nth(3)).toBeVisible();
-    await page.getByText('×').click();
-
-    const newApp = await restartApp();
-    const newPage = await newApp.firstWindow();
-    await newPage.locator('#sidebar-collection-name').click();
-    await newPage.getByRole('button', { name: 'Save' }).click();
-    await newPage.getByText('ping2', { exact: true }).click();
-    await newPage.getByText('No Environment').click();
-    await newPage.getByText('Stage').click();
-    await newPage
-      .locator('div')
-      .filter({ hasText: /^Stage$/ })
-      .nth(3)
-      .click();
-    await newPage.getByText('Configure', { exact: true }).click();
-    await expect(newPage.getByRole('row', { name: 'persistent-env-test' }).getByRole('cell').nth(3)).not.toBeVisible();
-    await newPage.getByText('×').click();
-    await newPage.waitForTimeout(1000);
-    await newPage.close();
-  });
-});
diff --git a/e2e-tests/persistent-env-tests/collection/collection.bru b/e2e-tests/persistent-env-tests/collection/collection.bru
deleted file mode 100644
index e69de29bb..000000000
diff --git a/e2e-tests/persistent-env-tests/collection/environments/Env.bru b/e2e-tests/persistent-env-tests/collection/environments/Env.bru
deleted file mode 100644
index 909243fd2..000000000
--- a/e2e-tests/persistent-env-tests/collection/environments/Env.bru
+++ /dev/null
@@ -1,4 +0,0 @@
-vars {
-  host: https://testbench-sanity.usebruno.com
-  persistent-env-test: persistent-env-test-value
-}
diff --git a/e2e-tests/persistent-env-tests/init-user-data/preferences.json b/e2e-tests/persistent-env-tests/init-user-data/preferences.json
deleted file mode 100644
index f9c1fdc7e..000000000
--- a/e2e-tests/persistent-env-tests/init-user-data/preferences.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "maximized": true,
-    "lastOpenedCollections": [
-        "{{projectRoot}}/e2e-tests/persistent-env-tests/collection"
-    ]
-}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 72f396afd..3cc97d6bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32156,4 +32156,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js b/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
index a8246237c..52053179f 100644
--- a/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
+++ b/packages/bruno-app/src/components/Environments/EnvironmentSelector/index.js
@@ -18,7 +18,7 @@ const EnvironmentSelector = ({ collection }) => {
 
   const Icon = forwardRef((props, ref) => {
     return (
-      <div ref={ref} className="current-environment flex items-center justify-center pl-3 pr-2 py-1 select-none">
+      <div ref={ref} className="current-environment collection-environment flex items-center justify-center pl-3 pr-2 py-1 select-none">
         <p className="text-nowrap truncate max-w-32" title={activeEnvironment ? activeEnvironment.name : 'No Environment'}>{activeEnvironment ? activeEnvironment.name : 'No Environment'}</p>
         <IconCaretDown className="caret" size={14} strokeWidth={2} />
       </div>
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 d02cc494a..1050d68b6 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
@@ -173,7 +173,7 @@ const EnvironmentVariables = ({ environment, collection, setIsModified, original
   return (
     <StyledWrapper className="w-full mt-6 mb-6">
       <div className="h-[50vh] overflow-y-auto w-full">
-        <table>
+        <table className="environment-variables">
           <thead>
             <tr>
               <td className="text-center">Enabled</td>
diff --git a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSelector/index.js b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSelector/index.js
index b0042bcbf..77094e0d4 100644
--- a/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSelector/index.js
+++ b/packages/bruno-app/src/components/GlobalEnvironments/EnvironmentSelector/index.js
@@ -19,7 +19,7 @@ const EnvironmentSelector = () => {
 
   const Icon = forwardRef((props, ref) => {
     return (
-        <div ref={ref} className={`current-environment flex flex-row gap-1 rounded-xl text-xs cursor-pointer items-center justify-center select-none ${activeGlobalEnvironmentUid? 'environment-active': ''}`}>
+        <div ref={ref} className={`current-environment global-environment flex flex-row gap-1 rounded-xl text-xs cursor-pointer items-center justify-center select-none ${activeGlobalEnvironmentUid? 'environment-active': ''}`}>
           <ToolHint text="Global Environments" toolhintId="GlobalEnvironmentsToolhintId" className='flex flex-row'>
             <IconWorld className="globe" size={16} strokeWidth={1.5} />
             {
diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
index 2eb6dc375..30c4036f1 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
@@ -112,6 +112,7 @@ const QueryUrl = ({ item, collection, handleRun }) => {
         />
         <div className="flex items-center h-full mr-2 cursor-pointer" id="send-request" onClick={handleRun}>
           <div
+            title="Generate Code"
             className="infotip mr-3"
             onClick={(e) => {
               handleGenerateCode(e);
@@ -128,6 +129,7 @@ const QueryUrl = ({ item, collection, handleRun }) => {
             </span>
           </div>
           <div
+            title="Save Request"
             className="infotip mr-3"
             onClick={(e) => {
               e.stopPropagation();
diff --git a/playwright.config.ts b/playwright.config.ts
index df01a2ec8..b47ff84f0 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -7,7 +7,7 @@ if (process.env.CI) {
 }
 
 export default defineConfig({
-  testDir: './e2e-tests',
+  testDir: './tests',
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 1 : 0,
diff --git a/playwright/codegen.ts b/playwright/codegen.ts
index da2bfcb1f..ea637ade3 100644
--- a/playwright/codegen.ts
+++ b/playwright/codegen.ts
@@ -5,7 +5,7 @@ async function main() {
   const { app, context } = await startApp();
   let outputFile = process.argv[2]?.trim();
   if (outputFile && !/\.(ts|js)$/.test(outputFile)) {
-    outputFile = path.join(__dirname, '../e2e-tests/', outputFile + '.spec.ts');
+    outputFile = path.join(__dirname, '../tests/', outputFile + '.spec.ts');
   }
   await context._enableRecorder({ language: 'playwright-test', mode: 'recording', outputFile });
 }
diff --git a/e2e-tests/001-sanity-tests/002-create-new-collection-and-new-request.spec.ts b/tests/collection/create/create-collection.spec.ts
similarity index 66%
rename from e2e-tests/001-sanity-tests/002-create-new-collection-and-new-request.spec.ts
rename to tests/collection/create/create-collection.spec.ts
index 705a2bc3b..eec604ea1 100644
--- a/e2e-tests/001-sanity-tests/002-create-new-collection-and-new-request.spec.ts
+++ b/tests/collection/create/create-collection.spec.ts
@@ -1,6 +1,7 @@
-import { test, expect } from '../../playwright';
+import { test, expect } from '../../../playwright';
 
-test('Create new collection and add a simple HTTP request', async ({ page, createTmpDir }) => {
+test('Create collection and add a simple HTTP request', async ({ page, createTmpDir }) => {
+  // Create a new collection
   await page.getByLabel('Create Collection').click();
   await page.getByLabel('Name').click();
   await page.getByLabel('Name').fill('test-collection');
@@ -8,24 +9,24 @@ test('Create new collection and add a simple HTTP request', async ({ page, creat
   await page.getByLabel('Location').fill(await createTmpDir('test-collection'));
   await page.getByRole('button', { name: 'Create', exact: true }).click();
   await page.getByText('test-collection').click();
+
+  // Select safe mode
   await page.getByLabel('Safe Mode').check();
   await page.getByRole('button', { name: 'Save' }).click();
+
+  // Create a new request
   await page.locator('#create-new-tab').getByRole('img').click();
   await page.getByPlaceholder('Request Name').fill('r1');
   await page.locator('#new-request-url .CodeMirror').click();
   await page.locator('textarea').fill('http://localhost:8081');
   await page.getByRole('button', { name: 'Create' }).click();
+
+  // Send a request
   await page.locator('#request-url .CodeMirror').click();
   await page.locator('textarea').fill('/ping');
+  await page.locator('#send-request').getByTitle('Save Request').click();
   await page.locator('#send-request').getByRole('img').nth(2).click();
 
-  await expect(page.getByRole('main')).toContainText('200 OK');
-
-  await page.getByRole('tab', { name: 'GET r1' }).locator('circle').click();
-  await page.getByRole('button', { name: 'Save', exact: true }).click();
-  await page.getByText('GETr1').click();
-  await page.getByRole('button', { name: 'Clear response' }).click();
-  await page.locator('body').press('ControlOrMeta+Enter');
-
+  // Verify the response
   await expect(page.getByRole('main')).toContainText('200 OK');
 });
\ No newline at end of file
diff --git a/e2e-tests/002-cookies-tests/001-cookie-persistence.spec.ts b/tests/cookies/cookie-persistence.spec.ts
similarity index 100%
rename from e2e-tests/002-cookies-tests/001-cookie-persistence.spec.ts
rename to tests/cookies/cookie-persistence.spec.ts
diff --git a/e2e-tests/002-cookies-tests/002-corrupted-passkey.spec.ts b/tests/cookies/corrupted-passkey.spec.ts
similarity index 100%
rename from e2e-tests/002-cookies-tests/002-corrupted-passkey.spec.ts
rename to tests/cookies/corrupted-passkey.spec.ts
diff --git a/tests/environments/api-setEnvVar/api-setEnvVar-with-persist.spec.ts b/tests/environments/api-setEnvVar/api-setEnvVar-with-persist.spec.ts
new file mode 100644
index 000000000..6a4a14e7e
--- /dev/null
+++ b/tests/environments/api-setEnvVar/api-setEnvVar-with-persist.spec.ts
@@ -0,0 +1,57 @@
+import { test, expect } from '../../../playwright';
+import fs from 'fs';
+import path from 'path';
+
+test.describe.serial('bru.setEnvVar(name, value, { persist: true })', () => {
+  test.setTimeout(2 * 10 * 1000);
+
+  test('set env var with persist using script', async ({ pageWithUserData: page, restartApp }) => {
+    // Keep a copy of the original Stage.bru file
+    const originalStageBruPath = path.join(__dirname, 'collection/environments/Stage.bru');
+    const originalStageBruContent = fs.readFileSync(originalStageBruPath, 'utf8');
+
+    // Select the collection and request
+    await page.locator('#sidebar-collection-name').click();
+    await page.getByText('api-setEnvVar-with-persist', { exact: true }).click();
+
+    // open environment dropdown
+    await page.locator('div.current-environment.collection-environment').click();
+
+    // select stage environment
+    await expect(page.locator('.dropdown-item').filter({ hasText: 'Stage' })).toBeVisible();
+    await page.locator('.dropdown-item').filter({ hasText: 'Stage' }).click();
+    await expect(page.locator('.current-environment').filter({ hasText: /Stage/ })).toBeVisible();
+
+    // Send the request
+    await page.locator('#send-request').getByRole('img').nth(2).click();
+    await page.waitForTimeout(1000);
+
+    // confirm that the environment variable is set
+    await page.getByTitle('Stage', { exact: true }).click();
+    await page.getByText('Configure', { exact: true }).click();
+    await expect(page.getByRole('row', { name: 'token' }).getByRole('cell').nth(1)).toBeVisible();
+    await expect(page.getByRole('row', { name: 'secret' }).getByRole('cell').nth(2)).toBeVisible();
+    await page.getByText('×').click();
+
+    // we restart the app to confirm that the environment variable is persisted
+    const newApp = await restartApp();
+    const newPage = await newApp.firstWindow();
+
+    // select the collection and request
+    await newPage.locator('#sidebar-collection-name').click();
+    await newPage.getByText('api-setEnvVar-with-persist', { exact: true }).click();
+
+    // open environment dropdown
+    await newPage.locator('div.current-environment.collection-environment').click();
+    await newPage.getByText('Configure', { exact: true }).click();
+    await expect(newPage.getByRole('row', { name: 'token' }).getByRole('cell').nth(1)).toBeVisible();
+    await expect(newPage.getByRole('row', { name: 'secret' }).getByRole('cell').nth(2)).toBeVisible();
+
+    // close the environment modal
+    await newPage.getByText('×').click();
+
+    // Restore the original Stage.bru file
+    fs.writeFileSync(originalStageBruPath, originalStageBruContent);
+    await newPage.close();
+  });
+});
diff --git a/tests/environments/api-setEnvVar/api-setEnvVar-without-persist.spec.ts b/tests/environments/api-setEnvVar/api-setEnvVar-without-persist.spec.ts
new file mode 100644
index 000000000..b01530c60
--- /dev/null
+++ b/tests/environments/api-setEnvVar/api-setEnvVar-without-persist.spec.ts
@@ -0,0 +1,49 @@
+import { test, expect } from '../../../playwright';
+
+test.describe.serial('bru.setEnvVar(name, value)', () => {
+  test.setTimeout(2 * 10 * 1000);
+
+  test('set env var using script', async ({ pageWithUserData: page, restartApp }) => {
+    // Select the collection and request
+    await page.locator('#sidebar-collection-name').click();
+    await page.getByText('api-setEnvVar-without-persist', { exact: true }).click();
+
+    // open environment dropdown
+    await page.locator('div.current-environment.collection-environment').click();
+
+    // select stage environment
+    await expect(page.locator('.dropdown-item').filter({ hasText: 'Stage' })).toBeVisible();
+    await page.locator('.dropdown-item').filter({ hasText: 'Stage' }).click();
+    await expect(page.locator('.current-environment').filter({ hasText: /Stage/ })).toBeVisible();
+
+    // Send the request
+    await page.locator('#send-request').getByRole('img').nth(2).click();
+    await page.waitForTimeout(1000);
+
+    // confirm that the environment variable is set
+    await page.getByTitle('Stage', { exact: true }).click();
+    await page.getByText('Configure', { exact: true }).click();
+    await expect(page.getByRole('row', { name: 'token' }).getByRole('cell').nth(1)).toBeVisible();
+    await expect(page.getByRole('row', { name: 'secret' }).getByRole('cell').nth(2)).toBeVisible();
+    await page.getByText('×').click();
+
+    // we restart the app to confirm that the environment variable is not persisted
+    const newApp = await restartApp();
+    const newPage = await newApp.firstWindow();
+
+    // select the collection and request
+    await newPage.locator('#sidebar-collection-name').click();
+    await newPage.getByText('api-setEnvVar-without-persist', { exact: true }).click();
+
+    // open environment dropdown
+    await newPage.locator('div.current-environment.collection-environment').click();
+    await newPage.getByText('Configure', { exact: true }).click();
+
+    // ensure that the environment variable is not persisted
+    await expect(newPage.locator('table.environment-variables tbody')).not.toContainText('token');
+
+    // close the environment variable modal
+    await newPage.getByText('×').click();
+    await newPage.close();
+  });
+});
diff --git a/e2e-tests/persistent-env-tests/collection/request.bru b/tests/environments/api-setEnvVar/collection/api-setEnvVar-with-persist.bru
similarity index 52%
rename from e2e-tests/persistent-env-tests/collection/request.bru
rename to tests/environments/api-setEnvVar/collection/api-setEnvVar-with-persist.bru
index 9ae6899c5..f56119ae9 100644
--- a/e2e-tests/persistent-env-tests/collection/request.bru
+++ b/tests/environments/api-setEnvVar/collection/api-setEnvVar-with-persist.bru
@@ -1,5 +1,5 @@
 meta {
-  name: ping
+  name: api-setEnvVar-with-persist
   type: http
   seq: 1
 }
@@ -11,5 +11,5 @@ get {
 }
 
 script:pre-request {
-  bru.setEnvVar("persistent-env-test", "persistent-env-test-value", { persist: true });
+  bru.setEnvVar("token", "secret", { persist: true });
 }
\ No newline at end of file
diff --git a/e2e-tests/persistent-env-tests/collection/persist-env-request.bru b/tests/environments/api-setEnvVar/collection/api-setEnvVar-without-persist.bru
similarity index 56%
rename from e2e-tests/persistent-env-tests/collection/persist-env-request.bru
rename to tests/environments/api-setEnvVar/collection/api-setEnvVar-without-persist.bru
index eefb4e827..791788bc3 100644
--- a/e2e-tests/persistent-env-tests/collection/persist-env-request.bru
+++ b/tests/environments/api-setEnvVar/collection/api-setEnvVar-without-persist.bru
@@ -1,5 +1,5 @@
 meta {
-  name: ping2
+  name: api-setEnvVar-without-persist
   type: http
   seq: 1
 }
@@ -11,5 +11,5 @@ get {
 }
 
 script:pre-request {
-  bru.setEnvVar("persistent-env-test", "persistent-env-test-value");
+  bru.setEnvVar("token", "secret");
 }
\ No newline at end of file
diff --git a/e2e-tests/persistent-env-tests/collection/bruno.json b/tests/environments/api-setEnvVar/collection/bruno.json
similarity index 100%
rename from e2e-tests/persistent-env-tests/collection/bruno.json
rename to tests/environments/api-setEnvVar/collection/bruno.json
diff --git a/e2e-tests/persistent-env-tests/collection/environments/Stage.bru b/tests/environments/api-setEnvVar/collection/environments/Stage.bru
similarity index 74%
rename from e2e-tests/persistent-env-tests/collection/environments/Stage.bru
rename to tests/environments/api-setEnvVar/collection/environments/Stage.bru
index 0b756aa68..ae0638c82 100644
--- a/e2e-tests/persistent-env-tests/collection/environments/Stage.bru
+++ b/tests/environments/api-setEnvVar/collection/environments/Stage.bru
@@ -1,3 +1,4 @@
 vars {
   host: https://testbench-sanity.usebruno.com
-}
\ No newline at end of file
+  token: secret
+}
diff --git a/tests/environments/api-setEnvVar/init-user-data/collection-security.json b/tests/environments/api-setEnvVar/init-user-data/collection-security.json
new file mode 100644
index 000000000..3f0f629ab
--- /dev/null
+++ b/tests/environments/api-setEnvVar/init-user-data/collection-security.json
@@ -0,0 +1,10 @@
+{
+  "collections": [
+    {
+      "path": "{{projectRoot}}/tests/environments/api-setEnvVar/collection",
+      "securityConfig": {
+        "jsSandboxMode": "safe"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/environments/api-setEnvVar/init-user-data/preferences.json b/tests/environments/api-setEnvVar/init-user-data/preferences.json
new file mode 100644
index 000000000..f0cadbbaf
--- /dev/null
+++ b/tests/environments/api-setEnvVar/init-user-data/preferences.json
@@ -0,0 +1,6 @@
+{
+    "maximized": true,
+    "lastOpenedCollections": [
+        "{{projectRoot}}/tests/environments/api-setEnvVar/collection"
+    ]
+}
\ No newline at end of file
diff --git a/e2e-tests/environments/multiline-variables/collection/bruno.json b/tests/environments/multiline-variables/collection/bruno.json
similarity index 100%
rename from e2e-tests/environments/multiline-variables/collection/bruno.json
rename to tests/environments/multiline-variables/collection/bruno.json
diff --git a/e2e-tests/environments/multiline-variables/collection/collection.bru b/tests/environments/multiline-variables/collection/collection.bru
similarity index 100%
rename from e2e-tests/environments/multiline-variables/collection/collection.bru
rename to tests/environments/multiline-variables/collection/collection.bru
diff --git a/e2e-tests/environments/multiline-variables/collection/environments/Test.bru b/tests/environments/multiline-variables/collection/environments/Test.bru
similarity index 100%
rename from e2e-tests/environments/multiline-variables/collection/environments/Test.bru
rename to tests/environments/multiline-variables/collection/environments/Test.bru
diff --git a/e2e-tests/environments/multiline-variables/collection/multiline-test.bru b/tests/environments/multiline-variables/collection/multiline-test.bru
similarity index 100%
rename from e2e-tests/environments/multiline-variables/collection/multiline-test.bru
rename to tests/environments/multiline-variables/collection/multiline-test.bru
diff --git a/e2e-tests/environments/multiline-variables/collection/request.bru b/tests/environments/multiline-variables/collection/request.bru
similarity index 100%
rename from e2e-tests/environments/multiline-variables/collection/request.bru
rename to tests/environments/multiline-variables/collection/request.bru
diff --git a/e2e-tests/environments/multiline-variables/init-user-data/collection-security.json b/tests/environments/multiline-variables/init-user-data/collection-security.json
similarity index 55%
rename from e2e-tests/environments/multiline-variables/init-user-data/collection-security.json
rename to tests/environments/multiline-variables/init-user-data/collection-security.json
index 5f51bd286..efd06298b 100644
--- a/e2e-tests/environments/multiline-variables/init-user-data/collection-security.json
+++ b/tests/environments/multiline-variables/init-user-data/collection-security.json
@@ -1,7 +1,7 @@
 {
   "collections": [
     {
-      "path": "{{projectRoot}}/e2e-tests/environments/multiline-variables/collection",
+      "path": "{{projectRoot}}/tests/environments/multiline-variables/collection",
       "securityConfig": {
         "jsSandboxMode": "developer"
       }
diff --git a/e2e-tests/environments/multiline-variables/init-user-data/preferences.json b/tests/environments/multiline-variables/init-user-data/preferences.json
similarity index 85%
rename from e2e-tests/environments/multiline-variables/init-user-data/preferences.json
rename to tests/environments/multiline-variables/init-user-data/preferences.json
index 9374c16fd..3b162fb3e 100644
--- a/e2e-tests/environments/multiline-variables/init-user-data/preferences.json
+++ b/tests/environments/multiline-variables/init-user-data/preferences.json
@@ -1,7 +1,7 @@
 {
   "maximized": true,
   "lastOpenedCollections": [
-    "{{projectRoot}}/e2e-tests/environments/multiline-variables/collection"
+    "{{projectRoot}}/tests/environments/multiline-variables/collection"
   ],
   "request": {
     "sslVerification": false,
diff --git a/e2e-tests/environments/multiline-variables/read-multiline-environment.spec.ts b/tests/environments/multiline-variables/read-multiline-environment.spec.ts
similarity index 92%
rename from e2e-tests/environments/multiline-variables/read-multiline-environment.spec.ts
rename to tests/environments/multiline-variables/read-multiline-environment.spec.ts
index 0e0856816..9deb5bcfa 100644
--- a/e2e-tests/environments/multiline-variables/read-multiline-environment.spec.ts
+++ b/tests/environments/multiline-variables/read-multiline-environment.spec.ts
@@ -13,8 +13,7 @@ test.describe('Multiline Variables - Read Environment Test', () => {
     await page.getByTitle('request', { exact: true }).click();
 
     // open environment dropdown
-    await expect(page.getByTitle('No Environment')).toBeVisible();
-    await page.getByTitle('No Environment').click();
+    await page.locator('div.current-environment.collection-environment').click();
 
     // select test environment
     await expect(page.locator('.dropdown-item').filter({ hasText: 'Test' })).toBeVisible();
diff --git a/e2e-tests/environments/multiline-variables/write-multiline-variable.spec.ts b/tests/environments/multiline-variables/write-multiline-variable.spec.ts
similarity index 96%
rename from e2e-tests/environments/multiline-variables/write-multiline-variable.spec.ts
rename to tests/environments/multiline-variables/write-multiline-variable.spec.ts
index f2aff96fe..280eda40d 100644
--- a/e2e-tests/environments/multiline-variables/write-multiline-variable.spec.ts
+++ b/tests/environments/multiline-variables/write-multiline-variable.spec.ts
@@ -13,8 +13,7 @@ test.describe('Multiline Variables - Write Test', () => {
     await page.getByTitle('multiline-test', { exact: true }).click();
 
     // open environment dropdown
-    await expect(page.getByTitle('No Environment')).toBeVisible();
-    await page.getByTitle('No Environment').click();
+    await page.locator('div.current-environment.collection-environment').click();
 
     // select test environment
     await expect(page.locator('.dropdown-item').filter({ hasText: 'Test' })).toBeVisible();
@@ -34,7 +33,6 @@ test.describe('Multiline Variables - Write Test', () => {
     const valueTextarea = page.locator('.bruno-modal-card textarea').last();
     await expect(valueTextarea).toBeVisible();
 
-
     const jsonValue = `{
   "user": {
     "name": "John Doe",
diff --git a/e2e-tests/footer/notifications/notifications.spec.js b/tests/footer/notifications/notifications.spec.js
similarity index 100%
rename from e2e-tests/footer/notifications/notifications.spec.js
rename to tests/footer/notifications/notifications.spec.js
diff --git a/e2e-tests/footer/sidebar-toggle/sidebar-toggle.spec.js b/tests/footer/sidebar-toggle/sidebar-toggle.spec.js
similarity index 100%
rename from e2e-tests/footer/sidebar-toggle/sidebar-toggle.spec.js
rename to tests/footer/sidebar-toggle/sidebar-toggle.spec.js
diff --git a/e2e-tests/import-tests/bruno/001-import-bruno-testbench.spec.ts b/tests/import/bruno/001-import-bruno-testbench.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/bruno/001-import-bruno-testbench.spec.ts
rename to tests/import/bruno/001-import-bruno-testbench.spec.ts
diff --git a/e2e-tests/import-tests/bruno/002-import-bruno-corrupted-fails.spec.ts b/tests/import/bruno/002-import-bruno-corrupted-fails.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/bruno/002-import-bruno-corrupted-fails.spec.ts
rename to tests/import/bruno/002-import-bruno-corrupted-fails.spec.ts
diff --git a/e2e-tests/import-tests/bruno/003-import-bruno-missing-required-schema.spec.ts b/tests/import/bruno/003-import-bruno-missing-required-schema.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/bruno/003-import-bruno-missing-required-schema.spec.ts
rename to tests/import/bruno/003-import-bruno-missing-required-schema.spec.ts
diff --git a/e2e-tests/import-tests/file-types/001-file-input-acceptance.spec.ts b/tests/import/file-types/001-file-input-acceptance.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/file-types/001-file-input-acceptance.spec.ts
rename to tests/import/file-types/001-file-input-acceptance.spec.ts
diff --git a/e2e-tests/import-tests/file-types/002-invalid-file-handling.spec.ts b/tests/import/file-types/002-invalid-file-handling.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/file-types/002-invalid-file-handling.spec.ts
rename to tests/import/file-types/002-invalid-file-handling.spec.ts
diff --git a/e2e-tests/import-tests/insomnia/001-import-insomnia-v4.spec.ts b/tests/import/insomnia/001-import-insomnia-v4.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/insomnia/001-import-insomnia-v4.spec.ts
rename to tests/import/insomnia/001-import-insomnia-v4.spec.ts
diff --git a/e2e-tests/import-tests/insomnia/002-import-insomnia-v5.spec.ts b/tests/import/insomnia/002-import-insomnia-v5.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/insomnia/002-import-insomnia-v5.spec.ts
rename to tests/import/insomnia/002-import-insomnia-v5.spec.ts
diff --git a/e2e-tests/import-tests/insomnia/003-invalid-missing-collection.spec.ts b/tests/import/insomnia/003-invalid-missing-collection.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/insomnia/003-invalid-missing-collection.spec.ts
rename to tests/import/insomnia/003-invalid-missing-collection.spec.ts
diff --git a/e2e-tests/import-tests/insomnia/004-malformed-structure.spec.ts b/tests/import/insomnia/004-malformed-structure.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/insomnia/004-malformed-structure.spec.ts
rename to tests/import/insomnia/004-malformed-structure.spec.ts
diff --git a/e2e-tests/import-tests/openapi/001-import-openapi-yaml.spec.ts b/tests/import/openapi/001-import-openapi-yaml.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/openapi/001-import-openapi-yaml.spec.ts
rename to tests/import/openapi/001-import-openapi-yaml.spec.ts
diff --git a/e2e-tests/import-tests/openapi/002-import-openapi-json.spec.ts b/tests/import/openapi/002-import-openapi-json.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/openapi/002-import-openapi-json.spec.ts
rename to tests/import/openapi/002-import-openapi-json.spec.ts
diff --git a/e2e-tests/import-tests/openapi/003-missing-info.spec.ts b/tests/import/openapi/003-missing-info.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/openapi/003-missing-info.spec.ts
rename to tests/import/openapi/003-missing-info.spec.ts
diff --git a/e2e-tests/import-tests/openapi/004-malformed-yaml.spec.ts b/tests/import/openapi/004-malformed-yaml.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/openapi/004-malformed-yaml.spec.ts
rename to tests/import/openapi/004-malformed-yaml.spec.ts
diff --git a/e2e-tests/import-tests/postman/001-import-postman-v21.spec.ts b/tests/import/postman/001-import-postman-v21.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/postman/001-import-postman-v21.spec.ts
rename to tests/import/postman/001-import-postman-v21.spec.ts
diff --git a/e2e-tests/import-tests/postman/002-import-postman-v20.spec.ts b/tests/import/postman/002-import-postman-v20.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/postman/002-import-postman-v20.spec.ts
rename to tests/import/postman/002-import-postman-v20.spec.ts
diff --git a/e2e-tests/import-tests/postman/003-invalid-missing-info.spec.ts b/tests/import/postman/003-invalid-missing-info.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/postman/003-invalid-missing-info.spec.ts
rename to tests/import/postman/003-invalid-missing-info.spec.ts
diff --git a/e2e-tests/import-tests/postman/004-invalid-schema.spec.ts b/tests/import/postman/004-invalid-schema.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/postman/004-invalid-schema.spec.ts
rename to tests/import/postman/004-invalid-schema.spec.ts
diff --git a/e2e-tests/import-tests/postman/005-malformed-structure.spec.ts b/tests/import/postman/005-malformed-structure.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/postman/005-malformed-structure.spec.ts
rename to tests/import/postman/005-malformed-structure.spec.ts
diff --git a/e2e-tests/import-tests/postman/006-invalid-json.spec.ts b/tests/import/postman/006-invalid-json.spec.ts
similarity index 100%
rename from e2e-tests/import-tests/postman/006-invalid-json.spec.ts
rename to tests/import/postman/006-invalid-json.spec.ts
diff --git a/e2e-tests/import-tests/test-data/bruno-invalid-corrupted.json b/tests/import/test-data/bruno-invalid-corrupted.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/bruno-invalid-corrupted.json
rename to tests/import/test-data/bruno-invalid-corrupted.json
diff --git a/e2e-tests/import-tests/test-data/bruno-malformed.json b/tests/import/test-data/bruno-malformed.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/bruno-malformed.json
rename to tests/import/test-data/bruno-malformed.json
diff --git a/e2e-tests/import-tests/test-data/bruno-missing-required-fields.json b/tests/import/test-data/bruno-missing-required-fields.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/bruno-missing-required-fields.json
rename to tests/import/test-data/bruno-missing-required-fields.json
diff --git a/e2e-tests/import-tests/test-data/bruno-testbench.json b/tests/import/test-data/bruno-testbench.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/bruno-testbench.json
rename to tests/import/test-data/bruno-testbench.json
diff --git a/e2e-tests/import-tests/test-data/empty-file.json b/tests/import/test-data/empty-file.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/empty-file.json
rename to tests/import/test-data/empty-file.json
diff --git a/e2e-tests/import-tests/test-data/insomnia-malformed.json b/tests/import/test-data/insomnia-malformed.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/insomnia-malformed.json
rename to tests/import/test-data/insomnia-malformed.json
diff --git a/e2e-tests/import-tests/test-data/insomnia-v4.json b/tests/import/test-data/insomnia-v4.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/insomnia-v4.json
rename to tests/import/test-data/insomnia-v4.json
diff --git a/e2e-tests/import-tests/test-data/insomnia-v5-invalid-missing-collection.yaml b/tests/import/test-data/insomnia-v5-invalid-missing-collection.yaml
similarity index 100%
rename from e2e-tests/import-tests/test-data/insomnia-v5-invalid-missing-collection.yaml
rename to tests/import/test-data/insomnia-v5-invalid-missing-collection.yaml
diff --git a/e2e-tests/import-tests/test-data/insomnia-v5.yaml b/tests/import/test-data/insomnia-v5.yaml
similarity index 100%
rename from e2e-tests/import-tests/test-data/insomnia-v5.yaml
rename to tests/import/test-data/insomnia-v5.yaml
diff --git a/e2e-tests/import-tests/test-data/invalid-json.json b/tests/import/test-data/invalid-json.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/invalid-json.json
rename to tests/import/test-data/invalid-json.json
diff --git a/e2e-tests/import-tests/test-data/invalid.txt b/tests/import/test-data/invalid.txt
similarity index 100%
rename from e2e-tests/import-tests/test-data/invalid.txt
rename to tests/import/test-data/invalid.txt
diff --git a/e2e-tests/import-tests/test-data/openapi-comprehensive.yaml b/tests/import/test-data/openapi-comprehensive.yaml
similarity index 100%
rename from e2e-tests/import-tests/test-data/openapi-comprehensive.yaml
rename to tests/import/test-data/openapi-comprehensive.yaml
diff --git a/e2e-tests/import-tests/test-data/openapi-invalid-version.yaml b/tests/import/test-data/openapi-invalid-version.yaml
similarity index 100%
rename from e2e-tests/import-tests/test-data/openapi-invalid-version.yaml
rename to tests/import/test-data/openapi-invalid-version.yaml
diff --git a/e2e-tests/import-tests/test-data/openapi-malformed.yaml b/tests/import/test-data/openapi-malformed.yaml
similarity index 100%
rename from e2e-tests/import-tests/test-data/openapi-malformed.yaml
rename to tests/import/test-data/openapi-malformed.yaml
diff --git a/e2e-tests/import-tests/test-data/openapi-missing-info.yaml b/tests/import/test-data/openapi-missing-info.yaml
similarity index 100%
rename from e2e-tests/import-tests/test-data/openapi-missing-info.yaml
rename to tests/import/test-data/openapi-missing-info.yaml
diff --git a/e2e-tests/import-tests/test-data/openapi-simple.json b/tests/import/test-data/openapi-simple.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/openapi-simple.json
rename to tests/import/test-data/openapi-simple.json
diff --git a/e2e-tests/import-tests/test-data/postman-invalid-missing-info.json b/tests/import/test-data/postman-invalid-missing-info.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/postman-invalid-missing-info.json
rename to tests/import/test-data/postman-invalid-missing-info.json
diff --git a/e2e-tests/import-tests/test-data/postman-invalid-schema.json b/tests/import/test-data/postman-invalid-schema.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/postman-invalid-schema.json
rename to tests/import/test-data/postman-invalid-schema.json
diff --git a/e2e-tests/import-tests/test-data/postman-malformed.json b/tests/import/test-data/postman-malformed.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/postman-malformed.json
rename to tests/import/test-data/postman-malformed.json
diff --git a/e2e-tests/import-tests/test-data/postman-v20.json b/tests/import/test-data/postman-v20.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/postman-v20.json
rename to tests/import/test-data/postman-v20.json
diff --git a/e2e-tests/import-tests/test-data/postman-v21.json b/tests/import/test-data/postman-v21.json
similarity index 100%
rename from e2e-tests/import-tests/test-data/postman-v21.json
rename to tests/import/test-data/postman-v21.json
diff --git a/e2e-tests/preferences/verify-support-links-in-preferences.spec.js b/tests/preferences/support-links.spec.js
similarity index 94%
rename from e2e-tests/preferences/verify-support-links-in-preferences.spec.js
rename to tests/preferences/support-links.spec.js
index 5f12a866c..623bc1c61 100644
--- a/e2e-tests/preferences/verify-support-links-in-preferences.spec.js
+++ b/tests/preferences/support-links.spec.js
@@ -1,13 +1,13 @@
 import { test, expect } from '../../playwright';
 
 test('Should verify all support links with correct URL in preference > Support tab', async ({ page }) => {
-
    // Open Preferences
    await page.getByLabel('Open Preferences').click();
    
-   // Verify Support tab
+   // Go to Support tab
    await page.getByRole('tab', { name: 'Support' }).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');
 
@@ -22,6 +22,4 @@ test('Should verify all support links with correct URL in preference > Support t
 
    const locator_documentation = page.getByRole('link', { name: 'Documentation', exact: true });
    expect(await locator_documentation.getAttribute('href')).toEqual('https://docs.usebruno.com');
-
-  
 });
\ No newline at end of file
diff --git a/e2e-tests/bruno-testbench/run-testbench-requests.spec.ts b/tests/runner/collection-run.ts
similarity index 97%
rename from e2e-tests/bruno-testbench/run-testbench-requests.spec.ts
rename to tests/runner/collection-run.ts
index 874c9f276..d683712de 100644
--- a/e2e-tests/bruno-testbench/run-testbench-requests.spec.ts
+++ b/tests/runner/collection-run.ts
@@ -1,6 +1,6 @@
 import { test, expect } from '../../playwright';
 
-test.describe.parallel('Run Testbench Requests', () => {
+test.describe.parallel('Collection Run', () => {
   test('Run bruno-testbench in Developer Mode', async ({ pageWithUserData: page }) => {
     test.setTimeout(2 * 60 * 1000);
 
diff --git a/e2e-tests/bruno-testbench/init-user-data/preferences.json b/tests/runner/init-user-data/preferences.json
similarity index 100%
rename from e2e-tests/bruno-testbench/init-user-data/preferences.json
rename to tests/runner/init-user-data/preferences.json
diff --git a/e2e-tests/001-sanity-tests/001-home-screen.spec.ts b/tests/start/app-open.spec.ts
similarity index 100%
rename from e2e-tests/001-sanity-tests/001-home-screen.spec.ts
rename to tests/start/app-open.spec.ts

From 1bc7a1f65584544026313f75ba22225ec16ef49f Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Sun, 7 Sep 2025 21:49:11 +0530
Subject: [PATCH 06/18] Modify body size test to check for > 1MB

---
 packages/bruno-tests/collection/scripting/api/res/getSize.bru | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/bruno-tests/collection/scripting/api/res/getSize.bru b/packages/bruno-tests/collection/scripting/api/res/getSize.bru
index 2d727ea07..3856f18eb 100644
--- a/packages/bruno-tests/collection/scripting/api/res/getSize.bru
+++ b/packages/bruno-tests/collection/scripting/api/res/getSize.bru
@@ -21,7 +21,8 @@ script:post-response {
 tests {
   test("test body size", function() {
     const bodySize = res.getSize().body;
-    expect(bodySize === 1048934).to.be.true;
+    // 1MB = 1024*1024 = 1048576
+    expect(bodySize > 1048576).to.be.true;
   });
   
   test("test header size", function() {

From 3c656270b38bbd61d034e8d137ec3b3bc26037d4 Mon Sep 17 00:00:00 2001
From: lohit <lohit@usebruno.com>
Date: Sun, 7 Sep 2025 23:06:44 +0530
Subject: [PATCH 07/18] ca certs fixes and tests (#5429)

Co-authored-by: Anoop M D <anoop.md1421@gmail.com>
---
 .../actions/common/setup-node-deps/action.yml |  26 ++
 .../linux/run-basic-ssl-cli-tests/action.yml  |  36 +++
 .../run-custom-ca-certs-cli-tests/action.yml  |  33 +++
 .../ssl/linux/run-ssl-e2e-tests/action.yml    |  19 ++
 .../ssl/linux/setup-ca-certs/action.yml       |  26 ++
 .../setup-feature-specific-deps/action.yml    |  14 ++
 .../macos/run-basic-ssl-cli-tests/action.yml  |  36 +++
 .../run-custom-ca-certs-cli-tests/action.yml  |  33 +++
 .../ssl/macos/run-ssl-e2e-tests/action.yml    |  17 ++
 .../ssl/macos/setup-ca-certs/action.yml       |  26 ++
 .../setup-feature-specific-deps/action.yml    |   9 +
 .../run-basic-ssl-cli-tests/action.yml        |  50 ++++
 .../run-custom-ca-certs-cli-tests/action.yml  |  47 ++++
 .../ssl/windows/run-ssl-e2e-tests/action.yml  |  17 ++
 .../ssl/windows/setup-ca-certs/action.yml     |  25 ++
 .github/workflows/ssl-tests.yml               |  91 +++++++
 package.json                                  |   3 +-
 .../src/runner/run-single-request.js          |  21 +-
 .../src/ipc/network/cert-utils.js             |  35 ++-
 .../src/store/last-opened-collections.js      |   5 +-
 .../bruno-electron/src/utils/proxy-util.js    |  34 +--
 packages/bruno-requests/src/index.ts          |   2 +-
 .../bruno-requests/src/network/ca-cert.ts     | 165 +++++++++++++
 packages/bruno-requests/src/network/index.ts  |   4 +-
 packages/bruno-tests/.nvmrc                   |   2 +-
 playwright.config.ts                          |  13 +-
 playwright/electron.ts                        |   4 +-
 playwright/index.ts                           |   2 +-
 .../basic-ssl/collections/badssl/bruno.json   |   6 +
 .../basic-ssl/collections/badssl/package.json |   5 +
 .../basic-ssl/collections/badssl/request.bru  |  15 ++
 .../collections/self-signed-badssl/bruno.json |   6 +
 .../self-signed-badssl/package.json           |   5 +
 .../self-signed-badssl/request.bru            |  15 ++
 .../basic-ssl-success.spec.ts                 |  59 +++++
 .../init-user-data/preferences.json           |  16 ++
 .../init-user-data/preferences.json           |  16 ++
 .../self-signed-rejected.spec.ts              |  59 +++++
 .../init-user-data/preferences.json           |  16 ++
 ...d-success-with-validation-disabled.spec.ts |  59 +++++
 .../ssl/custom-ca-certs/collection/bruno.json |   6 +
 .../custom-ca-certs/collection/package.json   |   5 +
 .../custom-ca-certs/collection/request.bru    |  16 ++
 tests/ssl/custom-ca-certs/server/.gitignore   |   1 +
 .../custom-ca-certs/server/helpers/certs.js   | 225 ++++++++++++++++++
 .../server/helpers/platform.js                |  60 +++++
 tests/ssl/custom-ca-certs/server/index.js     |  74 ++++++
 tests/ssl/custom-ca-certs/server/readme.md    | 106 +++++++++
 .../server/scripts/generate-certs.js          |  46 ++++
 ...id-ca-cert-in-config-with-defaults.spec.ts |  57 +++++
 .../init-user-data/preferences.json           |  16 ++
 .../custom-invalid-ca-cert-in-config.spec.ts  |  57 +++++
 .../init-user-data/preferences.json           |  16 ++
 ...id-ca-cert-in-config-with-defaults.spec.ts |  57 +++++
 .../init-user-data/preferences.json           |  16 ++
 .../custom-valid-ca-cert-in-config.spec.ts    |  57 +++++
 .../init-user-data/preferences.json           |  16 ++
 57 files changed, 1853 insertions(+), 50 deletions(-)
 create mode 100644 .github/actions/common/setup-node-deps/action.yml
 create mode 100644 .github/actions/ssl/linux/run-basic-ssl-cli-tests/action.yml
 create mode 100644 .github/actions/ssl/linux/run-custom-ca-certs-cli-tests/action.yml
 create mode 100644 .github/actions/ssl/linux/run-ssl-e2e-tests/action.yml
 create mode 100644 .github/actions/ssl/linux/setup-ca-certs/action.yml
 create mode 100644 .github/actions/ssl/linux/setup-feature-specific-deps/action.yml
 create mode 100644 .github/actions/ssl/macos/run-basic-ssl-cli-tests/action.yml
 create mode 100644 .github/actions/ssl/macos/run-custom-ca-certs-cli-tests/action.yml
 create mode 100644 .github/actions/ssl/macos/run-ssl-e2e-tests/action.yml
 create mode 100644 .github/actions/ssl/macos/setup-ca-certs/action.yml
 create mode 100644 .github/actions/ssl/macos/setup-feature-specific-deps/action.yml
 create mode 100644 .github/actions/ssl/windows/run-basic-ssl-cli-tests/action.yml
 create mode 100644 .github/actions/ssl/windows/run-custom-ca-certs-cli-tests/action.yml
 create mode 100644 .github/actions/ssl/windows/run-ssl-e2e-tests/action.yml
 create mode 100644 .github/actions/ssl/windows/setup-ca-certs/action.yml
 create mode 100644 .github/workflows/ssl-tests.yml
 create mode 100644 packages/bruno-requests/src/network/ca-cert.ts
 create mode 100644 tests/ssl/basic-ssl/collections/badssl/bruno.json
 create mode 100644 tests/ssl/basic-ssl/collections/badssl/package.json
 create mode 100644 tests/ssl/basic-ssl/collections/badssl/request.bru
 create mode 100644 tests/ssl/basic-ssl/collections/self-signed-badssl/bruno.json
 create mode 100644 tests/ssl/basic-ssl/collections/self-signed-badssl/package.json
 create mode 100644 tests/ssl/basic-ssl/collections/self-signed-badssl/request.bru
 create mode 100644 tests/ssl/basic-ssl/tests/basic-ssl-success/basic-ssl-success.spec.ts
 create mode 100644 tests/ssl/basic-ssl/tests/basic-ssl-success/init-user-data/preferences.json
 create mode 100644 tests/ssl/basic-ssl/tests/self-signed-rejected/init-user-data/preferences.json
 create mode 100644 tests/ssl/basic-ssl/tests/self-signed-rejected/self-signed-rejected.spec.ts
 create mode 100644 tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/init-user-data/preferences.json
 create mode 100644 tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/self-signed-success-with-validation-disabled.spec.ts
 create mode 100644 tests/ssl/custom-ca-certs/collection/bruno.json
 create mode 100644 tests/ssl/custom-ca-certs/collection/package.json
 create mode 100644 tests/ssl/custom-ca-certs/collection/request.bru
 create mode 100644 tests/ssl/custom-ca-certs/server/.gitignore
 create mode 100644 tests/ssl/custom-ca-certs/server/helpers/certs.js
 create mode 100644 tests/ssl/custom-ca-certs/server/helpers/platform.js
 create mode 100644 tests/ssl/custom-ca-certs/server/index.js
 create mode 100644 tests/ssl/custom-ca-certs/server/readme.md
 create mode 100644 tests/ssl/custom-ca-certs/server/scripts/generate-certs.js
 create mode 100644 tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/custom-invalid-ca-cert-in-config-with-defaults.spec.ts
 create mode 100644 tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/init-user-data/preferences.json
 create mode 100644 tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/custom-invalid-ca-cert-in-config.spec.ts
 create mode 100644 tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/init-user-data/preferences.json
 create mode 100644 tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/custom-valid-ca-cert-in-config-with-defaults.spec.ts
 create mode 100644 tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/init-user-data/preferences.json
 create mode 100644 tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/custom-valid-ca-cert-in-config.spec.ts
 create mode 100644 tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/init-user-data/preferences.json

diff --git a/.github/actions/common/setup-node-deps/action.yml b/.github/actions/common/setup-node-deps/action.yml
new file mode 100644
index 000000000..f99758768
--- /dev/null
+++ b/.github/actions/common/setup-node-deps/action.yml
@@ -0,0 +1,26 @@
+name: 'Setup Node Dependencies'
+description: 'Install Node.js and npm dependencies'
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: v22.17.0
+        cache: 'npm'
+        cache-dependency-path: './package-lock.json'
+    
+    - name: Install node dependencies
+      shell: bash
+      run: npm ci --legacy-peer-deps
+    
+    - name: Build libraries
+      shell: bash
+      run: |
+        npm run build:graphql-docs
+        npm run build:bruno-query
+        npm run build:bruno-common
+        npm run sandbox:bundle-libraries --workspace=packages/bruno-js
+        npm run build:bruno-converters
+        npm run build:bruno-requests
+        npm run build:bruno-filestore
diff --git a/.github/actions/ssl/linux/run-basic-ssl-cli-tests/action.yml b/.github/actions/ssl/linux/run-basic-ssl-cli-tests/action.yml
new file mode 100644
index 000000000..e0d8c04eb
--- /dev/null
+++ b/.github/actions/ssl/linux/run-basic-ssl-cli-tests/action.yml
@@ -0,0 +1,36 @@
+name: 'Run Basic SSL CLI Tests - Linux'
+description: 'Run basic SSL CLI tests on Linux'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run CLI tests
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        # navigate to basic SSL test collection directory
+        cd tests/ssl/basic-ssl/collections/badssl
+
+        echo "basic ssl success"
+        # should pass
+        node ../../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit1.xml --insecure --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit1.xml | grep -q "^1$" || exit 1
+
+        echo "with default/system ca certs"
+        # should pass
+        node ../../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit2.xml --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit2.xml | grep -q "^1$" || exit 1
+
+        # navigate to self-signed SSL test collection directory
+        cd ../self-signed-badssl
+
+        echo "self-signed ssl with validation disabled"
+        # should pass
+        node ../../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit3.xml --insecure --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit3.xml | grep -q "^1$" || exit 1
+
+        echo "self-signed ssl with default/system ca certs"
+        echo "request will error"
+        # should fail
+        node ../../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit4.xml --format junit 2>/dev/null || true
+        xmllint --xpath 'count(//testsuite[@errors="1"])' junit4.xml | grep -q "^1$" || exit 1
diff --git a/.github/actions/ssl/linux/run-custom-ca-certs-cli-tests/action.yml b/.github/actions/ssl/linux/run-custom-ca-certs-cli-tests/action.yml
new file mode 100644
index 000000000..375a14228
--- /dev/null
+++ b/.github/actions/ssl/linux/run-custom-ca-certs-cli-tests/action.yml
@@ -0,0 +1,33 @@
+name: 'Run Custom CA Certs CLI Tests - Linux'
+description: 'Run custom CA certs CLI tests on Linux'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run CLI tests
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        # navigate to CA certificates test collection directory
+        cd tests/ssl/custom-ca-certs/collection
+
+        echo "custom valid ca cert"
+        # should pass
+        node ../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit1.xml --cacert ../server/certs/ca-cert.pem --ignore-truststore --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit1.xml | grep -q "^1$" || exit 1
+
+        echo "custom valid ca cert with defaults"
+        # should pass
+        node ../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit2.xml --cacert ../server/certs/ca-cert.pem --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit2.xml | grep -q "^1$" || exit 1
+
+        echo "custom invalid ca cert"
+        echo "request will error"
+        # should fail
+        node ../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit3.xml --cacert ../server/certs/ca-key.pem --ignore-truststore --format junit 2>/dev/null || true
+        xmllint --xpath 'count(//testsuite[@errors="1"])' junit3.xml | grep -q "^1$" || exit 1
+
+        echo "custom invalid ca cert with defaults"
+        # should pass
+        node ../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit4.xml --cacert ../server/certs/ca-key.pem --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit4.xml | grep -q "^1$" || exit 1
diff --git a/.github/actions/ssl/linux/run-ssl-e2e-tests/action.yml b/.github/actions/ssl/linux/run-ssl-e2e-tests/action.yml
new file mode 100644
index 000000000..bd8c7949e
--- /dev/null
+++ b/.github/actions/ssl/linux/run-ssl-e2e-tests/action.yml
@@ -0,0 +1,19 @@
+name: 'Run SSL E2E Tests - Linux'
+description: 'Run SSL E2E tests on Linux'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run E2E tests
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        xvfb-run npm run test:e2e:ssl
+
+    - name: Upload Playwright Report
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: playwright-report-linux
+        path: playwright-report/
+        retention-days: 30
diff --git a/.github/actions/ssl/linux/setup-ca-certs/action.yml b/.github/actions/ssl/linux/setup-ca-certs/action.yml
new file mode 100644
index 000000000..9561ecf30
--- /dev/null
+++ b/.github/actions/ssl/linux/setup-ca-certs/action.yml
@@ -0,0 +1,26 @@
+name: 'Setup CA Certificates - Linux'
+description: 'Setup CA certificates and start test server for custom CA certs tests on Linux'
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup CA certificates
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        cd tests/ssl/custom-ca-certs/server
+        
+        echo "running certificate setup"
+        node scripts/generate-certs.js
+
+    - name: Start test server
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        cd tests/ssl/custom-ca-certs/server
+        
+        echo "starting server in background"
+        node index.js &
+        
+        echo "server started with PID: $!"
diff --git a/.github/actions/ssl/linux/setup-feature-specific-deps/action.yml b/.github/actions/ssl/linux/setup-feature-specific-deps/action.yml
new file mode 100644
index 000000000..297f842a6
--- /dev/null
+++ b/.github/actions/ssl/linux/setup-feature-specific-deps/action.yml
@@ -0,0 +1,14 @@
+name: 'Setup Custom CA Certs Feature Dependencies - Linux'
+description: 'Setup feature-specific dependencies for custom CA certs tests on Linux'
+runs:
+  using: 'composite'
+  steps:
+    - name: Install additional OS dependencies for custom CA certs
+      shell: bash
+      run: |
+        sudo apt-get --no-install-recommends install -y \
+          libglib2.0-0 libnss3 libdbus-1-3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libgtk-3-0 libasound2t64 \
+          xvfb libxml2-utils
+
+        sudo chown root /home/runner/work/bruno/bruno/node_modules/electron/dist/chrome-sandbox
+        sudo chmod 4755 /home/runner/work/bruno/bruno/node_modules/electron/dist/chrome-sandbox
diff --git a/.github/actions/ssl/macos/run-basic-ssl-cli-tests/action.yml b/.github/actions/ssl/macos/run-basic-ssl-cli-tests/action.yml
new file mode 100644
index 000000000..6b60fc7a8
--- /dev/null
+++ b/.github/actions/ssl/macos/run-basic-ssl-cli-tests/action.yml
@@ -0,0 +1,36 @@
+name: 'Run Basic SSL CLI Tests - macOS'
+description: 'Run basic SSL CLI tests on macOS'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run CLI tests
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        # navigate to basic SSL test collection directory
+        cd tests/ssl/basic-ssl/collections/badssl
+
+        echo "basic ssl success"
+        # should pass
+        node ../../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit1.xml --insecure --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit1.xml | grep -q "^1$" || exit 1
+
+        echo "with default/system ca certs"
+        # should pass
+        node ../../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit2.xml --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit2.xml | grep -q "^1$" || exit 1
+
+        # navigate to self-signed SSL test collection directory
+        cd ../self-signed-badssl
+
+        echo "self-signed ssl with validation disabled"
+        # should pass
+        node ../../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit3.xml --insecure --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit3.xml | grep -q "^1$" || exit 1
+
+        echo "self-signed ssl with default/system ca certs"
+        echo "request will error"
+        # should fail
+        node ../../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit4.xml --format junit 2>/dev/null || true
+        xmllint --xpath 'count(//testsuite[@errors="1"])' junit4.xml | grep -q "^1$" || exit 1
diff --git a/.github/actions/ssl/macos/run-custom-ca-certs-cli-tests/action.yml b/.github/actions/ssl/macos/run-custom-ca-certs-cli-tests/action.yml
new file mode 100644
index 000000000..634dca1fc
--- /dev/null
+++ b/.github/actions/ssl/macos/run-custom-ca-certs-cli-tests/action.yml
@@ -0,0 +1,33 @@
+name: 'Run Custom CA Certs CLI Tests - macOS'
+description: 'Run custom CA certs CLI tests on macOS'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run CLI tests
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        # navigate to CA certificates test collection directory
+        cd tests/ssl/custom-ca-certs/collection
+
+        echo "custom valid ca cert"
+        # should pass
+        node ../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit1.xml --cacert ../server/certs/ca-cert.pem --ignore-truststore --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit1.xml | grep -q "^1$" || exit 1
+
+        echo "custom valid ca cert with defaults"
+        # should pass
+        node ../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit2.xml --cacert ../server/certs/ca-cert.pem --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit2.xml | grep -q "^1$" || exit 1
+
+        echo "custom invalid ca cert"
+        echo "request will error"
+        # should fail
+        node ../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit3.xml --cacert ../server/certs/ca-key.pem --ignore-truststore --format junit 2>/dev/null || true
+        xmllint --xpath 'count(//testsuite[@errors="1"])' junit3.xml | grep -q "^1$" || exit 1
+
+        echo "custom invalid ca cert with defaults"
+        # should pass
+        node ../../../../packages/bruno-cli/bin/bru.js run ./request.bru --output junit4.xml --cacert ../server/certs/ca-key.pem --format junit
+        xmllint --xpath 'count(//testsuite[@errors="0"])' junit4.xml | grep -q "^1$" || exit 1
diff --git a/.github/actions/ssl/macos/run-ssl-e2e-tests/action.yml b/.github/actions/ssl/macos/run-ssl-e2e-tests/action.yml
new file mode 100644
index 000000000..b3fea6368
--- /dev/null
+++ b/.github/actions/ssl/macos/run-ssl-e2e-tests/action.yml
@@ -0,0 +1,17 @@
+name: 'Run SSL E2E Tests - macOS'
+description: 'Run SSL E2E tests on macOS'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run E2E tests
+      shell: bash
+      run: |
+        npm run test:e2e:ssl
+
+    - name: Upload Playwright Report
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: playwright-report-macos
+        path: playwright-report/
+        retention-days: 30
diff --git a/.github/actions/ssl/macos/setup-ca-certs/action.yml b/.github/actions/ssl/macos/setup-ca-certs/action.yml
new file mode 100644
index 000000000..89180e494
--- /dev/null
+++ b/.github/actions/ssl/macos/setup-ca-certs/action.yml
@@ -0,0 +1,26 @@
+name: 'Setup CA Certificates - macOS'
+description: 'Setup CA certificates and start test server for custom CA certs tests on macOS'
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup CA certificates
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        cd tests/ssl/custom-ca-certs/server
+        
+        echo "running certificate setup"
+        node scripts/generate-certs.js
+
+    - name: Start test server
+      shell: bash
+      run: |
+        set -euo pipefail
+        
+        cd tests/ssl/custom-ca-certs/server
+        
+        echo "starting server in background"
+        node index.js &
+        
+        echo "server started with PID: $!"
diff --git a/.github/actions/ssl/macos/setup-feature-specific-deps/action.yml b/.github/actions/ssl/macos/setup-feature-specific-deps/action.yml
new file mode 100644
index 000000000..676050509
--- /dev/null
+++ b/.github/actions/ssl/macos/setup-feature-specific-deps/action.yml
@@ -0,0 +1,9 @@
+name: 'Setup Custom CA Certs Feature Dependencies - macOS'
+description: 'Setup feature-specific dependencies for custom CA certs tests on macOS'
+runs:
+  using: 'composite'
+  steps:
+    - name: Install additional OS dependencies for custom CA certs
+      shell: bash
+      run: |
+        brew install libxml2
diff --git a/.github/actions/ssl/windows/run-basic-ssl-cli-tests/action.yml b/.github/actions/ssl/windows/run-basic-ssl-cli-tests/action.yml
new file mode 100644
index 000000000..2d296b1f3
--- /dev/null
+++ b/.github/actions/ssl/windows/run-basic-ssl-cli-tests/action.yml
@@ -0,0 +1,50 @@
+name: 'Run Basic SSL CLI Tests - Windows'
+description: 'Run basic SSL CLI tests on Windows'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run CLI tests
+      shell: pwsh
+      run: |
+        Set-StrictMode -Version Latest
+        $ErrorActionPreference = "Stop"
+        
+        # navigate to basic SSL test collection directory
+        Set-Location tests\ssl\basic-ssl\collections\badssl
+
+        Write-Host "basic ssl success"
+        # should pass
+        $process = Start-Process -FilePath "node" -ArgumentList "..\..\..\..\..\packages\bruno-cli\bin\bru.js run .\request.bru --output junit1.xml --insecure --format junit" -NoNewWindow -Wait -PassThru -RedirectStandardError "nul"
+        [xml]$xml1 = Get-Content junit1.xml
+        $testsuites1 = if ($xml1.testsuites) { $xml1.testsuites.testsuite } else { $xml1.testsuite }
+        $errorCount1 = ($testsuites1 | Where-Object { $_.errors -eq "0" } | Measure-Object).Count
+        if ($errorCount1 -ne 1) { exit 1 }
+
+        Write-Host "with default/system ca certs"
+        # should pass
+        $process = Start-Process -FilePath "node" -ArgumentList "..\..\..\..\..\packages\bruno-cli\bin\bru.js run .\request.bru --output junit2.xml --format junit" -NoNewWindow -Wait -PassThru -RedirectStandardError "nul"
+        [xml]$xml2 = Get-Content junit2.xml
+        $testsuites2 = if ($xml2.testsuites) { $xml2.testsuites.testsuite } else { $xml2.testsuite }
+        $errorCount2 = ($testsuites2 | Where-Object { $_.errors -eq "0" } | Measure-Object).Count
+        if ($errorCount2 -ne 1) { exit 1 }
+
+        # navigate to self-signed SSL test collection directory
+        Set-Location ..\self-signed-badssl
+
+        Write-Host "self-signed ssl with validation disabled"
+        # should pass
+        $process = Start-Process -FilePath "node" -ArgumentList "..\..\..\..\..\packages\bruno-cli\bin\bru.js run .\request.bru --output junit3.xml --insecure --format junit" -NoNewWindow -Wait -PassThru -RedirectStandardError "nul"
+        [xml]$xml3 = Get-Content junit3.xml
+        $testsuites3 = if ($xml3.testsuites) { $xml3.testsuites.testsuite } else { $xml3.testsuite }
+        $errorCount3 = ($testsuites3 | Where-Object { $_.errors -eq "0" } | Measure-Object).Count
+        if ($errorCount3 -ne 1) { exit 1 }
+
+        Write-Host "self-signed ssl with default/system ca certs"
+        Write-Host "request will error"
+        # should fail
+        $process = Start-Process -FilePath "node" -ArgumentList "..\..\..\..\..\packages\bruno-cli\bin\bru.js run .\request.bru --output junit4.xml --format junit" -NoNewWindow -Wait -PassThru -RedirectStandardError "nul"
+        # Ignore the exit code - we expect this to fail
+        [xml]$xml4 = Get-Content junit4.xml
+        $testsuites4 = if ($xml4.testsuites) { $xml4.testsuites.testsuite } else { $xml4.testsuite }
+        $errorCount4 = ($testsuites4 | Where-Object { $_.errors -eq "1" } | Measure-Object).Count
+        if ($errorCount4 -ne 1) { exit 1 }
diff --git a/.github/actions/ssl/windows/run-custom-ca-certs-cli-tests/action.yml b/.github/actions/ssl/windows/run-custom-ca-certs-cli-tests/action.yml
new file mode 100644
index 000000000..f35b7a65f
--- /dev/null
+++ b/.github/actions/ssl/windows/run-custom-ca-certs-cli-tests/action.yml
@@ -0,0 +1,47 @@
+name: 'Run Custom CA Certs CLI Tests - Windows'
+description: 'Run custom CA certs CLI tests on Windows'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run CLI tests
+      shell: pwsh
+      run: |
+        Set-StrictMode -Version Latest
+        $ErrorActionPreference = "Stop"
+        
+        # navigate to CA certificates test collection directory
+        Set-Location tests\ssl\custom-ca-certs\collection
+
+        Write-Host "custom valid ca cert"
+        # should pass
+        $process = Start-Process -FilePath "node" -ArgumentList "..\..\..\..\packages\bruno-cli\bin\bru.js run .\request.bru --output junit1.xml --cacert ..\server\certs\ca-cert.pem --ignore-truststore --format junit" -NoNewWindow -Wait -PassThru -RedirectStandardError "nul"
+        [xml]$xml1 = Get-Content junit1.xml
+        $testsuites1 = if ($xml1.testsuites) { $xml1.testsuites.testsuite } else { $xml1.testsuite }
+        $errorCount1 = ($testsuites1 | Where-Object { $_.errors -eq "0" } | Measure-Object).Count
+        if ($errorCount1 -ne 1) { exit 1 }
+
+        Write-Host "custom valid ca cert with defaults"
+        # should pass
+        $process = Start-Process -FilePath "node" -ArgumentList "..\..\..\..\packages\bruno-cli\bin\bru.js run .\request.bru --output junit2.xml --cacert ..\server\certs\ca-cert.pem --format junit" -NoNewWindow -Wait -PassThru -RedirectStandardError "nul"
+        [xml]$xml2 = Get-Content junit2.xml
+        $testsuites2 = if ($xml2.testsuites) { $xml2.testsuites.testsuite } else { $xml2.testsuite }
+        $errorCount2 = ($testsuites2 | Where-Object { $_.errors -eq "0" } | Measure-Object).Count
+        if ($errorCount2 -ne 1) { exit 1 }
+
+        Write-Host "custom invalid ca cert"
+        Write-Host "request will error"
+        # should fail
+        $process = Start-Process -FilePath "node" -ArgumentList "..\..\..\..\packages\bruno-cli\bin\bru.js run .\request.bru --output junit3.xml --cacert ..\server\certs\ca-key.pem --ignore-truststore --format junit" -NoNewWindow -Wait -PassThru -RedirectStandardError "nul"
+        # Ignore the exit code - we expect this to fail
+        [xml]$xml3 = Get-Content junit3.xml
+        $testsuites3 = if ($xml3.testsuites) { $xml3.testsuites.testsuite } else { $xml3.testsuite }
+        $errorCount3 = ($testsuites3 | Where-Object { $_.errors -eq "1" } | Measure-Object).Count
+        if ($errorCount3 -ne 1) { exit 1 }
+
+        Write-Host "custom invalid ca cert with defaults"
+        # should pass
+        $process = Start-Process -FilePath "node" -ArgumentList "..\..\..\..\packages\bruno-cli\bin\bru.js run .\request.bru --output junit4.xml --cacert ..\server\certs\ca-key.pem --format junit" -NoNewWindow -Wait -PassThru -RedirectStandardError "nul"
+        [xml]$xml4 = Get-Content junit4.xml
+        $testsuites4 = if ($xml4.testsuites) { $xml4.testsuites.testsuite } else { $xml4.testsuite }
+        $errorCount4 = ($testsuites4 | Where-Object { $_.errors -eq "0" } | Measure-Object).Count
+        if ($errorCount4 -ne 1) { exit 1 }
diff --git a/.github/actions/ssl/windows/run-ssl-e2e-tests/action.yml b/.github/actions/ssl/windows/run-ssl-e2e-tests/action.yml
new file mode 100644
index 000000000..41140d80d
--- /dev/null
+++ b/.github/actions/ssl/windows/run-ssl-e2e-tests/action.yml
@@ -0,0 +1,17 @@
+name: 'Run SSL E2E Tests - Windows'
+description: 'Run SSL E2E tests on Windows'
+runs:
+  using: 'composite'
+  steps:
+    - name: Run E2E tests
+      shell: pwsh
+      run: |
+        npm run test:e2e:ssl
+
+    - name: Upload Playwright Report
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: playwright-report-windows
+        path: playwright-report/
+        retention-days: 30
diff --git a/.github/actions/ssl/windows/setup-ca-certs/action.yml b/.github/actions/ssl/windows/setup-ca-certs/action.yml
new file mode 100644
index 000000000..182a91896
--- /dev/null
+++ b/.github/actions/ssl/windows/setup-ca-certs/action.yml
@@ -0,0 +1,25 @@
+name: 'Setup CA Certificates - Windows'
+description: 'Setup CA certificates and start test server for custom CA certs tests on Windows'
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup CA certificates
+      shell: pwsh
+      run: |
+        Set-StrictMode -Version Latest
+        $ErrorActionPreference = "Stop"
+        
+        Set-Location tests\ssl\custom-ca-certs\server
+        
+        Write-Host "running certificate setup"
+        node scripts/generate-certs.js
+
+    - name: Start test server
+      shell: pwsh
+      run: |
+        Set-StrictMode -Version Latest
+        
+        Set-Location tests\ssl\custom-ca-certs\server
+        
+        Write-Host "starting server in background"
+        Start-Process -FilePath "node" -ArgumentList "index.js" -PassThru -WindowStyle Hidden
diff --git a/.github/workflows/ssl-tests.yml b/.github/workflows/ssl-tests.yml
new file mode 100644
index 000000000..467a62ce9
--- /dev/null
+++ b/.github/workflows/ssl-tests.yml
@@ -0,0 +1,91 @@
+name: SSL Tests
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  tests-for-linux:
+    name: SSL Tests - Linux
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node Dependencies
+        uses: ./.github/actions/common/setup-node-deps
+
+      - name: Setup Feature Dependencies
+        uses: ./.github/actions/ssl/linux/setup-feature-specific-deps
+
+      - name: Setup CA Certificates
+        uses: ./.github/actions/ssl/linux/setup-ca-certs
+
+      - name: Run Basic SSL CLI Tests
+        uses: ./.github/actions/ssl/linux/run-basic-ssl-cli-tests
+
+      - name: Run Custom CA Certs CLI Tests
+        uses: ./.github/actions/ssl/linux/run-custom-ca-certs-cli-tests
+
+      - name: Run Custom CA Certs E2E Tests
+        uses: ./.github/actions/ssl/linux/run-ssl-e2e-tests
+
+  tests-for-macos:
+    name: SSL Tests - macOS
+    timeout-minutes: 60
+    runs-on: macos-latest
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node Dependencies
+        uses: ./.github/actions/common/setup-node-deps
+
+      - name: Setup Feature Dependencies
+        uses: ./.github/actions/ssl/macos/setup-feature-specific-deps
+
+      - name: Setup CA Certificates
+        uses: ./.github/actions/ssl/macos/setup-ca-certs
+
+      - name: Run Basic SSL CLI Tests
+        uses: ./.github/actions/ssl/macos/run-basic-ssl-cli-tests
+
+      - name: Run Custom CA Certs CLI Tests
+        uses: ./.github/actions/ssl/macos/run-custom-ca-certs-cli-tests
+
+      - name: Run Custom CA Certs E2E Tests
+        uses: ./.github/actions/ssl/macos/run-ssl-e2e-tests
+
+  tests-for-windows:
+    name: SSL Tests - Windows
+    timeout-minutes: 60
+    runs-on: windows-latest
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Setup Node Dependencies
+        uses: ./.github/actions/common/setup-node-deps
+
+      - name: Setup CA Certificates
+        uses: ./.github/actions/ssl/windows/setup-ca-certs
+
+      - name: Run Basic SSL CLI Tests
+        uses: ./.github/actions/ssl/windows/run-basic-ssl-cli-tests
+
+      - name: Run Custom CA Certs CLI Tests
+        uses: ./.github/actions/ssl/windows/run-custom-ca-certs-cli-tests
+
+      - name: Run Custom CA Certs E2E Tests
+        uses: ./.github/actions/ssl/windows/run-ssl-e2e-tests
diff --git a/package.json b/package.json
index fe8dafdc9..695f0d3f5 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,8 @@
     "build:electron:snap": "./scripts/build-electron.sh snap",
     "watch:common": "npm run watch --workspace=packages/bruno-common",
     "test:codegen": "node playwright/codegen.ts",
-    "test:e2e": "playwright test",
+    "test:e2e": "playwright test --project=default",
+    "test:e2e:ssl": "playwright test --project=ssl",
     "test:prettier:web": "npm run test:prettier --workspace=packages/bruno-app",
     "lint": "node --max_old_space_size=4096 $(npx which eslint)"
   },
diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js
index 9b9ca8c74..864e3a2fe 100644
--- a/packages/bruno-cli/src/runner/run-single-request.js
+++ b/packages/bruno-cli/src/runner/run-single-request.js
@@ -25,7 +25,7 @@ const { createFormData } = require('../utils/form-data');
 const { getOAuth2Token } = require('./oauth2');
 const protocolRegex = /^([-+\w]{1,25})(:?\/\/|:)/;
 const { NtlmClient } = require('axios-ntlm');
-const { addDigestInterceptor } = require('@usebruno/requests');
+const { addDigestInterceptor, getCACertificates } = require('@usebruno/requests');
 const { encodeUrl } = require('@usebruno/common').utils;
 
 const onConsoleLog = (type, args) => {
@@ -151,21 +151,16 @@ const runSingleRequest = async function (
     const insecure = get(options, 'insecure', false);
     const noproxy = get(options, 'noproxy', false);
     const httpsAgentRequestFields = {};
+    
     if (insecure) {
       httpsAgentRequestFields['rejectUnauthorized'] = false;
     } else {
-      const caCertArray = [options['cacert'], process.env.SSL_CERT_FILE, process.env.NODE_EXTRA_CA_CERTS];
-      const caCert = caCertArray.find((el) => el);
-      if (caCert && caCert.length > 1) {
-        try {
-          let caCertBuffer = fs.readFileSync(caCert);
-          if (!options['ignoreTruststore']) {
-            caCertBuffer += '\n' + tls.rootCertificates.join('\n'); // Augment default truststore with custom CA certificates
-          }
-          httpsAgentRequestFields['ca'] = caCertBuffer;
-        } catch (err) {
-          console.log('Error reading CA cert file:' + caCert, err);
-        }
+      const caCertArray = [options['cacert'], process.env.SSL_CERT_FILE];
+      const caCertFilePath = caCertArray.find((el) => el);
+      let caCertificatesWithCertType = getCACertificates({ caCertFilePath, shouldKeepDefaultCerts: !options['ignoreTruststore'] });
+      let caCertificates = caCertificatesWithCertType.map(certData => certData.certificate);
+      if (caCertificates?.length > 0) {
+        httpsAgentRequestFields['ca'] = caCertificates;
       }
     }
 
diff --git a/packages/bruno-electron/src/ipc/network/cert-utils.js b/packages/bruno-electron/src/ipc/network/cert-utils.js
index ecd036fb0..cb1c83e12 100644
--- a/packages/bruno-electron/src/ipc/network/cert-utils.js
+++ b/packages/bruno-electron/src/ipc/network/cert-utils.js
@@ -1,7 +1,7 @@
-const fs = require('fs');
-const tls = require('tls');
+const fs = require('node:fs');
 const path = require('path');
 const { get } = require('lodash');
+const { getCACertificates } = require('@usebruno/requests');
 const { preferencesUtil } = require('../../store/preferences');
 const { getBrunoConfig } = require('../../store/bruno-config');
 const { interpolateString } = require('./interpolate-string');
@@ -26,15 +26,28 @@ const getCertsAndProxyConfig = async ({
     httpsAgentRequestFields['rejectUnauthorized'] = false;
   }
 
-  if (preferencesUtil.shouldUseCustomCaCertificate()) {
-    const caCertFilePath = preferencesUtil.getCustomCaCertificateFilePath();
-    if (caCertFilePath) {
-      let caCertBuffer = fs.readFileSync(caCertFilePath);
-      if (preferencesUtil.shouldKeepDefaultCaCertificates()) {
-        caCertBuffer += '\n' + tls.rootCertificates.join('\n'); // Augment default truststore with custom CA certificates
-      }
-      httpsAgentRequestFields['ca'] = caCertBuffer;
-    }
+  let caCertFilePath = preferencesUtil.shouldUseCustomCaCertificate() && preferencesUtil.getCustomCaCertificateFilePath();
+  let caCertificatesWithCertType = getCACertificates({ 
+    caCertFilePath, 
+    shouldKeepDefaultCerts: preferencesUtil.shouldKeepDefaultCaCertificates() 
+  });
+
+  let caCertificates = caCertificatesWithCertType.map(certData => certData.certificate);
+  let caCertificateDetails = caCertificatesWithCertType.reduce((details, certificateData) => {
+    // get the count for each certificate type
+    details[certificateData.type] += 1;
+    return details;
+  }, {
+    custom: 0,
+    bundled: 0,
+    system: 0,
+    extra: 0
+  });
+
+  // configure HTTPS agent with aggregated CA certificates
+  if (caCertificates?.length > 0) {
+    httpsAgentRequestFields['caCertificateDetails'] = caCertificateDetails;
+    httpsAgentRequestFields['ca'] = caCertificates;
   }
 
   const brunoConfig = getBrunoConfig(collectionUid);
diff --git a/packages/bruno-electron/src/store/last-opened-collections.js b/packages/bruno-electron/src/store/last-opened-collections.js
index 72452eef3..8705e9dfd 100644
--- a/packages/bruno-electron/src/store/last-opened-collections.js
+++ b/packages/bruno-electron/src/store/last-opened-collections.js
@@ -1,3 +1,4 @@
+const path = require('node:path');
 const _ = require('lodash');
 const Store = require('electron-store');
 const { isDirectory } = require('../utils/filesystem');
@@ -12,7 +13,9 @@ class LastOpenedCollections {
   }
 
   getAll() {
-    return this.store.get('lastOpenedCollections') || [];
+    let collections = this.store.get('lastOpenedCollections') || [];
+    collections = collections.map(collection => path.resolve(collection));
+    return collections;
   }
 
   add(collectionPath) {
diff --git a/packages/bruno-electron/src/utils/proxy-util.js b/packages/bruno-electron/src/utils/proxy-util.js
index f611ea1f6..cb151a81a 100644
--- a/packages/bruno-electron/src/utils/proxy-util.js
+++ b/packages/bruno-electron/src/utils/proxy-util.js
@@ -1,5 +1,5 @@
 const parseUrl = require('url').parse;
-const https = require('https');
+const https = require('node:https');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { interpolateString } = require('../ipc/network/interpolate-string');
 const { SocksProxyAgent } = require('socks-proxy-agent');
@@ -87,6 +87,10 @@ class PatchedHttpsProxyAgent extends HttpsProxyAgent {
 function createTimelineAgentClass(BaseAgentClass) {
   return class extends BaseAgentClass {
     constructor(options, timeline) {
+
+      let caCertificateDetails = options.caCertificateDetails || {};
+      delete options.caCertificateDetails;
+
       // For proxy agents, the first argument is the proxy URI and the second is options
       if (options?.proxy) {
         const { proxy: proxyUri, ...agentOptions } = options;
@@ -118,7 +122,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         const tlsOptions = {
           ...options,
           rejectUnauthorized: options.rejectUnauthorized ?? true,
-        };   
+        };
         super(tlsOptions);
         this.timeline = Array.isArray(timeline) ? timeline : [];
         this.alpnProtocols = options.ALPNProtocols || ['h2', 'http/1.1'];
@@ -131,6 +135,8 @@ function createTimelineAgentClass(BaseAgentClass) {
           message: `SSL validation: ${tlsOptions.rejectUnauthorized ? 'enabled' : 'disabled'}`,
         });
       }
+
+      this.caCertificateDetails = caCertificateDetails;
     }
 
 
@@ -146,20 +152,16 @@ function createTimelineAgentClass(BaseAgentClass) {
         });
       }
 
-      // Log CAfile and CApath (if possible)
-      if (this.caProvided) {
-        this.timeline.push({
-          timestamp: new Date(),
-          type: 'tls',
-          message: `CA certificates provided`,
-        });
-      } else {
-        this.timeline.push({
-          timestamp: new Date(),
-          type: 'tls',
-          message: `Using system default CA certificates`,
-        });
-      }
+      const bundledCerts = this.caCertificateDetails.bundled || 0;
+      const systemCerts = this.caCertificateDetails.system || 0;
+      const extraCerts = this.caCertificateDetails.extra || 0;
+      const customCerts = this.caCertificateDetails.custom || 0;
+
+      this.timeline.push({
+        timestamp: new Date(),
+        type: 'tls',
+        message: `CA Certificates: ${bundledCerts} bundled, ${systemCerts} system, ${extraCerts} extra, ${customCerts} custom`,
+      });
 
       // Log "Trying host:port..."
       this.timeline.push({
diff --git a/packages/bruno-requests/src/index.ts b/packages/bruno-requests/src/index.ts
index 82d596828..3d6079c84 100644
--- a/packages/bruno-requests/src/index.ts
+++ b/packages/bruno-requests/src/index.ts
@@ -2,6 +2,6 @@ export { addDigestInterceptor, getOAuth2Token } from  './auth';
 export { GrpcClient, generateGrpcSampleMessage } from './grpc';
 export { default as cookies } from './cookies';
 
-export * as network from './network';
+export { getCACertificates } from './network';
 
 export * as scripting from './scripting';
\ No newline at end of file
diff --git a/packages/bruno-requests/src/network/ca-cert.ts b/packages/bruno-requests/src/network/ca-cert.ts
new file mode 100644
index 000000000..b08a60916
--- /dev/null
+++ b/packages/bruno-requests/src/network/ca-cert.ts
@@ -0,0 +1,165 @@
+import * as fs from 'node:fs';
+import { spawnSync } from 'node:child_process';
+
+type T_CACertSource = 'bundled' | 'system' | 'extra'
+
+type T_CACertificateData = {
+  type: T_CACertSource | 'custom';
+  certificate: string
+}
+
+/**
+ * Safely executes tls.getCACertificates in a separate Node.js process
+ * Returns empty array if the process fails or exits
+ */
+const safeTlsGetCACertificates = (certType: T_CACertSource): string[] => {
+  try {
+
+    // adding seperate script for each cert type
+    // to make sure no unexpected code can be included in the script
+
+    const getBundledCACertificatesScript = `
+      const tls = require('node:tls');
+      try {
+        const result = tls.getCACertificates('bundled');
+        console.log(JSON.stringify(result || []));
+      } catch (error) {
+        console.log('[]');
+      }
+    `;
+
+    const getSystemCACertificatesScript = `
+      const tls = require('node:tls');
+      try {
+        const result = tls.getCACertificates('system');
+        console.log(JSON.stringify(result || []));
+      } catch (error) {
+        console.log('[]');
+      }
+    `;
+
+    const getExtraCACertificatesScript = `
+      const tls = require('node:tls');
+      try {
+        const result = tls.getCACertificates('extra');
+        console.log(JSON.stringify(result || []));
+      } catch (error) {
+        console.log('[]');
+      }
+    `;
+
+    // bundled
+    let script = getBundledCACertificatesScript;
+
+    // system
+    if (certType === 'system') script = getSystemCACertificatesScript;
+
+    // extra
+    if (certType === 'extra') script = getExtraCACertificatesScript;
+
+    const result = spawnSync('node', ['-e', script], {
+      encoding: 'utf8',
+      timeout: 5000, // 5 second timeout
+      stdio: 'pipe',
+      maxBuffer: 1024 * 1024 * 50
+    });
+    
+    if (result.error || result.status !== 0) {
+      return [];
+    }
+    
+    const output = result.stdout.trim();
+    
+    return JSON.parse(output);
+  } catch (error) {
+    // Return empty array if child process fails
+    return [];
+  }
+};
+
+/**
+ * retrieves default CA certificates from multiple sources using Node.js TLS API
+ * 
+ * this function aggregates CA certificates from three sources:
+ * - 'bundled': mozilla CA certificates bundled with Node.js (same as tls.rootCertificates)
+ * - 'system': CA certificates from the system's trusted certificate store  
+ * - 'extra': additional CA certificates loaded from `NODE_EXTRA_CA_CERTS` environment variable
+ * 
+ * @returns {string[]} Array of PEM-encoded CA certificate strings
+ * @see https://nodejs.org/docs/latest-v22.x/api/tls.html#tlsgetcacertificatestype
+ */
+const getCerts = (sources: T_CACertSource[] = ['bundled', 'system', 'extra']): T_CACertificateData[] => {
+  let certificates: T_CACertificateData[] = [];
+
+  // iterate through different certificate store types to build comprehensive CA list
+  (sources).forEach(certType => {
+    try {
+      // get certificates from specific store type
+      const certList = safeTlsGetCACertificates(certType);
+
+      if (certList && Array.isArray(certList)) {
+        // filter out empty/invalid certificates to ensure we only include valid data
+        const validCertificates = certList.filter(cert => cert && cert.trim());
+        const validCertificatesWithCertType = validCertificates.map(certificate => ({
+          type: certType,
+          certificate
+        }));
+        certificates.push(...validCertificatesWithCertType);
+      }
+    } catch (err) {
+      console.warn(`Failed to load ${certType} CA certificates:`, (err as Error).message);
+    }
+  });
+
+  return certificates;
+};
+
+const getCACertificates = ({ caCertFilePath, shouldKeepDefaultCerts = true }: { caCertFilePath: string, shouldKeepDefaultCerts: boolean }) : T_CACertificateData[] => {
+  // CA certificate configuration
+  try {
+    let caCertificates: T_CACertificateData[] = [];
+
+    // handle user-provided custom CA certificate file with optional default certificates
+    if (caCertFilePath) {
+
+      // validate custom CA certificate file
+      if (fs.existsSync(caCertFilePath)) {
+        try {
+          const customCert = fs.readFileSync(caCertFilePath, 'utf8');
+          if (customCert && customCert.trim()) {
+            caCertificates.push({
+              type: 'custom',
+              certificate: customCert.trim()
+            });
+          }
+        } catch (err) {
+          console.error(`Failed to read custom CA certificate from ${caCertFilePath}:`, (err as Error).message);
+          throw new Error(`Unable to load custom CA certificate: ${(err as Error).message}`);
+        }
+      }
+
+      // optionally augment custom CA with default certificates
+      if (shouldKeepDefaultCerts) {
+        const defaultCertificates = getCerts(['bundled', 'system', 'extra']);
+        if (defaultCertificates?.length > 0) {
+          caCertificates.push(...defaultCertificates);
+        }
+      }
+    } else {
+      // use default CA certificates when no custom configuration is specified
+      const defaultCertificates = getCerts(['bundled', 'system', 'extra']);
+      if (defaultCertificates?.length > 0) {
+        caCertificates.push(...defaultCertificates);
+      }
+    }
+
+    return caCertificates;
+  } 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/network/index.ts b/packages/bruno-requests/src/network/index.ts
index 7d72cb7d1..98f3bfceb 100644
--- a/packages/bruno-requests/src/network/index.ts
+++ b/packages/bruno-requests/src/network/index.ts
@@ -1 +1,3 @@
-export { makeAxiosInstance } from './axios-instance';
\ No newline at end of file
+export { makeAxiosInstance } from './axios-instance';
+
+export { getCACertificates } from './ca-cert';
\ No newline at end of file
diff --git a/packages/bruno-tests/.nvmrc b/packages/bruno-tests/.nvmrc
index 9a2a0e219..6edc5a20f 100644
--- a/packages/bruno-tests/.nvmrc
+++ b/packages/bruno-tests/.nvmrc
@@ -1 +1 @@
-v20
+v22.17.0
diff --git a/playwright.config.ts b/playwright.config.ts
index b47ff84f0..c4cf7f6df 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig, devices } from '@playwright/test';
+import { defineConfig } from '@playwright/test';
 
 const reporter: any[] = [['list'], ['html']];
 
@@ -7,7 +7,6 @@ if (process.env.CI) {
 }
 
 export default defineConfig({
-  testDir: './tests',
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 1 : 0,
@@ -20,7 +19,15 @@ export default defineConfig({
 
   projects: [
     {
-      name: 'Bruno Electron App'
+      name: 'default',
+      testDir: './tests',
+      testIgnore: [
+        'ssl/**' // custom CA certificate tests require separate server setup and certificate generation
+      ]
+    },
+    {
+      name: 'ssl',
+      testDir: './tests/ssl'
     }
   ],
 
diff --git a/playwright/electron.ts b/playwright/electron.ts
index 4363f46e0..89f73f25d 100644
--- a/playwright/electron.ts
+++ b/playwright/electron.ts
@@ -4,7 +4,9 @@ const { _electron: electron } = require('playwright');
 const electronAppPath = path.join(__dirname, '../packages/bruno-electron');
 
 exports.startApp = async () => {
-  const app = await electron.launch({ args: [electronAppPath] });
+  const app = await electron.launch({ 
+    args: [electronAppPath]
+  });
   const context = await app.context();
 
   app.process().stdout.on('data', (data) => {
diff --git a/playwright/index.ts b/playwright/index.ts
index a17809da4..bca567793 100644
--- a/playwright/index.ts
+++ b/playwright/index.ts
@@ -48,7 +48,7 @@ export const test = baseTest.extend<
 
         if (initUserDataPath) {
           const replacements = {
-            projectRoot: path.join(__dirname, '..')
+            projectRoot: path.posix.join(__dirname, '..')
           };
 
           for (const file of await fs.promises.readdir(initUserDataPath)) {
diff --git a/tests/ssl/basic-ssl/collections/badssl/bruno.json b/tests/ssl/basic-ssl/collections/badssl/bruno.json
new file mode 100644
index 000000000..9bdf26e2a
--- /dev/null
+++ b/tests/ssl/basic-ssl/collections/badssl/bruno.json
@@ -0,0 +1,6 @@
+{
+  "version": "1",
+  "name": "badssl",
+  "type": "collection",
+  "ignore": ["node_modules", ".git"]
+} 
\ No newline at end of file
diff --git a/tests/ssl/basic-ssl/collections/badssl/package.json b/tests/ssl/basic-ssl/collections/badssl/package.json
new file mode 100644
index 000000000..d342945f3
--- /dev/null
+++ b/tests/ssl/basic-ssl/collections/badssl/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "badssl",
+  "version": "1.0.0",
+  "description": "Bruno test collection for basic ssl testing"
+} 
\ No newline at end of file
diff --git a/tests/ssl/basic-ssl/collections/badssl/request.bru b/tests/ssl/basic-ssl/collections/badssl/request.bru
new file mode 100644
index 000000000..eaee54f14
--- /dev/null
+++ b/tests/ssl/basic-ssl/collections/badssl/request.bru
@@ -0,0 +1,15 @@
+meta {
+  name: request
+  type: http
+  seq: 6
+}
+
+get {
+  url: https://www.badssl.com
+  body: none
+  auth: inherit
+}
+
+assert {
+  res.status: eq 200
+}
diff --git a/tests/ssl/basic-ssl/collections/self-signed-badssl/bruno.json b/tests/ssl/basic-ssl/collections/self-signed-badssl/bruno.json
new file mode 100644
index 000000000..c35adf766
--- /dev/null
+++ b/tests/ssl/basic-ssl/collections/self-signed-badssl/bruno.json
@@ -0,0 +1,6 @@
+{
+  "version": "1",
+  "name": "self-signed-badssl",
+  "type": "collection",
+  "ignore": ["node_modules", ".git"]
+} 
\ No newline at end of file
diff --git a/tests/ssl/basic-ssl/collections/self-signed-badssl/package.json b/tests/ssl/basic-ssl/collections/self-signed-badssl/package.json
new file mode 100644
index 000000000..3b40105e8
--- /dev/null
+++ b/tests/ssl/basic-ssl/collections/self-signed-badssl/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "self-signed-badssl",
+  "version": "1.0.0",
+  "description": "Bruno test collection for basic ssl testing"
+} 
\ No newline at end of file
diff --git a/tests/ssl/basic-ssl/collections/self-signed-badssl/request.bru b/tests/ssl/basic-ssl/collections/self-signed-badssl/request.bru
new file mode 100644
index 000000000..53b472b5d
--- /dev/null
+++ b/tests/ssl/basic-ssl/collections/self-signed-badssl/request.bru
@@ -0,0 +1,15 @@
+meta {
+  name: request
+  type: http
+  seq: 6
+}
+
+get {
+  url: https://self-signed.badssl.com
+  body: none
+  auth: inherit
+}
+
+assert {
+  res.status: eq 200
+}
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
new file mode 100644
index 000000000..00159174c
--- /dev/null
+++ b/tests/ssl/basic-ssl/tests/basic-ssl-success/basic-ssl-success.spec.ts
@@ -0,0 +1,59 @@
+import { test, expect } from '../../../../../playwright';
+
+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));
+  });
+
+  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));
+  });
+});
\ No newline at end of file
diff --git a/tests/ssl/basic-ssl/tests/basic-ssl-success/init-user-data/preferences.json b/tests/ssl/basic-ssl/tests/basic-ssl-success/init-user-data/preferences.json
new file mode 100644
index 000000000..6552b27b8
--- /dev/null
+++ b/tests/ssl/basic-ssl/tests/basic-ssl-success/init-user-data/preferences.json
@@ -0,0 +1,16 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": ["{{projectRoot}}/tests/ssl/basic-ssl/collections/badssl"],
+  "preferences": {
+		"request": {
+			"sslVerification": true,
+			"customCaCertificate": {
+				"enabled": false,
+				"filePath": ""
+			},
+			"keepDefaultCaCertificates": {
+				"enabled": true
+			}
+		}
+  }
+}
\ No newline at end of file
diff --git a/tests/ssl/basic-ssl/tests/self-signed-rejected/init-user-data/preferences.json b/tests/ssl/basic-ssl/tests/self-signed-rejected/init-user-data/preferences.json
new file mode 100644
index 000000000..52696e791
--- /dev/null
+++ b/tests/ssl/basic-ssl/tests/self-signed-rejected/init-user-data/preferences.json
@@ -0,0 +1,16 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": ["{{projectRoot}}/tests/ssl/basic-ssl/collections/self-signed-badssl"],
+  "preferences": {
+		"request": {
+			"sslVerification": true,
+			"customCaCertificate": {
+				"enabled": false,
+				"filePath": ""
+			},
+			"keepDefaultCaCertificates": {
+				"enabled": true
+			}
+		}
+  }
+}
\ 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
new file mode 100644
index 000000000..f2165121b
--- /dev/null
+++ b/tests/ssl/basic-ssl/tests/self-signed-rejected/self-signed-rejected.spec.ts
@@ -0,0 +1,59 @@
+import { test, expect } from '../../../../../playwright';
+
+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));
+  });
+
+  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));
+  });
+});
\ No newline at end of file
diff --git a/tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/init-user-data/preferences.json b/tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/init-user-data/preferences.json
new file mode 100644
index 000000000..a03d40903
--- /dev/null
+++ b/tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/init-user-data/preferences.json
@@ -0,0 +1,16 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": ["{{projectRoot}}/tests/ssl/basic-ssl/collections/self-signed-badssl"],
+  "preferences": {
+		"request": {
+			"sslVerification": false,
+			"customCaCertificate": {
+				"enabled": false,
+				"filePath": ""
+			},
+			"keepDefaultCaCertificates": {
+				"enabled": true
+			}
+		}
+  }
+}
\ 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
new file mode 100644
index 000000000..d8edf5a0a
--- /dev/null
+++ b/tests/ssl/basic-ssl/tests/self-signed-success-with-validation-disabled/self-signed-success-with-validation-disabled.spec.ts
@@ -0,0 +1,59 @@
+import { test, expect } from '../../../../../playwright';
+
+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));
+  });
+
+  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));
+  });
+});
\ No newline at end of file
diff --git a/tests/ssl/custom-ca-certs/collection/bruno.json b/tests/ssl/custom-ca-certs/collection/bruno.json
new file mode 100644
index 000000000..09f421e5f
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/collection/bruno.json
@@ -0,0 +1,6 @@
+{
+  "version": "1",
+  "name": "custom-ca-certs",
+  "type": "collection",
+  "ignore": ["node_modules", ".git"]
+} 
\ No newline at end of file
diff --git a/tests/ssl/custom-ca-certs/collection/package.json b/tests/ssl/custom-ca-certs/collection/package.json
new file mode 100644
index 000000000..c7809059c
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/collection/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "custom-ca-certs",
+  "version": "1.0.0",
+  "description": "Bruno test collection for CA certificates and HTTPS server testing"
+} 
\ No newline at end of file
diff --git a/tests/ssl/custom-ca-certs/collection/request.bru b/tests/ssl/custom-ca-certs/collection/request.bru
new file mode 100644
index 000000000..aecdea35e
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/collection/request.bru
@@ -0,0 +1,16 @@
+meta {
+  name: request
+  type: http
+  seq: 6
+}
+
+get {
+  url: https://localhost:8090
+  body: none
+  auth: inherit
+}
+
+assert {
+  res.status: eq 200
+  res.body: eq helloworld
+}
diff --git a/tests/ssl/custom-ca-certs/server/.gitignore b/tests/ssl/custom-ca-certs/server/.gitignore
new file mode 100644
index 000000000..1503cc8a5
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/server/.gitignore
@@ -0,0 +1 @@
+certs
\ 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
new file mode 100644
index 000000000..259a4f25e
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/server/helpers/certs.js
@@ -0,0 +1,225 @@
+const { execCommand, execCommandSilent, detectPlatform } = require('./platform');
+const fs = require('node:fs');
+const path = require('node:path');
+
+function createCertsDir(certsDir) {
+  if (fs.existsSync(certsDir)) {
+    fs.rmSync(certsDir, { recursive: true, force: true });
+  }
+  fs.mkdirSync(certsDir, { recursive: true });
+}
+
+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
+x509_extensions = v3_ca
+prompt = no
+
+[req_distinguished_name]
+C = US
+ST = Dev
+L = Local
+O = Local Dev CA
+CN = Local Dev CA
+
+[v3_ca]
+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
+prompt = no
+
+[req_distinguished_name]
+C = US
+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
+req_extensions = v3_req
+prompt = no
+
+[req_distinguished_name]
+C = Country Name
+ST = State or Province Name
+L = Locality Name
+O = Organization Name
+CN = Common Name
+
+[v3_req]
+keyUsage = critical, keyEncipherment, dataEncipherment, digitalSignature
+extendedKeyUsage = serverAuth
+subjectAltName = @alt_names
+basicConstraints = critical, CA:FALSE
+authorityKeyIdentifier = keyid:always,issuer:always
+
+[alt_names]
+DNS.1 = localhost
+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 => {
+    const filePath = path.join(certsDir, file);
+    if (fs.existsSync(filePath)) fs.unlinkSync(filePath);
+  });
+  
+  // Validate certificate chain
+  validateCertificateChain(certsDir);
+}
+
+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);
+    throw new Error(`Certificate validation failed: ${error.message}`);
+  }
+}
+
+function addCAToTruststore(certsDir) {
+  const platform = detectPlatform();
+
+  switch (platform) {
+    case 'macos': {
+      const macCertPath = path.join(certsDir, 'ca-cert.pem');
+      execCommand(`sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain "${macCertPath}"`);
+      break;
+    }
+
+    case 'linux': {
+      const linuxCertPath = path.join(certsDir, 'ca-cert.pem');
+      execCommand(`sudo cp "${linuxCertPath}" /usr/local/share/ca-certificates/bruno-ca.crt`);
+      execCommand('sudo update-ca-certificates');
+      break;
+    }
+
+    case 'windows': {
+      const winCertPath = path.join(certsDir, 'ca-cert.der');
+
+      // Escape backslashes for PowerShell
+      const psPath = winCertPath.replace(/\\/g, '\\\\');
+
+      // PowerShell .NET method (works reliably in CI)
+      const psCommand = [
+        `$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2('${psPath}');`,
+        `$store = New-Object System.Security.Cryptography.X509Certificates.X509Store('Root','LocalMachine');`,
+        `$store.Open('ReadWrite');`,
+        `$store.Add($cert);`,
+        `$store.Close();`,
+        // Verify cert was added by checking if it exists in LocalMachine\Root
+        `$verifyStore = New-Object System.Security.Cryptography.X509Certificates.X509Store('Root','LocalMachine');`,
+        `$verifyStore.Open('ReadOnly');`,
+        `$found = $verifyStore.Certificates | Where-Object { $_.Thumbprint -eq $cert.Thumbprint };`,
+        `$verifyStore.Close();`,
+        `if (-not $found) { throw 'Certificate was not added to LocalMachine\Root' };`
+      ].join(' ');
+
+      execCommand(`powershell -Command "${psCommand}"`);
+      break;
+    }
+
+    default:
+      throw new Error(`Unsupported platform: ${platform}`);
+  }
+}
+
+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);
+    if (!fs.existsSync(filePath)) {
+      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'];
+    for (const file of windowsFiles) {
+      const filePath = path.join(certsDir, file);
+      if (fs.existsSync(filePath)) {
+        console.log(`✅ Windows certificate file available: ${file}`);
+      } else {
+        console.log(`⚠️ Windows certificate file missing (but not required): ${file}`);
+      }
+    }
+  }
+}
+
+module.exports = {
+  createCertsDir,
+  generateCertificates,
+  addCAToTruststore,
+  verifyCertificates
+};
+
diff --git a/tests/ssl/custom-ca-certs/server/helpers/platform.js b/tests/ssl/custom-ca-certs/server/helpers/platform.js
new file mode 100644
index 000000000..b1c88882e
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/server/helpers/platform.js
@@ -0,0 +1,60 @@
+const { execSync } = require('node:child_process');
+const os = require('node:os');
+
+function execCommand(command, cwd = process.cwd()) {
+  return execSync(command, { 
+    cwd, 
+    stdio: 'inherit',
+    timeout: 30000 
+  });
+}
+
+function execCommandSilent(command, cwd = process.cwd()) {
+  return execSync(command, { 
+    cwd, 
+    stdio: 'pipe',
+    timeout: 30000 
+  });
+}
+
+function detectPlatform() {
+  const platform = os.platform();
+  switch (platform) {
+    case 'darwin': return 'macos';
+    case 'linux': return 'linux';
+    case 'win32': return 'windows';
+    default: throw new Error(`Unsupported platform: ${platform}`);
+  }
+}
+
+function killProcessOnPort(port) {
+  const platform = detectPlatform();
+  
+  try {
+    switch (platform) {
+      case 'macos':
+        execCommand(`lsof -ti :${port} | xargs kill -9`);
+        break;
+      case 'linux':
+        execCommand(`lsof -ti :${port} | xargs kill -9`);
+        break;
+      case 'windows':
+        const result = execCommandSilent(`netstat -ano | findstr :${port}`);
+        const lines = result.toString().split('\n');
+        for (const line of lines) {
+          const match = line.trim().match(/\s+(\d+)$/);
+          if (match) {
+            execCommandSilent(`taskkill /F /PID ${match[1]}`);
+          }
+        }
+        break;
+    }
+  } catch (error) {}
+}
+
+module.exports = {
+  execCommand,
+  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
new file mode 100644
index 000000000..4f22a7a7d
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/server/index.js
@@ -0,0 +1,74 @@
+#!/usr/bin/env node
+
+const path = require('node:path');
+const fs = require('node:fs');
+const https = require('node:https');
+const { killProcessOnPort } = require('./helpers/platform');
+
+function createServer(certsDir, port = 8090) {
+  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');
+    res.end('helloworld');
+  });
+
+  return new Promise((resolve, reject) => {
+    server.listen(port, (error) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve(server);
+      }
+    });
+  });
+}
+
+function shutdownServer(server, cleanup) {
+  const shutdown = (signal) => {
+    console.log(`🛑 Received ${signal}, shutting down`);
+    
+    if (cleanup) cleanup();
+    
+    if (server) {
+      server.close(() => process.exit(0));
+    } else {
+      process.exit(0);
+    }
+  };
+
+  process.on('SIGINT', () => shutdown('SIGINT'));
+  process.on('SIGTERM', () => shutdown('SIGTERM'));
+}
+
+async function startServer() {
+  const certsDir = path.join(__dirname, 'certs');
+  const port = 8090;
+
+  console.log('🚀 Starting HTTPS test server');
+
+  try {
+    killProcessOnPort(port);
+
+    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);
+  }
+}
+
+if (require.main === module) {
+  startServer();
+}
+
+module.exports = { startServer };
\ No newline at end of file
diff --git a/tests/ssl/custom-ca-certs/server/readme.md b/tests/ssl/custom-ca-certs/server/readme.md
new file mode 100644
index 000000000..4a3757e96
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/server/readme.md
@@ -0,0 +1,106 @@
+# CA Certificates Test Server
+
+A Node.js HTTPS test server with self-signed certificate generation for testing SSL/TLS connections in Bruno.
+
+## Overview
+
+This server provides two main functionalities:
+1. **Certificate Generation** - Creates a complete CA certificate chain for testing
+2. **HTTPS Server** - Runs a secure server using the generated certificates
+
+## Usage
+
+### 1. Generate Certificates
+
+Generate the required CA certificates and add them to your system's truststore:
+
+```bash
+node scripts/generate-certs.js
+```
+
+This will:
+- Create a `certs/` directory
+- Generate CA certificate, server certificate, and private keys
+- Verify the certificate chain
+- Add the CA certificate to your system's truststore (macOS/Linux/Windows)
+
+**Generated Files:**
+- `certs/ca-cert.pem` - Certificate Authority certificate
+- `certs/ca-key.pem` - CA private key
+- `certs/localhost-cert.pem` - Server certificate for localhost
+- `certs/localhost-key.pem` - Server private key
+
+**Windows-Specific Files (automatically generated on Windows):**
+- `certs/ca-cert.der` - CA certificate in DER format (for Windows certificate store)
+- `certs/localhost.p12` - PKCS#12 bundle containing server certificate and key
+- `certs/localhost-cert.der` - Server certificate in DER format
+
+### Certificate Installation Details
+
+The certificate generation script automatically adds the CA certificate to your system's truststore:
+
+**macOS:** Uses `security add-trusted-cert` to add the CA to the System keychain
+**Linux:** Copies the CA certificate to `/usr/local/share/ca-certificates/` and runs `update-ca-certificates`
+**Windows:** Uses PowerShell to add the CA certificate to the LocalMachine\Root certificate store
+
+> **Note:** On Windows, the script requires Administrator privileges to install certificates to the machine-wide certificate store. If you encounter permission issues, run your terminal as Administrator.
+
+### 2. Run HTTPS Server
+
+Start the HTTPS server on port 8090:
+
+```bash
+node index.js
+```
+
+The server will:
+- Load certificates from the `certs/` directory
+- Start an HTTPS server on `https://localhost:8090`
+- Serve a simple "helloworld" response
+- Handle graceful shutdown on SIGINT/SIGTERM
+
+## Testing
+
+Once the server is running, you can test SSL connections:
+
+### Unix/Linux/macOS
+```bash
+# Test with curl
+curl https://localhost:8090
+
+# Test certificate verification
+openssl s_client -connect localhost:8090 -CAfile certs/ca-cert.pem
+```
+
+### Windows
+```powershell
+# Test with curl (if available)
+curl https://localhost:8090
+
+# Test with PowerShell Invoke-WebRequest
+Invoke-WebRequest -Uri https://localhost:8090
+
+# Test certificate verification with OpenSSL
+openssl s_client -connect localhost:8090 -CAfile certs/ca-cert.pem
+
+# Verify certificate is installed in Windows certificate store
+Get-ChildItem -Path Cert:\LocalMachine\Root | Where-Object { $_.Subject -like "*Local Dev CA*" }
+
+# Test with .NET WebClient (alternative method)
+$client = New-Object System.Net.WebClient
+$client.DownloadString("https://localhost:8090")
+```
+
+## File Structure
+
+```
+server/
+├── index.js              # Main HTTPS server
+├── scripts/
+│   └── generate-certs.js  # Certificate generation script
+├── helpers/
+│   ├── certs.js          # Certificate management utilities
+│   └── platform.js       # Platform-specific utilities
+├── certs/                # Generated certificates (created by script)
+└── readme.md            # This file
+```
diff --git a/tests/ssl/custom-ca-certs/server/scripts/generate-certs.js b/tests/ssl/custom-ca-certs/server/scripts/generate-certs.js
new file mode 100644
index 000000000..f470f77b8
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/server/scripts/generate-certs.js
@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+
+const path = require('node:path');
+const {
+  createCertsDir,
+  generateCertificates,
+  addCAToTruststore,
+  verifyCertificates
+} = require('../helpers/certs');
+
+/**
+ * Setup CA certificates for testing server
+ */
+async function setup() {
+  console.log('🔧 Setting up CA certificates for test server');
+  
+  const certsDir = path.join(__dirname, '..', 'certs');
+
+  try {
+    console.log('📁 Creating certificates directory');
+    createCertsDir(certsDir);
+
+    console.log('🔐 Generating certificates');
+    generateCertificates(certsDir);
+
+    console.log('✅ Verifying certificates');
+    verifyCertificates(certsDir);
+
+    console.log('🛡️ Adding CA to truststore');
+    addCAToTruststore(certsDir);
+
+    console.log('🎉 CA certificate setup completed successfully');
+    return true;
+  } catch (error) {
+    console.error('❌ Generate certs failed:', error.message);
+    throw error;
+  }
+}
+
+if (require.main === module) {
+  setup()
+    .then(() => process.exit(0))
+    .catch(() => process.exit(1));
+}
+
+module.exports = { setup };
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
new file mode 100644
index 000000000..5ff1e72db
--- /dev/null
+++ 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
@@ -0,0 +1,57 @@
+import { test, expect } from '../../../../../playwright';
+
+test.describe.serial('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));
+  });
+
+  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));
+  });
+});
\ No newline at end of file
diff --git a/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/init-user-data/preferences.json b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/init-user-data/preferences.json
new file mode 100644
index 000000000..452b90b10
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config-with-defaults/init-user-data/preferences.json
@@ -0,0 +1,16 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": ["{{projectRoot}}/tests/ssl/custom-ca-certs/collection"],
+  "preferences": {
+		"request": {
+			"sslVerification": true,
+			"customCaCertificate": {
+				"enabled": true,
+				"filePath": "{{projectRoot}}/tests/ssl/custom-ca-certs/server/certs/ca-key.pem"
+			},
+			"keepDefaultCaCertificates": {
+				"enabled": true
+			}
+		}
+  }
+}
\ 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
new file mode 100644
index 000000000..9d89e0bc4
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/custom-invalid-ca-cert-in-config.spec.ts
@@ -0,0 +1,57 @@
+import { test, expect } from '../../../../../playwright';
+
+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));
+  });
+
+  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));
+  });
+});
\ No newline at end of file
diff --git a/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/init-user-data/preferences.json b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/init-user-data/preferences.json
new file mode 100644
index 000000000..a1f944aa7
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/tests/custom-invalid-ca-cert-in-config/init-user-data/preferences.json
@@ -0,0 +1,16 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": ["{{projectRoot}}/tests/ssl/custom-ca-certs/collection"],
+  "preferences": {
+		"request": {
+			"sslVerification": true,
+			"customCaCertificate": {
+				"enabled": true,
+				"filePath": "{{projectRoot}}/tests/ssl/custom-ca-certs/server/certs/ca-key.pem"
+			},
+			"keepDefaultCaCertificates": {
+				"enabled": false
+			}
+		}
+  }
+}
\ 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
new file mode 100644
index 000000000..97db83b44
--- /dev/null
+++ 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
@@ -0,0 +1,57 @@
+import { test, expect } from '../../../../../playwright';
+
+test.describe.serial('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));
+  });
+
+  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));
+  });
+});
\ No newline at end of file
diff --git a/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/init-user-data/preferences.json b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/init-user-data/preferences.json
new file mode 100644
index 000000000..b252fec6b
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config-with-defaults/init-user-data/preferences.json
@@ -0,0 +1,16 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": ["{{projectRoot}}/tests/ssl/custom-ca-certs/collection"],
+  "preferences": {
+		"request": {
+			"sslVerification": true,
+			"customCaCertificate": {
+				"enabled": true,
+				"filePath": "{{projectRoot}}/tests/ssl/custom-ca-certs/server/certs/ca-cert.pem"
+			},
+			"keepDefaultCaCertificates": {
+				"enabled": true
+			}
+		}
+  }
+}
\ 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
new file mode 100644
index 000000000..35a7776b2
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/custom-valid-ca-cert-in-config.spec.ts
@@ -0,0 +1,57 @@
+import { test, expect } from '../../../../../playwright';
+
+test.describe.serial('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));
+  });
+
+  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));
+  });
+});
\ No newline at end of file
diff --git a/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/init-user-data/preferences.json b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/init-user-data/preferences.json
new file mode 100644
index 000000000..33608d333
--- /dev/null
+++ b/tests/ssl/custom-ca-certs/tests/custom-valid-ca-cert-in-config/init-user-data/preferences.json
@@ -0,0 +1,16 @@
+{
+  "maximized": true,
+  "lastOpenedCollections": ["{{projectRoot}}/tests/ssl/custom-ca-certs/collection"],
+  "preferences": {
+		"request": {
+			"sslVerification": true,
+			"customCaCertificate": {
+				"enabled": true,
+				"filePath": "{{projectRoot}}/tests/ssl/custom-ca-certs/server/certs/ca-cert.pem"
+			},
+			"keepDefaultCaCertificates": {
+				"enabled": false
+			}
+		}
+  }
+}
\ No newline at end of file

From a6b0b6c1172682e559767a550d0eea879b2240fa Mon Sep 17 00:00:00 2001
From: lohit <lohit@usebruno.com>
Date: Mon, 8 Sep 2025 06:09:25 +0530
Subject: [PATCH 08/18] node vm support (#5518)

Co-authored-by: Its-Treason <39559178+Its-treason@users.noreply.github.com>
---
 .../src/components/Preferences/Beta/index.js  |   7 +-
 packages/bruno-app/src/utils/beta-features.js |   3 +-
 .../bruno-electron/src/ipc/network/index.js   |  11 +-
 .../bruno-electron/src/store/preferences.js   |   6 +-
 packages/bruno-js/src/index.js                |   4 +-
 .../bruno-js/src/runtime/script-runtime.js    |  43 ++++
 packages/bruno-js/src/runtime/test-runtime.js |   8 +
 .../bruno-js/src/sandbox/node-vm/index.js     | 233 ++++++++++++++++++
 8 files changed, 309 insertions(+), 6 deletions(-)
 create mode 100644 packages/bruno-js/src/sandbox/node-vm/index.js

diff --git a/packages/bruno-app/src/components/Preferences/Beta/index.js b/packages/bruno-app/src/components/Preferences/Beta/index.js
index 4c74bfbd6..fe88fbe98 100644
--- a/packages/bruno-app/src/components/Preferences/Beta/index.js
+++ b/packages/bruno-app/src/components/Preferences/Beta/index.js
@@ -14,6 +14,11 @@ const BETA_FEATURES = [
     id: 'grpc',
     label: 'gRPC Support',
     description: 'Enable gRPC request support for making gRPC calls to services'
+  },
+  {
+    id: 'nodevm',
+    label: 'Node VM Runtime',
+    description: 'Enable Node VM runtime for JavaScript execution in Developer Mode'
   }
 ];
 
@@ -68,7 +73,7 @@ const Beta = ({ close }) => {
       .catch((err) => console.log(err) && toast.error('Failed to update beta preferences'));
   };
 
-  const hasAnyBetaFeatures = Object.values(formik.values).length > 0;
+  const hasAnyBetaFeatures = BETA_FEATURES.length > 0;
 
   return (
     <StyledWrapper>
diff --git a/packages/bruno-app/src/utils/beta-features.js b/packages/bruno-app/src/utils/beta-features.js
index 40c7635d6..624a147dc 100644
--- a/packages/bruno-app/src/utils/beta-features.js
+++ b/packages/bruno-app/src/utils/beta-features.js
@@ -5,7 +5,8 @@ import { useSelector } from 'react-redux';
  * Contains all available beta feature keys
  */
 export const BETA_FEATURES = Object.freeze({
-  GRPC: 'grpc'
+  GRPC: 'grpc',
+  NODE_VM: 'nodevm'
 });
 
 /**
diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js
index 5ae010bc2..fe67fb76f 100644
--- a/packages/bruno-electron/src/ipc/network/index.js
+++ b/packages/bruno-electron/src/ipc/network/index.js
@@ -52,7 +52,16 @@ const saveCookies = (url, headers) => {
 
 const getJsSandboxRuntime = (collection) => {
   const securityConfig = get(collection, 'securityConfig', {});
-  return securityConfig.jsSandboxMode === 'safe' ? 'quickjs' : 'vm2';
+
+  if (securityConfig.jsSandboxMode === 'safe') {
+    return 'quickjs';
+  }
+
+  if (preferencesUtil.isBetaFeatureEnabled('nodevm')) {
+    return 'nodevm';
+  }
+
+  return 'vm2';
 };
 
 const configureRequest = async (
diff --git a/packages/bruno-electron/src/store/preferences.js b/packages/bruno-electron/src/store/preferences.js
index e711e5309..bf2fde374 100644
--- a/packages/bruno-electron/src/store/preferences.js
+++ b/packages/bruno-electron/src/store/preferences.js
@@ -42,7 +42,8 @@ const defaultPreferences = {
     responsePaneOrientation: 'horizontal'
   },
   beta: {
-    grpc: false
+    grpc: false,
+    nodevm: false
   }
 };
 
@@ -80,7 +81,8 @@ const preferencesSchema = Yup.object().shape({
     responsePaneOrientation: Yup.string().oneOf(['horizontal', 'vertical'])
   }),
   beta: Yup.object({
-    grpc: Yup.boolean()
+    grpc: Yup.boolean(),
+    nodevm: Yup.boolean()
   })
 });
 
diff --git a/packages/bruno-js/src/index.js b/packages/bruno-js/src/index.js
index fe6447cfb..06c3a6504 100644
--- a/packages/bruno-js/src/index.js
+++ b/packages/bruno-js/src/index.js
@@ -2,10 +2,12 @@ const ScriptRuntime = require('./runtime/script-runtime');
 const TestRuntime = require('./runtime/test-runtime');
 const VarsRuntime = require('./runtime/vars-runtime');
 const AssertRuntime = require('./runtime/assert-runtime');
+const { runScriptInNodeVm } = require('./sandbox/node-vm');
 
 module.exports = {
   ScriptRuntime,
   TestRuntime,
   VarsRuntime,
-  AssertRuntime
+  AssertRuntime,
+  runScriptInNodeVm
 };
diff --git a/packages/bruno-js/src/runtime/script-runtime.js b/packages/bruno-js/src/runtime/script-runtime.js
index 7a9b1a5bc..145a08b96 100644
--- a/packages/bruno-js/src/runtime/script-runtime.js
+++ b/packages/bruno-js/src/runtime/script-runtime.js
@@ -14,6 +14,7 @@ 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');
@@ -111,6 +112,27 @@ class ScriptRuntime {
       context.bru.runRequest = runRequestByItemPathname;
     }
 
+    if (this.runtime === 'nodevm') {
+      const result = await runScriptInNodeVm({
+        script,
+        context,
+        collectionPath,
+        scriptingConfig
+      });
+
+      return {
+        request,
+        envVariables: cleanJson(result.envVariables),
+        runtimeVariables: cleanJson(result.runtimeVariables),
+        persistentEnvVariables: bru.persistentEnvVariables,
+        globalEnvironmentVariables: cleanJson(globalEnvironmentVariables),
+        results: cleanJson(result.results),
+        nextRequestName: result.nextRequestName,
+        skipRequest: bru.skipRequest,
+        stopExecution: bru.stopExecution
+      };
+    }
+
     if (this.runtime === 'quickjs') {
       await executeQuickJsVmAsync({
         script: script,
@@ -260,6 +282,27 @@ class ScriptRuntime {
       context.bru.runRequest = runRequestByItemPathname;
     }
 
+    if (this.runtime === 'nodevm') {
+      const result = await runScriptInNodeVm({
+        script,
+        context,
+        collectionPath,
+        scriptingConfig
+      });
+
+      return {
+        response,
+        envVariables: cleanJson(result.envVariables),
+        persistentEnvVariables: cleanJson(bru.persistentEnvVariables),
+        runtimeVariables: cleanJson(result.runtimeVariables),
+        globalEnvironmentVariables: cleanJson(globalEnvironmentVariables),
+        results: cleanJson(result.results),
+        nextRequestName: result.nextRequestName,
+        skipRequest: bru.skipRequest,
+        stopExecution: bru.stopExecution
+      };
+    }
+
     if (this.runtime === 'quickjs') {
       await executeQuickJsVmAsync({
         script: script,
diff --git a/packages/bruno-js/src/runtime/test-runtime.js b/packages/bruno-js/src/runtime/test-runtime.js
index ae4e2c963..de8e37ba1 100644
--- a/packages/bruno-js/src/runtime/test-runtime.js
+++ b/packages/bruno-js/src/runtime/test-runtime.js
@@ -1,4 +1,5 @@
 const { NodeVM } = require('@usebruno/vm2');
+const { runScriptInNodeVm } = require('../sandbox/node-vm');
 const chai = require('chai');
 const path = require('path');
 const http = require('http');
@@ -132,6 +133,13 @@ class TestRuntime {
           script: testsFile,
           context: context
         });
+      } else if (this.runtime === 'nodevm') {
+        await runScriptInNodeVm({
+          script: testsFile,
+          context,
+          collectionPath,
+          scriptingConfig
+        });
       } else {
         // default runtime is vm2
         const vm = new NodeVM({
diff --git a/packages/bruno-js/src/sandbox/node-vm/index.js b/packages/bruno-js/src/sandbox/node-vm/index.js
new file mode 100644
index 000000000..5f5b488fe
--- /dev/null
+++ b/packages/bruno-js/src/sandbox/node-vm/index.js
@@ -0,0 +1,233 @@
+const vm = require('node:vm');
+const fs = require('node:fs');
+const path = require('node:path');
+const { get } = require('lodash');
+const lodash = require('lodash');
+const { cleanJson } = require('../../utils');
+
+class ScriptError extends Error {
+  constructor(error, script) {
+    super(error.message);
+    this.name = 'ScriptError';
+    this.originalError = error;
+    this.script = script;
+    this.stack = error.stack;
+  }
+}
+
+/**
+ * Executes a script in a Node.js VM context with enhanced security and module loading
+ * @param {Object} options - Configuration options
+ * @param {string} options.script - The script code to execute
+ * @param {Object} options.context - The execution context with Bruno objects
+ * @param {string} options.collectionPath - Path to the collection directory
+ * @param {Object} options.scriptingConfig - Scripting configuration options
+ * @returns {Promise<Object>} Execution results including variables and test results
+ * @throws {ScriptError} When script execution fails
+ */
+async function runScriptInNodeVm({
+  script,
+  context,
+  collectionPath,
+  scriptingConfig
+}) {
+  if (script.trim().length === 0) {
+    return {
+      envVariables: cleanJson(context.bru.envVariables),
+      collectionVariables: cleanJson(context.bru.collectionVariables),
+      nextRequestName: context.bru.nextRequest,
+      results: context.__brunoTestResults ? cleanJson(context.__brunoTestResults.getResults()) : null
+    };
+  }
+
+  try {
+    // Create script context with all necessary variables
+    const scriptContext = {
+      // Bruno context
+      console: context.console,
+      req: context.req,
+      res: context.res,
+      bru: context.bru,
+      expect: context.expect,
+      assert: context.assert,
+      __brunoTestResults: context.__brunoTestResults,
+      test: context.test,
+      // Configuration for nested module loading
+      scriptingConfig: scriptingConfig,
+      // Global objects
+      Buffer: global.Buffer,
+      process: global.process,
+      setTimeout: global.setTimeout,
+      setInterval: global.setInterval,
+      clearTimeout: global.clearTimeout,
+      clearInterval: global.clearInterval,
+      setImmediate: global.setImmediate,
+      clearImmediate: global.clearImmediate
+    };
+
+    // Create shared cache for local modules
+    const localModuleCache = new Map();
+
+    // Create a custom require function and add it to the context
+    scriptContext.require = createCustomRequire({
+      scriptingConfig,
+      collectionPath,
+      scriptContext,
+      currentModuleDir: collectionPath,
+      localModuleCache
+    });
+
+    // Execute the script in an isolated VM context
+    await vm.runInNewContext(`
+        (async function(){
+          ${script}
+        })();
+      `, scriptContext, {
+      filename: path.join(collectionPath, 'script.js'),
+      displayErrors: true
+    });
+  } catch (error) {
+    throw new ScriptError(error, script);
+  }
+
+  return {
+    envVariables: cleanJson(context.bru.envVariables),
+    collectionVariables: cleanJson(context.bru.collectionVariables),
+    nextRequestName: context.bru.nextRequest,
+    results: context.__brunoTestResults ? cleanJson(context.__brunoTestResults.getResults()) : null
+  };
+}
+
+
+/**
+ * Creates a custom require function with enhanced security and local module support
+ * @param {Object} options - Configuration options
+ * @param {Object} options.scriptingConfig - Scripting configuration with additional context roots
+ * @param {string} options.collectionPath - Base collection path for security checks
+ * @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
+ * @returns {Function} Custom require function
+ */
+function createCustomRequire({
+  scriptingConfig,
+  collectionPath,
+  scriptContext,
+  currentModuleDir = collectionPath,
+  localModuleCache = new Map()
+}) {
+  const additionalContextRoots = get(scriptingConfig, 'additionalContextRoots', []);
+  const additionalContextRootsAbsolute = lodash
+    .chain(additionalContextRoots)
+    .map((acr) => (acr.startsWith('/') ? acr : path.join(collectionPath, acr)))
+    .value();
+  additionalContextRootsAbsolute.push(collectionPath);
+
+  return (moduleName) => {
+    // Check if it's a local module (starts with ./ or ../)
+    if (moduleName.startsWith('./') || moduleName.startsWith('../')) {
+      return loadLocalModule({ moduleName, collectionPath, scriptContext, localModuleCache, currentModuleDir });
+    }
+
+    // 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'}`);
+      }
+    }
+  };
+}
+
+/**
+ * Loads a local module from the filesystem with security checks and caching
+ * @param {Object} options - Configuration options
+ * @param {string} options.moduleName - Name/path of the module to load
+ * @param {string} options.collectionPath - Base collection path for security validation
+ * @param {Object} options.scriptContext - Script execution context to inherit
+ * @param {Map} options.localModuleCache - Cache for loaded modules
+ * @param {string} options.currentModuleDir - Directory of the current module for relative resolution
+ * @returns {*} The exported content of the loaded module
+ * @throws {Error} When module is outside collection path or cannot be loaded
+ */
+function loadLocalModule({
+  moduleName,
+  collectionPath,
+  scriptContext,
+  localModuleCache,
+  currentModuleDir
+}) {
+  // Check if the filename has an extension
+  const hasExtension = path.extname(moduleName) !== '';
+  const resolvedFilename = hasExtension ? moduleName : `${moduleName}.js`;
+
+  // Resolve the file path relative to the current module's directory
+  const filePath = path.resolve(currentModuleDir, resolvedFilename);
+  const normalizedFilePath = path.normalize(filePath);
+  const normalizedCollectionPath = path.normalize(collectionPath);
+
+  // Cross-platform security check: ensure the resolved file is within collectionPath
+  const relativePath = path.relative(normalizedCollectionPath, normalizedFilePath);
+  if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
+    throw new Error(`Access to files outside of the collectionPath is not allowed: ${moduleName}`);
+  }
+
+  // Check cache first (use normalized path as key)
+  if (localModuleCache.has(normalizedFilePath)) {
+    return localModuleCache.get(normalizedFilePath);
+  }
+
+  if (!fs.existsSync(normalizedFilePath)) {
+    throw new Error(`Cannot find module ${moduleName}`);
+  }
+
+  // Read and execute the local module
+  const moduleCode = fs.readFileSync(normalizedFilePath, 'utf8');
+
+  // Create module object
+  const moduleObj = { exports: {} };
+
+  // Get the directory of this module for nested imports
+  const moduleDir = path.dirname(normalizedFilePath);
+
+  // Create a new context that inherits from the script context
+  const moduleContext = {
+    ...scriptContext,
+    module: moduleObj,
+    exports: moduleObj.exports,
+    __filename: normalizedFilePath,
+    __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
+    })
+  };
+
+  try {
+    // Execute the module code in the shared context
+    vm.runInNewContext(moduleCode, moduleContext, {
+      filename: normalizedFilePath,
+      displayErrors: true
+    });
+
+    // Cache the result using normalized path
+    localModuleCache.set(normalizedFilePath, moduleObj.exports);
+
+    return moduleObj.exports;
+  } catch (error) {
+    throw new Error(`Error loading local module ${moduleName}: ${error.message}`);
+  }
+}
+
+module.exports = {
+  runScriptInNodeVm
+};

From 5b716cbe60eff14e7ff8cc7689324b29fe1aaccd Mon Sep 17 00:00:00 2001
From: lohit <lohit@usebruno.com>
Date: Mon, 8 Sep 2025 06:39:18 +0530
Subject: [PATCH 09/18] node vm fixes (#5519)

---
 .../bruno-js/src/runtime/script-runtime.js    | 20 +++++++++----------
 .../bruno-js/src/sandbox/node-vm/index.js     | 14 ++-----------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/packages/bruno-js/src/runtime/script-runtime.js b/packages/bruno-js/src/runtime/script-runtime.js
index 145a08b96..83ef18276 100644
--- a/packages/bruno-js/src/runtime/script-runtime.js
+++ b/packages/bruno-js/src/runtime/script-runtime.js
@@ -113,7 +113,7 @@ class ScriptRuntime {
     }
 
     if (this.runtime === 'nodevm') {
-      const result = await runScriptInNodeVm({
+      await runScriptInNodeVm({
         script,
         context,
         collectionPath,
@@ -122,12 +122,12 @@ class ScriptRuntime {
 
       return {
         request,
-        envVariables: cleanJson(result.envVariables),
-        runtimeVariables: cleanJson(result.runtimeVariables),
+        envVariables: cleanJson(envVariables),
+        runtimeVariables: cleanJson(runtimeVariables),
         persistentEnvVariables: bru.persistentEnvVariables,
         globalEnvironmentVariables: cleanJson(globalEnvironmentVariables),
-        results: cleanJson(result.results),
-        nextRequestName: result.nextRequestName,
+        results: cleanJson(__brunoTestResults.getResults()),
+        nextRequestName: bru.nextRequest,
         skipRequest: bru.skipRequest,
         stopExecution: bru.stopExecution
       };
@@ -283,7 +283,7 @@ class ScriptRuntime {
     }
 
     if (this.runtime === 'nodevm') {
-      const result = await runScriptInNodeVm({
+      await runScriptInNodeVm({
         script,
         context,
         collectionPath,
@@ -292,12 +292,12 @@ class ScriptRuntime {
 
       return {
         response,
-        envVariables: cleanJson(result.envVariables),
+        envVariables: cleanJson(envVariables),
         persistentEnvVariables: cleanJson(bru.persistentEnvVariables),
-        runtimeVariables: cleanJson(result.runtimeVariables),
+        runtimeVariables: cleanJson(runtimeVariables),
         globalEnvironmentVariables: cleanJson(globalEnvironmentVariables),
-        results: cleanJson(result.results),
-        nextRequestName: result.nextRequestName,
+        results: cleanJson(__brunoTestResults.getResults()),
+        nextRequestName: bru.nextRequest,
         skipRequest: bru.skipRequest,
         stopExecution: bru.stopExecution
       };
diff --git a/packages/bruno-js/src/sandbox/node-vm/index.js b/packages/bruno-js/src/sandbox/node-vm/index.js
index 5f5b488fe..82dd71702 100644
--- a/packages/bruno-js/src/sandbox/node-vm/index.js
+++ b/packages/bruno-js/src/sandbox/node-vm/index.js
@@ -32,12 +32,7 @@ async function runScriptInNodeVm({
   scriptingConfig
 }) {
   if (script.trim().length === 0) {
-    return {
-      envVariables: cleanJson(context.bru.envVariables),
-      collectionVariables: cleanJson(context.bru.collectionVariables),
-      nextRequestName: context.bru.nextRequest,
-      results: context.__brunoTestResults ? cleanJson(context.__brunoTestResults.getResults()) : null
-    };
+    return;
   }
 
   try {
@@ -90,12 +85,7 @@ async function runScriptInNodeVm({
     throw new ScriptError(error, script);
   }
 
-  return {
-    envVariables: cleanJson(context.bru.envVariables),
-    collectionVariables: cleanJson(context.bru.collectionVariables),
-    nextRequestName: context.bru.nextRequest,
-    results: context.__brunoTestResults ? cleanJson(context.__brunoTestResults.getResults()) : null
-  };
+  return;
 }
 
 

From 0bce2038515e96c2ffdf53184de240ba46242ac3 Mon Sep 17 00:00:00 2001
From: jayakrishnancn <jayakrishnancn@gmail.com>
Date: Sat, 23 Aug 2025 16:57:42 +0530
Subject: [PATCH 10/18] feat: Move requests between collections #3320

test: update e2e test case for moving request from one collection to another

test: updated the tests

test: added more test cases

test: e2e test updated

test: fixed test case

test: fixed test cause for folder

fix: add grpc-request to clone-folder

fix: removed handleCrossCollectionItemMove method

test: updated e2e test cases

fix: removed cross-collection gurard statement

format: revert format

fix: UX changes for collection drag and drop
---
 ...cross-collection-drag-drop-request.spec.ts | 154 ++++++++++++
 ...-cross-collection-drag-drop-folder.spec.ts | 235 ++++++++++++++++++
 .../Collection/CollectionItem/index.js        |  13 +-
 .../Collections/Collection/StyledWrapper.js   |  11 +-
 .../Sidebar/Collections/Collection/index.js   |  41 +--
 .../ReduxStore/slices/collections/actions.js  |   7 +-
 packages/bruno-electron/src/ipc/collection.js |   2 +-
 7 files changed, 434 insertions(+), 29 deletions(-)
 create mode 100644 e2e-tests/003-collection-management-tests/001-cross-collection-drag-drop-request.spec.ts
 create mode 100644 e2e-tests/003-collection-management-tests/002-cross-collection-drag-drop-folder.spec.ts

diff --git a/e2e-tests/003-collection-management-tests/001-cross-collection-drag-drop-request.spec.ts b/e2e-tests/003-collection-management-tests/001-cross-collection-drag-drop-request.spec.ts
new file mode 100644
index 000000000..8c1efaf59
--- /dev/null
+++ b/e2e-tests/003-collection-management-tests/001-cross-collection-drag-drop-request.spec.ts
@@ -0,0 +1,154 @@
+import { test, expect } from '../../playwright';
+
+test.describe('Cross-Collection Drag and Drop', () => {
+  test('Verify request drag and drop', async ({ pageWithUserData: page, createTmpDir }) => {
+    // Create first collection - click dropdown menu first
+    await page.locator('.dropdown-icon').click();
+    await page.locator('.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();
+
+    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();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Create a request in the first collection
+    await page.locator('#create-new-tab').getByRole('img').click();
+    await page.getByPlaceholder('Request Name').fill('test-request');
+    await page.locator('#new-request-url .CodeMirror').click();
+    await page.locator('textarea').fill('https://httpbin.org/get');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'test-request' })).toBeVisible();
+
+    // Create second collection - click dropdown menu first
+    await page.locator('.dropdown-icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    await page.getByLabel('Name').fill('target-collection');
+    await page.getByLabel('Location').fill(await createTmpDir('target-collection'));
+    await page.getByRole('button', { name: 'Create', exact: true }).click();
+
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' })).toBeVisible();
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' }).click();
+    await page.getByLabel('Safe Mode').check();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'source-collection' })).toBeVisible();
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' })).toBeVisible();
+
+    // Locate the request in source collection
+    const sourceRequest = page.locator('.collection-item-name').filter({ hasText: 'test-request' });
+    await expect(sourceRequest).toBeVisible();
+
+    // Locate the target collection area (the collection name element)
+    const targetCollection = page.locator('.collection-name').filter({ hasText: 'target-collection' });
+    await expect(targetCollection).toBeVisible();
+
+    // Perform drag and drop operation
+    await sourceRequest.dragTo(targetCollection);
+
+    // Verify the request has been moved to the target collection
+    // Click on target collection to expand it if needed
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' }).click();
+
+    // Check that the request now appears under target collection
+    const targetCollectionContainer = page
+      .locator('.collection-name')
+      .filter({ hasText: 'target-collection' })
+      .locator('..');
+    await expect(
+      targetCollectionContainer.locator('.collection-item-name').filter({ hasText: 'test-request' })
+    ).toBeVisible();
+
+    // Verify the request is no longer in the source collection
+    const sourceCollectionContainer = page
+      .locator('.collection-name')
+      .filter({ hasText: 'source-collection' })
+      .locator('..');
+    await expect(
+      sourceCollectionContainer.locator('.collection-item-name').filter({ hasText: 'test-request' })
+    ).not.toBeVisible();
+  });
+
+  test('Expected to show error toast message, when duplicate request found in drop location', async ({
+    pageWithUserData: page,
+    createTmpDir
+  }) => {
+    // Create first collection (source-collection)
+    await page.locator('.dropdown-icon').click();
+    await page.locator('.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();
+
+    // Open collection
+    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();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Create a request in the first collection (request-1)
+    await page.locator('#create-new-tab').getByRole('img').click();
+    await page.getByPlaceholder('Request Name').fill('request-1');
+    await page.locator('#new-request-url .CodeMirror').click();
+    await page.locator('textarea').fill('https://httpbin.org/get');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // check if request-1 is created and visible in sidebar
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'request-1' })).toBeVisible();
+
+    // Create second collection (target-collection)
+    await page.locator('.dropdown-icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    await page.getByLabel('Name').fill('target-collection');
+    await page.getByLabel('Location').fill(await createTmpDir('target-collection'));
+    await page.getByRole('button', { name: 'Create', exact: true }).click();
+
+    // Open collection
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' })).toBeVisible();
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' }).click();
+    await page.getByLabel('Safe Mode').check();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Create a request in the target collection with the same name (request-1)
+    await page.locator('#create-new-tab').getByRole('img').click();
+    await page.getByPlaceholder('Request Name').fill('request-1');
+    await page.locator('#new-request-url .CodeMirror').click();
+    await page.locator('textarea').fill('https://httpbin.org/post');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // Go back to source collection to drag the request
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'source-collection' }).click();
+    const sourceRequest = page.locator('.collection-item-name').filter({ hasText: 'request-1' }).first();
+    await expect(sourceRequest).toBeVisible();
+
+    // Locate the target collection area
+    const targetCollection = page.locator('.collection-name').filter({ hasText: 'target-collection' });
+    await expect(targetCollection).toBeVisible();
+
+    // Perform drag and drop operation to target-collection
+    await sourceRequest.dragTo(targetCollection);
+
+    // check for error toast notification
+    await expect(page.getByText(/Error: Cannot copy.*already exists/i)).toBeVisible();
+
+    // source and target collection request should remain unchanged
+    const targetCollectionContainer = page
+      .locator('.collection-name')
+      .filter({ hasText: 'target-collection' })
+      .locator('..');
+    await expect(
+      targetCollectionContainer.locator('.collection-item-name').filter({ hasText: 'request-1' })
+    ).toBeVisible();
+
+    const sourceCollectionContainer = page
+      .locator('.collection-name')
+      .filter({ hasText: 'source-collection' })
+      .locator('..');
+    await expect(
+      sourceCollectionContainer.locator('.collection-item-name').filter({ hasText: 'request-1' })
+    ).toBeVisible();
+  });
+});
diff --git a/e2e-tests/003-collection-management-tests/002-cross-collection-drag-drop-folder.spec.ts b/e2e-tests/003-collection-management-tests/002-cross-collection-drag-drop-folder.spec.ts
new file mode 100644
index 000000000..d02bf91dc
--- /dev/null
+++ b/e2e-tests/003-collection-management-tests/002-cross-collection-drag-drop-folder.spec.ts
@@ -0,0 +1,235 @@
+import { test, expect } from '../../playwright';
+
+test.describe('Cross-Collection Drag and Drop for folder', () => {
+  test('Verify cross-collection folder drag and drop', async ({ pageWithUserData: page, createTmpDir }) => {
+    // Create first collection - click dropdown menu first
+    await page.locator('.dropdown-icon').click();
+    await page.locator('.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();
+
+    // Wait for collection to appear and click on it
+    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();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Create a folder in the first collection
+    // Look for the collection menu button (usually three dots or similar)
+    await page.locator('.collection-actions').hover();
+    await page.locator('.collection-actions .icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'New Folder' }).click();
+
+    // Fill folder name in the modal
+    await expect(page.locator('#collection-name')).toBeVisible();
+    await page.locator('#collection-name').fill('test-folder');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // Wait for the folder to be created and appear in the sidebar
+    await page.waitForTimeout(2000);
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'test-folder' })).toBeVisible();
+
+    // Add a request to the folder to make it more realistic
+    await page.locator('.collection-item-name').filter({ hasText: 'test-folder' }).click({ button: 'right' });
+    await page.locator('.dropdown-item').filter({ hasText: 'New Request' }).click();
+    await page.getByPlaceholder('Request Name').fill('test-request-in-folder');
+    await page.locator('#new-request-url .CodeMirror').click();
+    await page.locator('textarea').fill('https://httpbin.org/get');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // Wait for the request to be created
+    await page.waitForTimeout(1000);
+
+    // Expand the folder to see the request inside
+    await page.locator('.collection-item-name').filter({ hasText: 'test-folder' }).click();
+    await page.waitForTimeout(500);
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'test-request-in-folder' })).toBeVisible();
+
+    // Create second collection - click dropdown menu first
+    await page.locator('.dropdown-icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    await page.getByLabel('Name').fill('target-collection');
+    await page.getByLabel('Location').fill(await createTmpDir('target-collection'));
+    await page.getByRole('button', { name: 'Create', exact: true }).click();
+
+    // Wait for second collection to appear and click on it
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' })).toBeVisible();
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' }).click();
+    await page.getByLabel('Safe Mode').check();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Wait for both collections to be visible in sidebar
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'source-collection' })).toBeVisible();
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' })).toBeVisible();
+
+    // Locate the folder in source collection
+    const sourceFolder = page.locator('.collection-item-name').filter({ hasText: 'test-folder' });
+    await expect(sourceFolder).toBeVisible();
+
+    // Locate the target collection area (the collection name element)
+    const targetCollection = page.locator('.collection-name').filter({ hasText: 'target-collection' });
+    await expect(targetCollection).toBeVisible();
+
+    // Perform drag and drop operation
+    await sourceFolder.dragTo(targetCollection);
+
+    // Wait for the operation to complete
+    await page.waitForTimeout(3000);
+
+    // Verify the folder has been moved to the target collection
+    // Click on target collection to expand it if needed
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' }).click();
+    await page.waitForTimeout(1000);
+
+    // Check that the folder now appears under target collection
+    const targetCollectionContainer = page
+      .locator('.collection-name')
+      .filter({ hasText: 'target-collection' })
+      .locator('..');
+    await expect(
+      targetCollectionContainer.locator('.collection-item-name').filter({ hasText: 'test-folder' })
+    ).toBeVisible();
+
+    // Expand the moved folder to verify the request inside is also moved
+    await targetCollectionContainer.locator('.collection-item-name').filter({ hasText: 'test-folder' }).click();
+    await page.waitForTimeout(500);
+    await expect(
+      targetCollectionContainer.locator('.collection-item-name').filter({ hasText: 'test-request-in-folder' })
+    ).toBeVisible();
+
+    // Verify the folder is no longer in the source collection
+    const sourceCollectionContainer = page
+      .locator('.collection-name')
+      .filter({ hasText: 'source-collection' })
+      .locator('..');
+    await expect(
+      sourceCollectionContainer.locator('.collection-item-name').filter({ hasText: 'test-folder' })
+    ).not.toBeVisible();
+
+    // Verify the request is also no longer in the source collection
+    await expect(
+      sourceCollectionContainer.locator('.collection-item-name').filter({ hasText: 'test-request-in-folder' })
+    ).not.toBeVisible();
+  });
+
+  test('Verify cross-collection folder drag and drop, a duplicate folder exist. expected to throw error toast', async ({
+    pageWithUserData: page,
+    createTmpDir
+  }) => {
+    // Create first collection (source) - use unique names for this test
+    await page.locator('.dropdown-icon').click();
+    await page.locator('.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();
+
+    // Wait for collection to appear and click on it
+    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();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Create a folder in the first collection
+    await page
+      .locator('.collection-name')
+      .filter({ hasText: 'source-collection' })
+      .locator('..')
+      .locator('.collection-actions')
+      .hover();
+    await page
+      .locator('.collection-name')
+      .filter({ hasText: 'source-collection' })
+      .locator('..')
+      .locator('.collection-actions .icon')
+      .click();
+    await page.locator('.dropdown-item').filter({ hasText: 'New Folder' }).click();
+    await expect(page.locator('#collection-name')).toBeVisible();
+    await page.locator('#collection-name').fill('folder-1');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'folder-1' })).toBeVisible();
+
+    // Add a request to the folder to make it more realistic
+    await page.locator('.collection-item-name').filter({ hasText: 'folder-1' }).click({ button: 'right' });
+    await page.locator('.dropdown-item').filter({ hasText: 'New Request' }).click();
+    await page.getByPlaceholder('Request Name').fill('http-request');
+    await page.locator('#new-request-url .CodeMirror').click();
+    await page.locator('textarea').fill('https://httpbin.org/get');
+    await page.getByRole('button', { name: 'Create' }).click();
+    // Expand the folder to see the request inside
+    await page.locator('.collection-item-name').filter({ hasText: 'folder-1' }).click();
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'http-request' })).toBeVisible();
+
+    // Create second collection (target)
+    await page.locator('.dropdown-icon').click();
+    await page.locator('.dropdown-item').filter({ hasText: 'Create Collection' }).click();
+    await page.getByLabel('Name').fill('target-collection');
+    await page.getByLabel('Location').fill(await createTmpDir('target-collection'));
+    await page.getByRole('button', { name: 'Create', exact: true }).click();
+
+    // Wait for second collection to appear and click on it
+    await expect(page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' })).toBeVisible();
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'target-collection' }).click();
+    await page.getByLabel('Safe Mode').check();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Create a folder with the same name in the target collection
+    await page
+      .locator('.collection-name')
+      .filter({ hasText: 'target-collection' })
+      .locator('..')
+      .locator('.collection-actions')
+      .hover();
+    await page
+      .locator('.collection-name')
+      .filter({ hasText: 'target-collection' })
+      .locator('..')
+      .locator('.collection-actions .icon')
+      .click();
+    await page.locator('.dropdown-item').filter({ hasText: 'New Folder' }).click();
+    await expect(page.locator('#collection-name')).toBeVisible();
+    await page.locator('#collection-name').fill('folder-1');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // Go back to source collection to drag the folder
+    await page.locator('#sidebar-collection-name').filter({ hasText: 'source-collection' }).click();
+
+    // Verify we have the folder to drag in the source collection
+    const sourceFolder = page.locator('.collection-item-name').filter({ hasText: 'folder-1' }).first();
+    await expect(sourceFolder).toBeVisible();
+
+    // Locate the target collection area
+    const targetCollection = page.locator('.collection-name').filter({ hasText: 'target-collection' });
+    await expect(targetCollection).toBeVisible();
+
+    // Perform drag and drop operation
+    await sourceFolder.dragTo(targetCollection);
+
+    // check for error toast notification
+    await expect(page.getByText(/Error: Cannot copy.*already exists/i)).toBeVisible();
+
+    // source and target collection request should remain unchanged
+    const sourceCollectionContainer = page
+      .locator('.collection-name')
+      .filter({ hasText: 'source-collection' })
+      .locator('..');
+    await expect(
+      sourceCollectionContainer.locator('.collection-item-name').filter({ hasText: 'folder-1' })
+    ).toBeVisible();
+    await expect(
+      sourceCollectionContainer.locator('.collection-item-name').filter({ hasText: 'http-request' })
+    ).toBeVisible();
+
+    const targetCollectionContainer = page
+      .locator('.collection-name')
+      .filter({ hasText: 'target-collection' })
+      .locator('..');
+    await expect(
+      targetCollectionContainer.locator('.collection-item-name').filter({ hasText: 'folder-1' })
+    ).toBeVisible();
+    await expect(
+      targetCollectionContainer.locator('.collection-item-name').filter({ hasText: 'http-request' })
+    ).not.toBeVisible();
+  });
+});
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 e7a3a21ea..1b09cb7e3 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
@@ -60,8 +60,8 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
   const [dropType, setDropType] = useState(null); // 'adjacent' or 'inside'
 
   const [{ isDragging }, drag, dragPreview] = useDrag({
-    type: `collection-item-${collectionUid}`,
-    item,
+    type: 'collection-item',
+    item: { ...item, sourceCollectionUid: collectionUid },
     collect: (monitor) => ({
       isDragging: monitor.isDragging()
     }),
@@ -92,10 +92,15 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
 
   const canItemBeDropped = ({ draggedItem, targetItem, dropType }) => {
     const { uid: targetItemUid, pathname: targetItemPathname } = targetItem;
-    const { uid: draggedItemUid, pathname: draggedItemPathname } = draggedItem;
+    const { uid: draggedItemUid, pathname: draggedItemPathname, sourceCollectionUid } = draggedItem;
 
     if (draggedItemUid === targetItemUid) return false;
 
+    // For cross-collection moves, we allow the drop
+    if (sourceCollectionUid !== collectionUid) {
+      return true;
+    }
+
     const newPathname = calculateDraggedItemNewPathname({ draggedItem, targetItem, dropType, collectionPathname });
     if (!newPathname) return false;
 
@@ -105,7 +110,7 @@ const CollectionItem = ({ item, collectionUid, collectionPathname, searchText })
   };
 
   const [{ isOver, canDrop }, drop] = useDrop({
-    accept: `collection-item-${collectionUid}`,
+    accept: 'collection-item',
     hover: (draggedItem, monitor) => {
       const { uid: targetItemUid } = item;
       const { uid: draggedItemUid } = draggedItem;
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 8c1111c29..dc2e05251 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/StyledWrapper.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/StyledWrapper.js
@@ -7,6 +7,7 @@ const Wrapper = styled.div`
     user-select: none;
     padding-left: 8px;
     font-weight: 600;
+    border: ${(props) => props.theme.dragAndDrop.borderStyle} transparent;
 
     .rotate-90 {
       transform: rotateZ(90deg);
@@ -66,6 +67,7 @@ const Wrapper = styled.div`
     }
 
     &.drop-target {
+      border: ${(props) => props.theme.dragAndDrop.borderStyle} ${(props) => props.theme.dragAndDrop.border};
       background-color: ${(props) => props.theme.dragAndDrop.hoverBg};
       transition: ${(props) => props.theme.dragAndDrop.transition};
     }
@@ -95,15 +97,6 @@ const Wrapper = styled.div`
     }
   }
 
-  .collection-name.drop-target {
-    border: ${(props) => props.theme.dragAndDrop.borderStyle} ${(props) => props.theme.dragAndDrop.border};
-    border-radius: 4px;
-    background-color: ${(props) => props.theme.dragAndDrop.hoverBg};
-    margin: -2px;
-    transition: ${(props) => props.theme.dragAndDrop.transition};
-    box-shadow: 0 0 0 2px ${(props) => props.theme.dragAndDrop.hoverBg};
-  }
-
   #sidebar-collection-name {
     white-space: nowrap;
     text-overflow: ellipsis;
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 67ffcb68b..3152bef8c 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/index.js
@@ -34,6 +34,7 @@ const Collection = ({ collection, searchText }) => {
   const [showCloneCollectionModalOpen, setShowCloneCollectionModalOpen] = useState(false);
   const [showShareCollectionModal, setShowShareCollectionModal] = useState(false);
   const [showRemoveCollectionModal, setShowRemoveCollectionModal] = useState(false);
+  const [dropType, setDropType] = useState(null);
   const dispatch = useDispatch();
   const isLoading = areItemsLoading(collection);
   const collectionRef = useRef(null);
@@ -42,7 +43,7 @@ const Collection = ({ collection, searchText }) => {
   
   const menuDropdownTippyRef = useRef();
   const onMenuDropdownCreate = (ref) => (menuDropdownTippyRef.current = ref);
-  const MenuIcon = forwardRef((props, ref) => {
+  const MenuIcon = forwardRef((_props, ref) => {
     return (
       <div ref={ref} className="pr-2">
         <IconDots size={22} />
@@ -101,7 +102,7 @@ const Collection = ({ collection, searchText }) => {
     }
   };
 
-  const handleDoubleClick = (event) => {
+  const handleDoubleClick = (_event) => {
     dispatch(makeTabPermanent({ uid: collection.uid }))
   };
 
@@ -118,7 +119,7 @@ const Collection = ({ collection, searchText }) => {
     e.preventDefault();
   };
 
-  const handleRightClick = (event) => {
+  const handleRightClick = (_event) => {
     const _menuDropdown = menuDropdownTippyRef.current;
     if (_menuDropdown) {
       let menuDropdownBehavior = 'show';
@@ -140,7 +141,7 @@ const Collection = ({ collection, searchText }) => {
   };
 
   const isCollectionItem = (itemType) => {
-    return itemType.startsWith('collection-item');
+    return itemType === 'collection-item';
   };
 
   const [{ isDragging }, drag, dragPreview] = useDrag({
@@ -155,7 +156,17 @@ const Collection = ({ collection, searchText }) => {
   });
   
   const [{ isOver }, drop] = useDrop({
-    accept: ["collection", `collection-item-${collection.uid}`],
+    accept: ["collection", "collection-item"],
+    hover: (_draggedItem, monitor) => {
+      const itemType = monitor.getItemType();
+      if (isCollectionItem(itemType)) {
+        // For collection items, always show full highlight (inside drop)
+        setDropType('inside');
+      } else {
+        // For collections, show line indicator (adjacent drop)
+        setDropType('adjacent');
+      }
+    },
     drop: (draggedItem, monitor) => {
       const itemType = monitor.getItemType();
       if (isCollectionItem(itemType)) {
@@ -163,6 +174,7 @@ const Collection = ({ collection, searchText }) => {
       } else {
         dispatch(moveCollectionAndPersist({draggedItem, targetItem: collection}));
       }
+      setDropType(null);
     },
     canDrop: (draggedItem) => {
       return draggedItem.uid !== collection.uid;
@@ -183,7 +195,8 @@ const Collection = ({ collection, searchText }) => {
   }
 
   const collectionRowClassName = classnames('flex py-1 collection-name items-center', {
-      'item-hovered': isOver,
+      '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
     });
 
@@ -241,7 +254,7 @@ const Collection = ({ collection, searchText }) => {
           <Dropdown onCreate={onMenuDropdownCreate} icon={<MenuIcon />} placement="bottom-start">
             <div
               className="dropdown-item"
-              onClick={(e) => {
+              onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
                 setShowNewRequestModal(true);
               }}
@@ -250,7 +263,7 @@ const Collection = ({ collection, searchText }) => {
             </div>
             <div
               className="dropdown-item"
-              onClick={(e) => {
+              onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
                 setShowNewFolderModal(true);
               }}
@@ -259,7 +272,7 @@ const Collection = ({ collection, searchText }) => {
             </div>
             <div
               className="dropdown-item"
-              onClick={(e) => {
+              onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
                 setShowCloneCollectionModalOpen(true);
               }}
@@ -268,7 +281,7 @@ const Collection = ({ collection, searchText }) => {
             </div>
             <div
               className="dropdown-item"
-              onClick={(e) => {
+              onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
                 ensureCollectionIsMounted();
                 handleRun();
@@ -278,7 +291,7 @@ const Collection = ({ collection, searchText }) => {
             </div>
             <div
               className="dropdown-item"
-              onClick={(e) => {
+              onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
                 setShowRenameCollectionModal(true);
               }}
@@ -287,7 +300,7 @@ const Collection = ({ collection, searchText }) => {
             </div>
             <div
               className="dropdown-item"
-              onClick={(e) => {
+              onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
                 ensureCollectionIsMounted();
                 setShowShareCollectionModal(true);
@@ -297,7 +310,7 @@ const Collection = ({ collection, searchText }) => {
             </div>
             <div
               className="dropdown-item"
-              onClick={(e) => {
+              onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
                 setShowRemoveCollectionModal(true);
               }}
@@ -306,7 +319,7 @@ const Collection = ({ collection, searchText }) => {
             </div>
             <div
               className="dropdown-item"
-              onClick={(e) => {
+              onClick={(_e) => {
                 menuDropdownTippyRef.current.hide();
                 viewCollectionSettings();
               }}
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 2787016c4..c341cf4f5 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -726,11 +726,16 @@ export const handleCollectionItemDrop =
   (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(collection, draggedItemUid) || collection;
+    const draggedItemDirectory = findParentItemInCollection(sourceCollection, draggedItemUid) || sourceCollection;
     const draggedItemDirectoryItems = cloneDeep(draggedItemDirectory.items);
 
     const handleMoveToNewLocation = async ({
diff --git a/packages/bruno-electron/src/ipc/collection.js b/packages/bruno-electron/src/ipc/collection.js
index 30cf11111..f26ec6a2c 100644
--- a/packages/bruno-electron/src/ipc/collection.js
+++ b/packages/bruno-electron/src/ipc/collection.js
@@ -699,7 +699,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       // Recursive function to parse the folder and create files/folders
       const parseCollectionItems = (items = [], currentPath) => {
         items.forEach(async (item) => {
-          if (['http-request', 'graphql-request'].includes(item.type)) {
+          if (['http-request', 'graphql-request', 'grpc-request'].includes(item.type)) {
             const content = await stringifyRequestViaWorker(item);            
             const filePath = path.join(currentPath, item.filename);
             safeWriteFileSync(filePath, content);

From 70d65d87c5cc4dd518c24b138b78ad8b79c3279a Mon Sep 17 00:00:00 2001
From: sanish-bruno <sanish@usebruno.com>
Date: Mon, 8 Sep 2025 16:32:13 +0530
Subject: [PATCH 11/18] move: test cases to new folder

---
 .../moving-requests/cross-collection-drag-drop-folder.spec.ts   | 2 +-
 .../moving-requests/cross-collection-drag-drop-request.spec.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename e2e-tests/003-collection-management-tests/002-cross-collection-drag-drop-folder.spec.ts => tests/collection/moving-requests/cross-collection-drag-drop-folder.spec.ts (99%)
 rename e2e-tests/003-collection-management-tests/001-cross-collection-drag-drop-request.spec.ts => tests/collection/moving-requests/cross-collection-drag-drop-request.spec.ts (99%)

diff --git a/e2e-tests/003-collection-management-tests/002-cross-collection-drag-drop-folder.spec.ts b/tests/collection/moving-requests/cross-collection-drag-drop-folder.spec.ts
similarity index 99%
rename from e2e-tests/003-collection-management-tests/002-cross-collection-drag-drop-folder.spec.ts
rename to tests/collection/moving-requests/cross-collection-drag-drop-folder.spec.ts
index d02bf91dc..9fce391ff 100644
--- a/e2e-tests/003-collection-management-tests/002-cross-collection-drag-drop-folder.spec.ts
+++ b/tests/collection/moving-requests/cross-collection-drag-drop-folder.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../playwright';
+import { test, expect } from '../../../playwright';
 
 test.describe('Cross-Collection Drag and Drop for folder', () => {
   test('Verify cross-collection folder drag and drop', async ({ pageWithUserData: page, createTmpDir }) => {
diff --git a/e2e-tests/003-collection-management-tests/001-cross-collection-drag-drop-request.spec.ts b/tests/collection/moving-requests/cross-collection-drag-drop-request.spec.ts
similarity index 99%
rename from e2e-tests/003-collection-management-tests/001-cross-collection-drag-drop-request.spec.ts
rename to tests/collection/moving-requests/cross-collection-drag-drop-request.spec.ts
index 8c1efaf59..598ac858a 100644
--- a/e2e-tests/003-collection-management-tests/001-cross-collection-drag-drop-request.spec.ts
+++ b/tests/collection/moving-requests/cross-collection-drag-drop-request.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../playwright';
+import { test, expect } from '../../../playwright';
 
 test.describe('Cross-Collection Drag and Drop', () => {
   test('Verify request drag and drop', async ({ pageWithUserData: page, createTmpDir }) => {

From c9fe9813dbad502a5a7b73070cb3b0149871e117 Mon Sep 17 00:00:00 2001
From: sanish chirayath <sanish@usebruno.com>
Date: Mon, 8 Sep 2025 20:03:36 +0530
Subject: [PATCH 12/18] Merge pull request #5526 from
 sanish-bruno/fix/tags-removed-while-moving-request

Fix: tags removed while moving request
---
 .../bruno-electron/src/utils/collection.js    |   1 +
 .../src/utils/tests/collection-utils.spec.js  | 213 ++++++++++++++++++
 .../moving-requests/tag-persistence.spec.ts   | 149 ++++++++++++
 3 files changed, 363 insertions(+)
 create mode 100644 packages/bruno-electron/src/utils/tests/collection-utils.spec.js
 create mode 100644 tests/collection/moving-requests/tag-persistence.spec.ts

diff --git a/packages/bruno-electron/src/utils/collection.js b/packages/bruno-electron/src/utils/collection.js
index 1ab774211..4ae8e307f 100644
--- a/packages/bruno-electron/src/utils/collection.js
+++ b/packages/bruno-electron/src/utils/collection.js
@@ -331,6 +331,7 @@ const transformRequestToSaveToFilesystem = (item) => {
     name: _item.name,
     seq: _item.seq,
     settings: _item.settings,
+    tags: _item.tags,
     request: {
       method: _item.request.method,
       url: _item.request.url,
diff --git a/packages/bruno-electron/src/utils/tests/collection-utils.spec.js b/packages/bruno-electron/src/utils/tests/collection-utils.spec.js
new file mode 100644
index 000000000..3ed1a633c
--- /dev/null
+++ b/packages/bruno-electron/src/utils/tests/collection-utils.spec.js
@@ -0,0 +1,213 @@
+const { transformRequestToSaveToFilesystem } = require('../collection');
+
+describe('transformRequestToSaveToFilesystem', () => {
+  it('should preserve all relevant fields when transforming request', () => {
+
+    const testItem = {
+      uid: 'test-uid-123',
+      type: 'http-request',
+      name: 'Test Request',
+      seq: 1,
+      settings: {
+        enableEncodeUrl: true
+      },
+      tags: ['smoke', 'regression', 'api'],
+      request: {
+        method: 'POST',
+        url: 'https://api.example.com/test',
+        params: [
+          {
+            uid: 'param-uid-1',
+            name: 'param1',
+            value: 'value1',
+            description: 'Test parameter',
+            type: 'text',
+            enabled: true
+          }
+        ],
+        headers: [
+          {
+            uid: 'header-uid-1',
+            name: 'Content-Type',
+            value: 'application/json',
+            description: 'Request content type',
+            enabled: true
+          }
+        ],
+        auth: {
+          type: 'bearer',
+          token: 'test-token'
+        },
+        body: {
+          mode: 'json',
+          json: '{"test": "data"}'
+        },
+        script: {
+          req: 'console.log("request script");',
+          res: 'console.log("response script");'
+        },
+        vars: {
+          preRequest: 'const testVar = "value";',
+          postResponse: 'console.log(testVar);'
+        },
+        assertions: [
+          {
+            uid: 'assert-uid-1',
+            name: 'Status Code',
+            operator: 'equals',
+            expected: '200'
+          }
+        ],
+        tests: [
+          {
+            uid: 'test-uid-1',
+            name: 'Test Response',
+            code: 'expect(response.status).toBe(200);'
+          }
+        ],
+        docs: 'This is a test request documentation'
+      }
+    };
+
+    // Transform the request
+    const result = transformRequestToSaveToFilesystem(testItem);
+
+    // Verify all top-level fields are preserved
+    expect(result.uid).toBe(testItem.uid);
+    expect(result.type).toBe(testItem.type);
+    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);
+
+    // Verify request object structure
+    expect(result.request).toBeDefined();
+    expect(result.request.method).toBe(testItem.request.method);
+    expect(result.request.url).toBe(testItem.request.url);
+    expect(result.request.auth).toEqual(testItem.request.auth);
+    expect(result.request.body).toEqual(testItem.request.body);
+    expect(result.request.script).toEqual(testItem.request.script);
+    expect(result.request.vars).toEqual(testItem.request.vars);
+    expect(result.request.assertions).toEqual(testItem.request.assertions);
+    expect(result.request.tests).toEqual(testItem.request.tests);
+    expect(result.request.docs).toBe(testItem.request.docs);
+
+    // Verify params are processed correctly
+    expect(result.request.params).toHaveLength(1);
+    expect(result.request.params[0]).toEqual({
+      uid: 'param-uid-1',
+      name: 'param1',
+      value: 'value1',
+      description: 'Test parameter',
+      type: 'text',
+      enabled: true
+    });
+
+    // Verify headers are processed correctly
+    expect(result.request.headers).toHaveLength(1);
+    expect(result.request.headers[0]).toEqual({
+      uid: 'header-uid-1',
+      name: 'Content-Type',
+      value: 'application/json',
+      description: 'Request content type',
+      enabled: true
+    });
+  });
+
+  it('should handle draft items correctly', () => {
+    const testItem = {
+      uid: 'test-uid-456',
+      type: 'http-request',
+      name: 'Draft Request',
+      seq: 2,
+      settings: {},
+      tags: ['draft', 'wip'],
+      request: {
+        method: 'GET',
+        url: 'https://api.example.com/draft',
+        params: [],
+        headers: [],
+        auth: {},
+        body: { mode: 'none' },
+        script: { req: '', res: '' },
+        vars: { preRequest: '', postResponse: '' },
+        assertions: [],
+        tests: [],
+        docs: ''
+      },
+      draft: {
+        uid: 'draft-uid-789',
+        type: 'http-request',
+        name: 'Draft Request Modified',
+        seq: 2,
+        settings: { enableEncodeUrl: true },
+        tags: ['draft', 'wip', 'modified'],
+        request: {
+          method: 'PUT',
+          url: 'https://api.example.com/draft-modified',
+          params: [],
+          headers: [],
+          auth: {},
+          body: { mode: 'none' },
+          script: { req: '', res: '' },
+          vars: { preRequest: '', postResponse: '' },
+          assertions: [],
+          tests: [],
+          docs: ''
+        }
+      }
+    };
+
+    const result = transformRequestToSaveToFilesystem(testItem);
+
+    // Should use draft data when available
+    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');
+    expect(result.tags).toHaveLength(3);
+  });
+
+  it('should handle gRPC requests', () => {
+    const testItem = {
+      uid: 'grpc-uid-123',
+      type: 'grpc-request',
+      name: 'gRPC Test Request',
+      seq: 3,
+      settings: {},
+      tags: ['grpc', 'microservice'],
+      request: {
+        method: 'unary',
+        methodType: 'unary',
+        protoPath: '/path/to/proto',
+        url: 'grpc://localhost:50051',
+        params: [], // gRPC requests don't use params
+        headers: [],
+        auth: {},
+        body: { mode: 'grpc', grpc: [{ name: 'message1', content: 'test content' }] },
+        script: { req: '', res: '' },
+        vars: { preRequest: '', postResponse: '' },
+        assertions: [],
+        tests: [],
+        docs: 'gRPC test documentation'
+      }
+    };
+
+    const result = transformRequestToSaveToFilesystem(testItem);
+
+    // Verify gRPC-specific fields
+    expect(result.type).toBe('grpc-request');
+    expect(result.request.methodType).toBe('unary');
+    expect(result.request.protoPath).toBe('/path/to/proto');
+    expect(result.request.params).toBeUndefined(); // Should be deleted for gRPC
+
+    // Verify tags are preserved for gRPC requests
+    expect(result.tags).toEqual(['grpc', 'microservice']);
+  });
+});
diff --git a/tests/collection/moving-requests/tag-persistence.spec.ts b/tests/collection/moving-requests/tag-persistence.spec.ts
new file mode 100644
index 000000000..94ae26526
--- /dev/null
+++ b/tests/collection/moving-requests/tag-persistence.spec.ts
@@ -0,0 +1,149 @@
+import { test, expect } from '../../../playwright';
+
+test.describe('Tag persistence', () => {
+  test('Verify tag persistence while moving requests within a collection', async ({ pageWithUserData: page, createTmpDir }) => {
+    // Create first collection - click dropdown menu first
+    await page.getByLabel('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();
+    await page.getByLabel('Safe Mode').check();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Create a new request
+    await page.locator('#create-new-tab').getByRole('img').click();
+    await page.getByRole('textbox', { name: 'Request Name' }).fill('r1');
+    await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // create another request
+    await page.locator('#create-new-tab').getByRole('img').click();
+    await page.getByRole('textbox', { name: 'Request Name' }).fill('r2');
+    await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // create another request
+    await page.locator('#create-new-tab').getByRole('img').click();
+    await page.getByRole('textbox', { name: 'Request Name' }).fill('r3');
+    await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    await page.waitForTimeout(200);
+
+    // Add a tag to the request
+    await page.getByRole('tab', { name: 'Settings' }).click();
+    await page.getByText('Tagse.g., smoke, regression').click();
+    await page.getByRole('textbox').nth(2).fill('smoke');
+    await page.getByRole('textbox').nth(2).press('Enter');
+
+    // Verify the tag was added
+    await expect(page.getByRole('button', { name: 'smoke' })).toBeVisible();
+    await page.keyboard.press('Meta+s');
+
+    // Move the r2 request to just above r1 within the same collection
+    const r3Request = page.locator('.collection-item-name').filter({ hasText: 'r3' });
+    const r1Request = page.locator('.collection-item-name').filter({ hasText: 'r1' });
+    
+    await expect(r3Request).toBeVisible();
+    await expect(r1Request).toBeVisible();
+
+    // Perform drag and drop operation to move r3 below r1 using source position
+    await r3Request.dragTo(r1Request, {
+      targetPosition: { x: 0, y: 1 }
+    });
+
+    // Verify the requests are still in the collection and r3 is now above r1
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'r3' })).toBeVisible();
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'r1' })).toBeVisible();
+
+    // Click on r3 to verify the tag persisted after the move
+    await page.locator('.collection-item-name').filter({ hasText: 'r3' }).click();
+    await page.getByRole('tab', { name: 'Settings' }).click();
+    
+    // Verify the tag is still present after the move
+    await expect(page.getByRole('button', { name: 'smoke' })).toBeVisible();
+  });
+
+  test('verify tag persistence while moving requests between folders', async ({ pageWithUserData: page, createTmpDir }) => {
+    // Create first collection - click dropdown menu first
+    await page.getByLabel('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();
+    await page.getByLabel('Safe Mode').check();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Create a new folder
+    await page.getByTitle('test-collection').click({
+      button: 'right'
+    });
+    await page.waitForTimeout(200);
+    await page.getByText('New Folder').click();
+    await page.locator('#collection-name').fill('f1');
+    await page.getByRole('button', { name: 'Create' }).click();
+    await page.waitForTimeout(200);
+
+    // Create a new request within f1 folder
+    await page.getByText('f1').click();
+    await page.waitForTimeout(200);
+    await page.getByTitle('f1', { exact: true }).click({
+      button: 'right'
+    });
+    await page.locator('.dropdown-item').getByText('New Request').click()
+    await page.getByRole('textbox', { name: 'Request Name' }).fill('r1');
+    await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // create another request within f1 folder
+    await page.getByTitle('f1', { exact: true }).click({
+      button: 'right'
+    });
+    await page.locator('.dropdown-item').getByText('New Request').click()
+    await page.getByRole('textbox', { name: 'Request Name' }).fill('r2');
+    await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
+    await page.getByRole('button', { name: 'Create' }).click();
+    await page.waitForTimeout(200);
+
+    // Add a tag to the request
+    await page.getByRole('tab', { name: 'Settings' }).click();
+    await page.getByText('Tagse.g., smoke, regression').click();
+    await page.getByRole('textbox').nth(2).fill('smoke');
+    await page.getByRole('textbox').nth(2).press('Enter');
+    await expect(page.getByRole('button', { name: 'smoke' })).toBeVisible();
+    await page.keyboard.press('Meta+s');
+
+    // Create another folder
+    await page.getByTitle('test-collection').click({
+      button: 'right'
+    });
+    await page.locator('.dropdown-item').getByText('New Folder').click();
+    await page.locator('#collection-name').fill('f2');
+    await page.getByRole('button', { name: 'Create' }).click();
+
+    // open f2 folder
+    await page.getByText('f2').click();
+    await page.getByTitle('f2', { exact: true }).click({
+      button: 'right'
+    });
+    await page.locator('.dropdown-item').getByText('New Request').click();
+    await page.getByRole('textbox', { name: 'Request Name' }).fill('r3');
+    await page.locator('#new-request-url textarea').fill('https://httpfaker.org/api/echo');
+    await page.getByRole('button', { name: 'Create' }).click();
+    
+    // Drag and drop r2 request to f2 folder
+    const r2Request = page.locator('.collection-item-name').filter({ hasText: 'r2' });
+    const f2Folder = page.locator('.collection-item-name').filter({ hasText: 'f2' });
+    await r2Request.dragTo(f2Folder);
+    
+    // Verify the requests are still in the collection and r2 is now in f2 folder
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'r2' })).toBeVisible();
+    await expect(page.locator('.collection-item-name').filter({ hasText: 'f2' })).toBeVisible();
+
+    // Click on r2 to verify the tag persisted after the move
+    await page.locator('.collection-item-name').filter({ hasText: 'r2' }).click();
+    await page.getByRole('tab', { name: 'Settings' }).click();
+    await expect(page.getByRole('button', { name: 'smoke' })).toBeVisible();
+  });
+});

From 194d90428469ade2b36f769056f03a15201af4d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 16:21:53 +0000
Subject: [PATCH 13/18] chore(deps): bump actions/setup-node from 4 to 5

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 5.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/npm-bru-cli.yml | 2 +-
 .github/workflows/tests.yml       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/npm-bru-cli.yml b/.github/workflows/npm-bru-cli.yml
index b489f1e43..a15260b7e 100644
--- a/.github/workflows/npm-bru-cli.yml
+++ b/.github/workflows/npm-bru-cli.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4bf2d753c..9ce5f5162 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -65,7 +65,7 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -107,7 +107,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+    - uses: actions/setup-node@v5
       with:
         node-version: v22.11.x
     - name: Install dependencies

From 03abbc585ffb7b69abe1a4d6fc4152168da518fe Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Mon, 8 Sep 2025 22:36:22 +0530
Subject: [PATCH 14/18] Remove body size test from getSize tests

---
 .../bruno-tests/collection/scripting/api/res/getSize.bru    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/bruno-tests/collection/scripting/api/res/getSize.bru b/packages/bruno-tests/collection/scripting/api/res/getSize.bru
index 3856f18eb..add997c49 100644
--- a/packages/bruno-tests/collection/scripting/api/res/getSize.bru
+++ b/packages/bruno-tests/collection/scripting/api/res/getSize.bru
@@ -19,12 +19,6 @@ script:post-response {
 }
 
 tests {
-  test("test body size", function() {
-    const bodySize = res.getSize().body;
-    // 1MB = 1024*1024 = 1048576
-    expect(bodySize > 1048576).to.be.true;
-  });
-  
   test("test header size", function() {
     const bodySize = res.getSize().header;
     expect(bodySize === 305).to.be.true;

From a7f6d669afbb04106f9fb3f793615dce1af806d7 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Mon, 8 Sep 2025 22:50:11 +0530
Subject: [PATCH 15/18] Update digest authentication test cases with new URLs
 and credentials

---
 .../bruno-tests/collection/auth/digest/Digest Auth 200.bru  | 6 +++---
 .../bruno-tests/collection/auth/digest/Digest Auth 401.bru  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/bruno-tests/collection/auth/digest/Digest Auth 200.bru b/packages/bruno-tests/collection/auth/digest/Digest Auth 200.bru
index 7efd6bee0..85af27326 100644
--- a/packages/bruno-tests/collection/auth/digest/Digest Auth 200.bru	
+++ b/packages/bruno-tests/collection/auth/digest/Digest Auth 200.bru	
@@ -5,14 +5,14 @@ meta {
 }
 
 get {
-  url: https://httpbin.org/digest-auth/auth/foo/passwd
+  url: https://www.httpfaker.org/api/auth/digest/auth/admin/password
   body: none
   auth: digest
 }
 
 auth:digest {
-  username: foo
-  password: passwd
+  username: admin
+  password: password
 }
 
 assert {
diff --git a/packages/bruno-tests/collection/auth/digest/Digest Auth 401.bru b/packages/bruno-tests/collection/auth/digest/Digest Auth 401.bru
index 52f3698ae..3518bec64 100644
--- a/packages/bruno-tests/collection/auth/digest/Digest Auth 401.bru	
+++ b/packages/bruno-tests/collection/auth/digest/Digest Auth 401.bru	
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: https://httpbin.org/digest-auth/auth/foo/passw
+  url: https://www.httpfaker.org/api/auth/digest/auth/admin/badpassword
   body: none
   auth: digest
 }

From 27cbb194bfce1dc7ac8316ea80977d183effab33 Mon Sep 17 00:00:00 2001
From: lohit-bruno <lohit@usebruno.com>
Date: Fri, 12 Sep 2025 00:33:22 +0530
Subject: [PATCH 16/18] use system-ca library for ca certs

---
 package-lock.json                             | 336 +++++++++---------
 packages/bruno-app/package.json               |   2 +-
 packages/bruno-cli/package.json               |   1 +
 .../src/runner/run-single-request.js          |   7 +-
 packages/bruno-cli/src/utils/ca-cert.js       | 119 +++++++
 packages/bruno-electron/package.json          |   1 +
 .../src/ipc/network/cert-utils.js             |  17 +-
 packages/bruno-electron/src/utils/ca-cert.js  | 119 +++++++
 .../bruno-electron/src/utils/proxy-util.js    |   4 +-
 packages/bruno-requests/src/index.ts          |   2 -
 .../bruno-requests/src/network/ca-cert.ts     | 165 ---------
 packages/bruno-requests/src/network/index.ts  |   4 +-
 12 files changed, 424 insertions(+), 353 deletions(-)
 create mode 100644 packages/bruno-cli/src/utils/ca-cert.js
 create mode 100644 packages/bruno-electron/src/utils/ca-cert.js
 delete mode 100644 packages/bruno-requests/src/network/ca-cert.ts

diff --git a/package-lock.json b/package-lock.json
index 3cc97d6bc..4e9712670 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1605,7 +1605,7 @@
       "version": "7.26.3",
       "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
       "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.25.9",
@@ -1623,7 +1623,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
       "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -1640,7 +1640,7 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
       "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -1658,7 +1658,7 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
@@ -1729,7 +1729,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
       "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.25.9",
@@ -1804,7 +1804,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
       "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.25.9",
@@ -1847,7 +1847,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
       "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -1864,7 +1864,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
       "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -1880,7 +1880,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
       "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -1896,7 +1896,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
       "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -1914,7 +1914,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
       "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -1949,7 +1949,7 @@
       "version": "7.21.0-placeholder-for-preset-env.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
       "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -2048,7 +2048,7 @@
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
       "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2064,7 +2064,7 @@
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
       "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2246,7 +2246,7 @@
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
       "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -2263,7 +2263,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
       "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2279,7 +2279,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
       "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -2297,7 +2297,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
       "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-imports": "^7.25.9",
@@ -2315,7 +2315,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
       "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2331,7 +2331,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
       "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2363,7 +2363,7 @@
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
       "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.25.9",
@@ -2380,7 +2380,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
       "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.25.9",
@@ -2401,7 +2401,7 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -2411,7 +2411,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
       "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -2428,7 +2428,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
       "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2444,7 +2444,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
       "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.9",
@@ -2461,7 +2461,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
       "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2477,7 +2477,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
       "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.9",
@@ -2494,7 +2494,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
       "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2510,7 +2510,7 @@
       "version": "7.26.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
       "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2526,7 +2526,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
       "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2558,7 +2558,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
       "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -2575,7 +2575,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
       "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.25.9",
@@ -2593,7 +2593,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
       "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2609,7 +2609,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
       "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2625,7 +2625,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
       "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2641,7 +2641,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
       "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2657,7 +2657,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
       "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-transforms": "^7.25.9",
@@ -2690,7 +2690,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
       "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-transforms": "^7.25.9",
@@ -2709,7 +2709,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
       "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-transforms": "^7.25.9",
@@ -2726,7 +2726,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
       "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.9",
@@ -2743,7 +2743,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
       "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2774,7 +2774,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
       "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2790,7 +2790,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
       "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.25.9",
@@ -2808,7 +2808,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
       "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -2825,7 +2825,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
       "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2857,7 +2857,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
       "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2889,7 +2889,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
       "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.25.9",
@@ -2907,7 +2907,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
       "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -2992,7 +2992,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
       "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -3009,7 +3009,7 @@
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
       "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.9",
@@ -3026,7 +3026,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
       "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -3042,7 +3042,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
       "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -3058,7 +3058,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
       "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -3075,7 +3075,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
       "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -3091,7 +3091,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
       "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -3107,7 +3107,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
       "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -3142,7 +3142,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
       "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9"
@@ -3158,7 +3158,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
       "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.9",
@@ -3175,7 +3175,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
       "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.9",
@@ -3192,7 +3192,7 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
       "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.25.9",
@@ -3209,7 +3209,7 @@
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz",
       "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.26.0",
@@ -3310,7 +3310,7 @@
       "version": "0.1.6-no-external-plugins",
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
       "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -7904,8 +7904,8 @@
       "version": "10.4.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
+      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -7924,8 +7924,8 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -7937,8 +7937,8 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -7952,8 +7952,8 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "license": "MIT",
-      "peer": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@testing-library/jest-dom": {
       "version": "6.6.3",
@@ -8033,6 +8033,7 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/babel__core": {
@@ -8287,6 +8288,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
       "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
@@ -8318,6 +8320,7 @@
       "version": "12.2.3",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
       "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/linkify-it": "*",
@@ -8328,6 +8331,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
       "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/ms": {
@@ -9381,6 +9385,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
       "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "dequal": "^2.0.3"
@@ -9748,7 +9753,7 @@
       "version": "0.4.12",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
       "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
@@ -9763,7 +9768,7 @@
       "version": "0.10.6",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
       "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.6.2",
@@ -9777,7 +9782,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
       "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.6.3"
@@ -9937,6 +9942,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -11527,7 +11542,7 @@
       "version": "3.39.0",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
       "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "browserslist": "^4.24.2"
@@ -12577,6 +12592,7 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/dom-converter": {
@@ -13568,7 +13584,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "devOptional": true,
+      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -14283,6 +14299,13 @@
       "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==",
       "license": "MIT"
     },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -16148,7 +16171,7 @@
       "version": "2.16.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
       "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
@@ -18399,7 +18422,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.flow": {
@@ -18537,11 +18560,34 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
+      "dev": true,
       "license": "MIT",
       "bin": {
         "lz-string": "bin/bin.js"
       }
     },
+    "node_modules/macos-export-certificate-and-key": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.2.4.tgz",
+      "integrity": "sha512-y5QZEywlBNKd+EhPZ1Hz1FmDbbeQKtuVHJaTlawdl7vXw9bi/4tJB2xSMwX4sMVcddy3gbQ8K0IqXAi2TpDo2g==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "^4.3.0"
+      }
+    },
+    "node_modules/macos-export-certificate-and-key/node_modules/node-addon-api": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
+      "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/magic-string": {
       "version": "0.27.0",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
@@ -19965,7 +20011,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/path-scurry": {
@@ -22305,14 +22351,14 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
       "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
@@ -22331,7 +22377,7 @@
       "version": "0.15.2",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
       "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
@@ -22341,7 +22387,7 @@
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
       "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2",
@@ -22359,14 +22405,14 @@
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
       "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/regjsparser": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
       "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
-      "devOptional": true,
+      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "jsesc": "~3.0.2"
@@ -22379,7 +22425,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
       "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -22535,7 +22581,7 @@
       "version": "1.22.10",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
       "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.16.0",
@@ -24747,7 +24793,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -24827,6 +24873,16 @@
         "jscat": "bundle.js"
       }
     },
+    "node_modules/system-ca": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/system-ca/-/system-ca-2.0.1.tgz",
+      "integrity": "sha512-9ZDV9yl8ph6Op67wDGPr4LykX86usE9x3le+XZSHfVMiiVJ5IRgmCWjLgxyz35ju9H3GDIJJZm4ogAeIfN5cQQ==",
+      "license": "Apache-2.0",
+      "optionalDependencies": {
+        "macos-export-certificate-and-key": "^1.2.0",
+        "win-export-certificate-and-key": "^2.1.0"
+      }
+    },
     "node_modules/tailwindcss": {
       "version": "3.4.17",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
@@ -25614,7 +25670,7 @@
       "version": "4.9.5",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
       "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-      "devOptional": true,
+      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -25675,7 +25731,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
       "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -25685,7 +25741,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
@@ -25699,7 +25755,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
       "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -25709,7 +25765,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -26303,6 +26359,28 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/win-export-certificate-and-key": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/win-export-certificate-and-key/-/win-export-certificate-and-key-2.1.0.tgz",
+      "integrity": "sha512-WeMLa/2uNZcS/HWGKU2G1Gzeh3vHpV/UFvwLhJLKxPHYFAbubxxVcJbqmPXaqySWK1Ymymh16zKK5WYIJ3zgzA==",
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "node-addon-api": "^3.1.0"
+      }
+    },
+    "node_modules/win-export-certificate-and-key/node_modules/node-addon-api": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
@@ -26676,7 +26754,7 @@
         "@rsbuild/plugin-react": "^1.0.7",
         "@rsbuild/plugin-sass": "^1.1.0",
         "@rsbuild/plugin-styled-components": "1.1.0",
-        "@testing-library/dom": "^10.4.0",
+        "@testing-library/dom": "^10.4.1",
         "@testing-library/jest-dom": "^6.6.3",
         "@testing-library/react": "^16.3.0",
         "autoprefixer": "10.4.20",
@@ -28006,26 +28084,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "packages/bruno-app/node_modules/@testing-library/dom": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
-      "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^5.0.1",
-        "aria-query": "5.3.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.5.0",
-        "pretty-format": "^27.0.2"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "packages/bruno-app/node_modules/@testing-library/react": {
       "version": "16.3.0",
       "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.0.tgz",
@@ -28122,23 +28180,6 @@
       ],
       "license": "CC-BY-4.0"
     },
-    "packages/bruno-app/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "packages/bruno-app/node_modules/cookie": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
@@ -28240,41 +28281,6 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "packages/bruno-app/node_modules/pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "packages/bruno-app/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "packages/bruno-app/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "packages/bruno-app/node_modules/semver": {
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
@@ -28357,6 +28363,7 @@
         "lodash": "^4.17.21",
         "qs": "^6.11.0",
         "socks-proxy-agent": "^8.0.2",
+        "system-ca": "^2.0.1",
         "xmlbuilder": "^15.1.1",
         "yargs": "^17.6.2"
       },
@@ -30122,6 +30129,7 @@
         "nanoid": "3.3.8",
         "qs": "^6.11.0",
         "socks-proxy-agent": "^8.0.2",
+        "system-ca": "^2.0.1",
         "tough-cookie": "^6.0.0",
         "uuid": "^9.0.0",
         "yup": "^0.32.11"
@@ -32156,4 +32164,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/bruno-app/package.json b/packages/bruno-app/package.json
index 6b5f8f798..25502d6b9 100644
--- a/packages/bruno-app/package.json
+++ b/packages/bruno-app/package.json
@@ -93,7 +93,7 @@
     "@rsbuild/plugin-react": "^1.0.7",
     "@rsbuild/plugin-sass": "^1.1.0",
     "@rsbuild/plugin-styled-components": "1.1.0",
-    "@testing-library/dom": "^10.4.0",
+    "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "autoprefixer": "10.4.20",
diff --git a/packages/bruno-cli/package.json b/packages/bruno-cli/package.json
index c298273b4..7ed0fc2c2 100644
--- a/packages/bruno-cli/package.json
+++ b/packages/bruno-cli/package.json
@@ -69,6 +69,7 @@
     "lodash": "^4.17.21",
     "qs": "^6.11.0",
     "socks-proxy-agent": "^8.0.2",
+    "system-ca": "^2.0.1",
     "xmlbuilder": "^15.1.1",
     "yargs": "^17.6.2"
   }
diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js
index 864e3a2fe..f2f12ab43 100644
--- a/packages/bruno-cli/src/runner/run-single-request.js
+++ b/packages/bruno-cli/src/runner/run-single-request.js
@@ -25,7 +25,8 @@ const { createFormData } = require('../utils/form-data');
 const { getOAuth2Token } = require('./oauth2');
 const protocolRegex = /^([-+\w]{1,25})(:?\/\/|:)/;
 const { NtlmClient } = require('axios-ntlm');
-const { addDigestInterceptor, getCACertificates } = require('@usebruno/requests');
+const { addDigestInterceptor } = require('@usebruno/requests');
+const { getCACertificates } = require('../utils/ca-cert');
 const { encodeUrl } = require('@usebruno/common').utils;
 
 const onConsoleLog = (type, args) => {
@@ -157,8 +158,8 @@ const runSingleRequest = async function (
     } else {
       const caCertArray = [options['cacert'], process.env.SSL_CERT_FILE];
       const caCertFilePath = caCertArray.find((el) => el);
-      let caCertificatesWithCertType = getCACertificates({ caCertFilePath, shouldKeepDefaultCerts: !options['ignoreTruststore'] });
-      let caCertificates = caCertificatesWithCertType.map(certData => certData.certificate);
+      let caCertificatesData = await getCACertificates({ caCertFilePath, shouldKeepDefaultCerts: !options['ignoreTruststore'] });
+      let caCertificates = caCertificatesData.caCertificates;
       if (caCertificates?.length > 0) {
         httpsAgentRequestFields['ca'] = caCertificates;
       }
diff --git a/packages/bruno-cli/src/utils/ca-cert.js b/packages/bruno-cli/src/utils/ca-cert.js
new file mode 100644
index 000000000..bb8516c2f
--- /dev/null
+++ b/packages/bruno-cli/src/utils/ca-cert.js
@@ -0,0 +1,119 @@
+const { systemCertsAsync } = require('system-ca');
+const { rootCertificates } = require('node:tls');
+const fs = require('node:fs');
+
+let systemCertsCache;
+
+async function getSystemCerts(systemCAOpts = {}) {
+  if (systemCertsCache) return systemCertsCache;
+
+  try {
+    systemCertsCache = await systemCertsAsync(systemCAOpts);
+
+    return systemCertsCache;
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+}
+
+function certToString(cert) {
+  return typeof cert === 'string'
+    ? cert
+    : Buffer.from(cert.buffer, cert.byteOffset, cert.byteLength).toString('utf8');
+}
+
+function mergeCA(...args) {
+  const ca = new Set();
+  for (const item of args) {
+    if (!item) continue;
+    const caList = Array.isArray(item) ? item : [item];
+    for (const cert of caList) {
+      ca.add(certToString(cert));
+    }
+  }
+  return [...ca].join('\n');
+}
+
+function getNodeExtraCACerts() {
+  const extraCACertPath = process.env.NODE_EXTRA_CA_CERTS;
+  if (!extraCACertPath) return [];
+
+  try {
+    if (fs.existsSync(extraCACertPath)) {
+      const extraCACert = fs.readFileSync(extraCACertPath, 'utf8');
+      if (extraCACert && extraCACert.trim()) {
+        return [extraCACert];
+      }
+    }
+  } catch (err) {
+    console.error(`Failed to read NODE_EXTRA_CA_CERTS from ${extraCACertPath}:`, err.message);
+  }
+
+  return [];
+}
+
+
+const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true }) => {
+  try {
+    let caCertificates = '';
+    let caCertificatesCount = {
+      system: 0,
+      root: 0,
+      custom: 0,
+      extra: 0
+    }
+
+    let systemCerts = [];
+    let rootCerts = [];
+    let customCerts = [];
+    let nodeExtraCerts = [];
+
+    if (shouldKeepDefaultCerts) {
+      // get system certs
+      systemCerts = await getSystemCerts();
+      caCertificatesCount.system = systemCerts.length;
+
+      // get root certs
+      rootCerts = [...rootCertificates];
+      caCertificatesCount.root = rootCerts.length;
+    }
+
+    // handle user-provided custom CA certificate file with optional default certificates
+    if (caCertFilePath) {
+      // validate custom CA certificate file
+      if (fs.existsSync(caCertFilePath)) {
+        try {
+          const customCert = fs.readFileSync(caCertFilePath, 'utf8');
+          if (customCert && customCert.trim()) {
+            customCerts.push(customCert);
+            caCertificatesCount.custom = customCerts.length;
+          }
+        } catch (err) {
+          console.error(`Failed to read custom CA certificate from ${caCertFilePath}:`, (err).message);
+          throw new Error(`Unable to load custom CA certificate: ${(err).message}`);
+        }
+      }
+    }
+
+    // get NODE_EXTRA_CA_CERTS
+    nodeExtraCerts = getNodeExtraCACerts();
+    caCertificatesCount.extra = nodeExtraCerts.length;
+
+    // merge certs
+    const mergedCerts = mergeCA(systemCerts, rootCerts, customCerts, nodeExtraCerts);
+    caCertificates = mergedCerts;
+
+    return {
+      caCertificates,
+      caCertificatesCount
+    }
+  } catch (err) {
+    console.error('Error configuring CA certificates:', (err).message);
+    throw err; // Re-throw certificate loading errors as they're critical
+  }
+}
+
+module.exports = {
+  getCACertificates
+};
\ No newline at end of file
diff --git a/packages/bruno-electron/package.json b/packages/bruno-electron/package.json
index 3e0defb81..5e3d56032 100644
--- a/packages/bruno-electron/package.json
+++ b/packages/bruno-electron/package.json
@@ -67,6 +67,7 @@
     "nanoid": "3.3.8",
     "qs": "^6.11.0",
     "socks-proxy-agent": "^8.0.2",
+    "system-ca": "^2.0.1",
     "tough-cookie": "^6.0.0",
     "uuid": "^9.0.0",
     "yup": "^0.32.11"
diff --git a/packages/bruno-electron/src/ipc/network/cert-utils.js b/packages/bruno-electron/src/ipc/network/cert-utils.js
index cb1c83e12..0520a4513 100644
--- a/packages/bruno-electron/src/ipc/network/cert-utils.js
+++ b/packages/bruno-electron/src/ipc/network/cert-utils.js
@@ -1,10 +1,10 @@
 const fs = require('node:fs');
 const path = require('path');
 const { get } = require('lodash');
-const { getCACertificates } = require('@usebruno/requests');
 const { preferencesUtil } = require('../../store/preferences');
 const { getBrunoConfig } = require('../../store/bruno-config');
 const { interpolateString } = require('./interpolate-string');
+const { getCACertificates } = require('../../utils/ca-cert');
 
 /**
  * Gets certificates and proxy configuration for a request
@@ -27,22 +27,13 @@ const getCertsAndProxyConfig = async ({
   }
 
   let caCertFilePath = preferencesUtil.shouldUseCustomCaCertificate() && preferencesUtil.getCustomCaCertificateFilePath();
-  let caCertificatesWithCertType = getCACertificates({ 
+  let caCertificatesData = await getCACertificates({ 
     caCertFilePath, 
     shouldKeepDefaultCerts: preferencesUtil.shouldKeepDefaultCaCertificates() 
   });
 
-  let caCertificates = caCertificatesWithCertType.map(certData => certData.certificate);
-  let caCertificateDetails = caCertificatesWithCertType.reduce((details, certificateData) => {
-    // get the count for each certificate type
-    details[certificateData.type] += 1;
-    return details;
-  }, {
-    custom: 0,
-    bundled: 0,
-    system: 0,
-    extra: 0
-  });
+  let caCertificates = caCertificatesData.caCertificates;
+  let caCertificateDetails = caCertificatesData.caCertificatesCount;
 
   // configure HTTPS agent with aggregated CA certificates
   if (caCertificates?.length > 0) {
diff --git a/packages/bruno-electron/src/utils/ca-cert.js b/packages/bruno-electron/src/utils/ca-cert.js
new file mode 100644
index 000000000..bb8516c2f
--- /dev/null
+++ b/packages/bruno-electron/src/utils/ca-cert.js
@@ -0,0 +1,119 @@
+const { systemCertsAsync } = require('system-ca');
+const { rootCertificates } = require('node:tls');
+const fs = require('node:fs');
+
+let systemCertsCache;
+
+async function getSystemCerts(systemCAOpts = {}) {
+  if (systemCertsCache) return systemCertsCache;
+
+  try {
+    systemCertsCache = await systemCertsAsync(systemCAOpts);
+
+    return systemCertsCache;
+  } catch (error) {
+    console.error(error);
+    return [];
+  }
+}
+
+function certToString(cert) {
+  return typeof cert === 'string'
+    ? cert
+    : Buffer.from(cert.buffer, cert.byteOffset, cert.byteLength).toString('utf8');
+}
+
+function mergeCA(...args) {
+  const ca = new Set();
+  for (const item of args) {
+    if (!item) continue;
+    const caList = Array.isArray(item) ? item : [item];
+    for (const cert of caList) {
+      ca.add(certToString(cert));
+    }
+  }
+  return [...ca].join('\n');
+}
+
+function getNodeExtraCACerts() {
+  const extraCACertPath = process.env.NODE_EXTRA_CA_CERTS;
+  if (!extraCACertPath) return [];
+
+  try {
+    if (fs.existsSync(extraCACertPath)) {
+      const extraCACert = fs.readFileSync(extraCACertPath, 'utf8');
+      if (extraCACert && extraCACert.trim()) {
+        return [extraCACert];
+      }
+    }
+  } catch (err) {
+    console.error(`Failed to read NODE_EXTRA_CA_CERTS from ${extraCACertPath}:`, err.message);
+  }
+
+  return [];
+}
+
+
+const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true }) => {
+  try {
+    let caCertificates = '';
+    let caCertificatesCount = {
+      system: 0,
+      root: 0,
+      custom: 0,
+      extra: 0
+    }
+
+    let systemCerts = [];
+    let rootCerts = [];
+    let customCerts = [];
+    let nodeExtraCerts = [];
+
+    if (shouldKeepDefaultCerts) {
+      // get system certs
+      systemCerts = await getSystemCerts();
+      caCertificatesCount.system = systemCerts.length;
+
+      // get root certs
+      rootCerts = [...rootCertificates];
+      caCertificatesCount.root = rootCerts.length;
+    }
+
+    // handle user-provided custom CA certificate file with optional default certificates
+    if (caCertFilePath) {
+      // validate custom CA certificate file
+      if (fs.existsSync(caCertFilePath)) {
+        try {
+          const customCert = fs.readFileSync(caCertFilePath, 'utf8');
+          if (customCert && customCert.trim()) {
+            customCerts.push(customCert);
+            caCertificatesCount.custom = customCerts.length;
+          }
+        } catch (err) {
+          console.error(`Failed to read custom CA certificate from ${caCertFilePath}:`, (err).message);
+          throw new Error(`Unable to load custom CA certificate: ${(err).message}`);
+        }
+      }
+    }
+
+    // get NODE_EXTRA_CA_CERTS
+    nodeExtraCerts = getNodeExtraCACerts();
+    caCertificatesCount.extra = nodeExtraCerts.length;
+
+    // merge certs
+    const mergedCerts = mergeCA(systemCerts, rootCerts, customCerts, nodeExtraCerts);
+    caCertificates = mergedCerts;
+
+    return {
+      caCertificates,
+      caCertificatesCount
+    }
+  } catch (err) {
+    console.error('Error configuring CA certificates:', (err).message);
+    throw err; // Re-throw certificate loading errors as they're critical
+  }
+}
+
+module.exports = {
+  getCACertificates
+};
\ No newline at end of file
diff --git a/packages/bruno-electron/src/utils/proxy-util.js b/packages/bruno-electron/src/utils/proxy-util.js
index cb151a81a..d1aacac28 100644
--- a/packages/bruno-electron/src/utils/proxy-util.js
+++ b/packages/bruno-electron/src/utils/proxy-util.js
@@ -152,7 +152,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         });
       }
 
-      const bundledCerts = this.caCertificateDetails.bundled || 0;
+      const rootCerts = this.caCertificateDetails.root || 0;
       const systemCerts = this.caCertificateDetails.system || 0;
       const extraCerts = this.caCertificateDetails.extra || 0;
       const customCerts = this.caCertificateDetails.custom || 0;
@@ -160,7 +160,7 @@ function createTimelineAgentClass(BaseAgentClass) {
       this.timeline.push({
         timestamp: new Date(),
         type: 'tls',
-        message: `CA Certificates: ${bundledCerts} bundled, ${systemCerts} system, ${extraCerts} extra, ${customCerts} custom`,
+        message: `CA Certificates: ${rootCerts} root, ${systemCerts} system, ${extraCerts} extra, ${customCerts} custom`,
       });
 
       // Log "Trying host:port..."
diff --git a/packages/bruno-requests/src/index.ts b/packages/bruno-requests/src/index.ts
index 3d6079c84..581e04af2 100644
--- a/packages/bruno-requests/src/index.ts
+++ b/packages/bruno-requests/src/index.ts
@@ -2,6 +2,4 @@ export { addDigestInterceptor, getOAuth2Token } from  './auth';
 export { GrpcClient, generateGrpcSampleMessage } from './grpc';
 export { default as cookies } from './cookies';
 
-export { getCACertificates } from './network';
-
 export * as scripting from './scripting';
\ No newline at end of file
diff --git a/packages/bruno-requests/src/network/ca-cert.ts b/packages/bruno-requests/src/network/ca-cert.ts
deleted file mode 100644
index b08a60916..000000000
--- a/packages/bruno-requests/src/network/ca-cert.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import * as fs from 'node:fs';
-import { spawnSync } from 'node:child_process';
-
-type T_CACertSource = 'bundled' | 'system' | 'extra'
-
-type T_CACertificateData = {
-  type: T_CACertSource | 'custom';
-  certificate: string
-}
-
-/**
- * Safely executes tls.getCACertificates in a separate Node.js process
- * Returns empty array if the process fails or exits
- */
-const safeTlsGetCACertificates = (certType: T_CACertSource): string[] => {
-  try {
-
-    // adding seperate script for each cert type
-    // to make sure no unexpected code can be included in the script
-
-    const getBundledCACertificatesScript = `
-      const tls = require('node:tls');
-      try {
-        const result = tls.getCACertificates('bundled');
-        console.log(JSON.stringify(result || []));
-      } catch (error) {
-        console.log('[]');
-      }
-    `;
-
-    const getSystemCACertificatesScript = `
-      const tls = require('node:tls');
-      try {
-        const result = tls.getCACertificates('system');
-        console.log(JSON.stringify(result || []));
-      } catch (error) {
-        console.log('[]');
-      }
-    `;
-
-    const getExtraCACertificatesScript = `
-      const tls = require('node:tls');
-      try {
-        const result = tls.getCACertificates('extra');
-        console.log(JSON.stringify(result || []));
-      } catch (error) {
-        console.log('[]');
-      }
-    `;
-
-    // bundled
-    let script = getBundledCACertificatesScript;
-
-    // system
-    if (certType === 'system') script = getSystemCACertificatesScript;
-
-    // extra
-    if (certType === 'extra') script = getExtraCACertificatesScript;
-
-    const result = spawnSync('node', ['-e', script], {
-      encoding: 'utf8',
-      timeout: 5000, // 5 second timeout
-      stdio: 'pipe',
-      maxBuffer: 1024 * 1024 * 50
-    });
-    
-    if (result.error || result.status !== 0) {
-      return [];
-    }
-    
-    const output = result.stdout.trim();
-    
-    return JSON.parse(output);
-  } catch (error) {
-    // Return empty array if child process fails
-    return [];
-  }
-};
-
-/**
- * retrieves default CA certificates from multiple sources using Node.js TLS API
- * 
- * this function aggregates CA certificates from three sources:
- * - 'bundled': mozilla CA certificates bundled with Node.js (same as tls.rootCertificates)
- * - 'system': CA certificates from the system's trusted certificate store  
- * - 'extra': additional CA certificates loaded from `NODE_EXTRA_CA_CERTS` environment variable
- * 
- * @returns {string[]} Array of PEM-encoded CA certificate strings
- * @see https://nodejs.org/docs/latest-v22.x/api/tls.html#tlsgetcacertificatestype
- */
-const getCerts = (sources: T_CACertSource[] = ['bundled', 'system', 'extra']): T_CACertificateData[] => {
-  let certificates: T_CACertificateData[] = [];
-
-  // iterate through different certificate store types to build comprehensive CA list
-  (sources).forEach(certType => {
-    try {
-      // get certificates from specific store type
-      const certList = safeTlsGetCACertificates(certType);
-
-      if (certList && Array.isArray(certList)) {
-        // filter out empty/invalid certificates to ensure we only include valid data
-        const validCertificates = certList.filter(cert => cert && cert.trim());
-        const validCertificatesWithCertType = validCertificates.map(certificate => ({
-          type: certType,
-          certificate
-        }));
-        certificates.push(...validCertificatesWithCertType);
-      }
-    } catch (err) {
-      console.warn(`Failed to load ${certType} CA certificates:`, (err as Error).message);
-    }
-  });
-
-  return certificates;
-};
-
-const getCACertificates = ({ caCertFilePath, shouldKeepDefaultCerts = true }: { caCertFilePath: string, shouldKeepDefaultCerts: boolean }) : T_CACertificateData[] => {
-  // CA certificate configuration
-  try {
-    let caCertificates: T_CACertificateData[] = [];
-
-    // handle user-provided custom CA certificate file with optional default certificates
-    if (caCertFilePath) {
-
-      // validate custom CA certificate file
-      if (fs.existsSync(caCertFilePath)) {
-        try {
-          const customCert = fs.readFileSync(caCertFilePath, 'utf8');
-          if (customCert && customCert.trim()) {
-            caCertificates.push({
-              type: 'custom',
-              certificate: customCert.trim()
-            });
-          }
-        } catch (err) {
-          console.error(`Failed to read custom CA certificate from ${caCertFilePath}:`, (err as Error).message);
-          throw new Error(`Unable to load custom CA certificate: ${(err as Error).message}`);
-        }
-      }
-
-      // optionally augment custom CA with default certificates
-      if (shouldKeepDefaultCerts) {
-        const defaultCertificates = getCerts(['bundled', 'system', 'extra']);
-        if (defaultCertificates?.length > 0) {
-          caCertificates.push(...defaultCertificates);
-        }
-      }
-    } else {
-      // use default CA certificates when no custom configuration is specified
-      const defaultCertificates = getCerts(['bundled', 'system', 'extra']);
-      if (defaultCertificates?.length > 0) {
-        caCertificates.push(...defaultCertificates);
-      }
-    }
-
-    return caCertificates;
-  } 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/network/index.ts b/packages/bruno-requests/src/network/index.ts
index 98f3bfceb..7d72cb7d1 100644
--- a/packages/bruno-requests/src/network/index.ts
+++ b/packages/bruno-requests/src/network/index.ts
@@ -1,3 +1 @@
-export { makeAxiosInstance } from './axios-instance';
-
-export { getCACertificates } from './ca-cert';
\ No newline at end of file
+export { makeAxiosInstance } from './axios-instance';
\ No newline at end of file

From 56629663dc4c38a71ae76514dfb31e9c5ca28fe7 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Fri, 12 Sep 2025 01:05:24 +0530
Subject: [PATCH 17/18] Remove flaky header size test from getSize

Removed test for header size from getSize tests.
---
 .../bruno-tests/collection/scripting/api/res/getSize.bru     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/bruno-tests/collection/scripting/api/res/getSize.bru b/packages/bruno-tests/collection/scripting/api/res/getSize.bru
index add997c49..e590c7fb5 100644
--- a/packages/bruno-tests/collection/scripting/api/res/getSize.bru
+++ b/packages/bruno-tests/collection/scripting/api/res/getSize.bru
@@ -19,11 +19,6 @@ script:post-response {
 }
 
 tests {
-  test("test header size", function() {
-    const bodySize = res.getSize().header;
-    expect(bodySize === 305).to.be.true;
-  });
-  
   test("test total size", function() {
     const sizes = res.getSize();
     expect(sizes.total).to.equal(sizes.header + sizes.body);

From c08827b0c0e4d8d6025463b6282285e3a7ee8f0b Mon Sep 17 00:00:00 2001
From: lohit <lohit@usebruno.com>
Date: Fri, 12 Sep 2025 16:03:27 +0530
Subject: [PATCH 18/18] ca certs updates and fixes (#5549)

---
 .../setup-feature-specific-deps/action.yml    |   1 +
 package-lock.json                             |   3 +-
 .../components/Preferences/General/index.js   |   6 +-
 packages/bruno-cli/package.json               |   1 -
 .../src/runner/run-single-request.js          |  11 +-
 packages/bruno-electron/package.json          |   1 -
 .../src/ipc/network/cert-utils.js             |  10 +-
 packages/bruno-electron/src/utils/ca-cert.js  | 119 ------------------
 .../bruno-electron/src/utils/proxy-util.js    |  14 +--
 packages/bruno-requests/package.json          |   1 +
 packages/bruno-requests/rollup.config.js      |   2 +-
 packages/bruno-requests/src/index.ts          |   2 +
 .../src/utils/ca-cert.ts}                     | 106 +++++++++++-----
 playwright.config.ts                          |   6 +-
 14 files changed, 104 insertions(+), 179 deletions(-)
 delete mode 100644 packages/bruno-electron/src/utils/ca-cert.js
 rename packages/{bruno-cli/src/utils/ca-cert.js => bruno-requests/src/utils/ca-cert.ts} (50%)

diff --git a/.github/actions/ssl/linux/setup-feature-specific-deps/action.yml b/.github/actions/ssl/linux/setup-feature-specific-deps/action.yml
index 297f842a6..475dac0a5 100644
--- a/.github/actions/ssl/linux/setup-feature-specific-deps/action.yml
+++ b/.github/actions/ssl/linux/setup-feature-specific-deps/action.yml
@@ -6,6 +6,7 @@ runs:
     - name: Install additional OS dependencies for custom CA certs
       shell: bash
       run: |
+        sudo apt-get update
         sudo apt-get --no-install-recommends install -y \
           libglib2.0-0 libnss3 libdbus-1-3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libgtk-3-0 libasound2t64 \
           xvfb libxml2-utils
diff --git a/package-lock.json b/package-lock.json
index 4e9712670..8bcc80082 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28363,7 +28363,6 @@
         "lodash": "^4.17.21",
         "qs": "^6.11.0",
         "socks-proxy-agent": "^8.0.2",
-        "system-ca": "^2.0.1",
         "xmlbuilder": "^15.1.1",
         "yargs": "^17.6.2"
       },
@@ -30129,7 +30128,6 @@
         "nanoid": "3.3.8",
         "qs": "^6.11.0",
         "socks-proxy-agent": "^8.0.2",
-        "system-ca": "^2.0.1",
         "tough-cookie": "^6.0.0",
         "uuid": "^9.0.0",
         "yup": "^0.32.11"
@@ -31931,6 +31929,7 @@
         "axios": "^1.9.0",
         "grpc-reflection-js": "^0.3.0",
         "is-ip": "^5.0.1",
+        "system-ca": "^2.0.1",
         "tough-cookie": "^6.0.0"
       },
       "devDependencies": {
diff --git a/packages/bruno-app/src/components/Preferences/General/index.js b/packages/bruno-app/src/components/Preferences/General/index.js
index 554dd0d72..0f72e6b07 100644
--- a/packages/bruno-app/src/components/Preferences/General/index.js
+++ b/packages/bruno-app/src/components/Preferences/General/index.js
@@ -176,11 +176,11 @@ const General = ({ close }) => {
             name="keepDefaultCaCertificates.enabled"
             checked={formik.values.keepDefaultCaCertificates.enabled}
             onChange={formik.handleChange}
-            className={`mousetrap mr-0 ${formik.values.customCaCertificate.enabled ? '' : 'opacity-25'}`}
-            disabled={formik.values.customCaCertificate.enabled ? false : true}
+            className={`mousetrap mr-0 ${formik.values.customCaCertificate.enabled && formik.values.customCaCertificate.filePath ? '' : 'opacity-25'}`}
+            disabled={formik.values.customCaCertificate.enabled && formik.values.customCaCertificate.filePath ? false : true}
           />
           <label
-            className={`block ml-2 select-none ${formik.values.customCaCertificate.enabled ? '' : 'opacity-25'}`}
+            className={`block ml-2 select-none ${formik.values.customCaCertificate.enabled && formik.values.customCaCertificate.filePath ? '' : 'opacity-25'}`}
             htmlFor="keepDefaultCaCertificatesEnabled"
           >
             Keep Default CA Certificates
diff --git a/packages/bruno-cli/package.json b/packages/bruno-cli/package.json
index 7ed0fc2c2..c298273b4 100644
--- a/packages/bruno-cli/package.json
+++ b/packages/bruno-cli/package.json
@@ -69,7 +69,6 @@
     "lodash": "^4.17.21",
     "qs": "^6.11.0",
     "socks-proxy-agent": "^8.0.2",
-    "system-ca": "^2.0.1",
     "xmlbuilder": "^15.1.1",
     "yargs": "^17.6.2"
   }
diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js
index f2f12ab43..c9323ac09 100644
--- a/packages/bruno-cli/src/runner/run-single-request.js
+++ b/packages/bruno-cli/src/runner/run-single-request.js
@@ -1,9 +1,7 @@
-const os = require('os');
 const qs = require('qs');
 const chalk = require('chalk');
 const decomment = require('decomment');
 const fs = require('fs');
-const tls = require('tls');
 const { forOwn, isUndefined, isNull, each, extend, get, compact } = require('lodash');
 const FormData = require('form-data');
 const prepareRequest = require('./prepare-request');
@@ -26,7 +24,7 @@ const { getOAuth2Token } = require('./oauth2');
 const protocolRegex = /^([-+\w]{1,25})(:?\/\/|:)/;
 const { NtlmClient } = require('axios-ntlm');
 const { addDigestInterceptor } = require('@usebruno/requests');
-const { getCACertificates } = require('../utils/ca-cert');
+const { getCACertificates } = require('@usebruno/requests');
 const { encodeUrl } = require('@usebruno/common').utils;
 
 const onConsoleLog = (type, args) => {
@@ -156,13 +154,10 @@ const runSingleRequest = async function (
     if (insecure) {
       httpsAgentRequestFields['rejectUnauthorized'] = false;
     } else {
-      const caCertArray = [options['cacert'], process.env.SSL_CERT_FILE];
-      const caCertFilePath = caCertArray.find((el) => el);
+      const caCertFilePath = options['cacert'];
       let caCertificatesData = await getCACertificates({ caCertFilePath, shouldKeepDefaultCerts: !options['ignoreTruststore'] });
       let caCertificates = caCertificatesData.caCertificates;
-      if (caCertificates?.length > 0) {
-        httpsAgentRequestFields['ca'] = caCertificates;
-      }
+      httpsAgentRequestFields['ca'] = caCertificates || [];
     }
 
     const interpolationOptions = {
diff --git a/packages/bruno-electron/package.json b/packages/bruno-electron/package.json
index 5e3d56032..3e0defb81 100644
--- a/packages/bruno-electron/package.json
+++ b/packages/bruno-electron/package.json
@@ -67,7 +67,6 @@
     "nanoid": "3.3.8",
     "qs": "^6.11.0",
     "socks-proxy-agent": "^8.0.2",
-    "system-ca": "^2.0.1",
     "tough-cookie": "^6.0.0",
     "uuid": "^9.0.0",
     "yup": "^0.32.11"
diff --git a/packages/bruno-electron/src/ipc/network/cert-utils.js b/packages/bruno-electron/src/ipc/network/cert-utils.js
index 0520a4513..0c51f34d9 100644
--- a/packages/bruno-electron/src/ipc/network/cert-utils.js
+++ b/packages/bruno-electron/src/ipc/network/cert-utils.js
@@ -1,10 +1,10 @@
 const fs = require('node:fs');
 const path = require('path');
 const { get } = require('lodash');
+const { getCACertificates } = require('@usebruno/requests');
 const { preferencesUtil } = require('../../store/preferences');
 const { getBrunoConfig } = require('../../store/bruno-config');
 const { interpolateString } = require('./interpolate-string');
-const { getCACertificates } = require('../../utils/ca-cert');
 
 /**
  * Gets certificates and proxy configuration for a request
@@ -33,13 +33,11 @@ const getCertsAndProxyConfig = async ({
   });
 
   let caCertificates = caCertificatesData.caCertificates;
-  let caCertificateDetails = caCertificatesData.caCertificatesCount;
+  let caCertificatesCount = caCertificatesData.caCertificatesCount;
 
   // configure HTTPS agent with aggregated CA certificates
-  if (caCertificates?.length > 0) {
-    httpsAgentRequestFields['caCertificateDetails'] = caCertificateDetails;
-    httpsAgentRequestFields['ca'] = caCertificates;
-  }
+  httpsAgentRequestFields['caCertificatesCount'] = caCertificatesCount;
+  httpsAgentRequestFields['ca'] = caCertificates || [];
 
   const brunoConfig = getBrunoConfig(collectionUid);
   const interpolationOptions = {
diff --git a/packages/bruno-electron/src/utils/ca-cert.js b/packages/bruno-electron/src/utils/ca-cert.js
deleted file mode 100644
index bb8516c2f..000000000
--- a/packages/bruno-electron/src/utils/ca-cert.js
+++ /dev/null
@@ -1,119 +0,0 @@
-const { systemCertsAsync } = require('system-ca');
-const { rootCertificates } = require('node:tls');
-const fs = require('node:fs');
-
-let systemCertsCache;
-
-async function getSystemCerts(systemCAOpts = {}) {
-  if (systemCertsCache) return systemCertsCache;
-
-  try {
-    systemCertsCache = await systemCertsAsync(systemCAOpts);
-
-    return systemCertsCache;
-  } catch (error) {
-    console.error(error);
-    return [];
-  }
-}
-
-function certToString(cert) {
-  return typeof cert === 'string'
-    ? cert
-    : Buffer.from(cert.buffer, cert.byteOffset, cert.byteLength).toString('utf8');
-}
-
-function mergeCA(...args) {
-  const ca = new Set();
-  for (const item of args) {
-    if (!item) continue;
-    const caList = Array.isArray(item) ? item : [item];
-    for (const cert of caList) {
-      ca.add(certToString(cert));
-    }
-  }
-  return [...ca].join('\n');
-}
-
-function getNodeExtraCACerts() {
-  const extraCACertPath = process.env.NODE_EXTRA_CA_CERTS;
-  if (!extraCACertPath) return [];
-
-  try {
-    if (fs.existsSync(extraCACertPath)) {
-      const extraCACert = fs.readFileSync(extraCACertPath, 'utf8');
-      if (extraCACert && extraCACert.trim()) {
-        return [extraCACert];
-      }
-    }
-  } catch (err) {
-    console.error(`Failed to read NODE_EXTRA_CA_CERTS from ${extraCACertPath}:`, err.message);
-  }
-
-  return [];
-}
-
-
-const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true }) => {
-  try {
-    let caCertificates = '';
-    let caCertificatesCount = {
-      system: 0,
-      root: 0,
-      custom: 0,
-      extra: 0
-    }
-
-    let systemCerts = [];
-    let rootCerts = [];
-    let customCerts = [];
-    let nodeExtraCerts = [];
-
-    if (shouldKeepDefaultCerts) {
-      // get system certs
-      systemCerts = await getSystemCerts();
-      caCertificatesCount.system = systemCerts.length;
-
-      // get root certs
-      rootCerts = [...rootCertificates];
-      caCertificatesCount.root = rootCerts.length;
-    }
-
-    // handle user-provided custom CA certificate file with optional default certificates
-    if (caCertFilePath) {
-      // validate custom CA certificate file
-      if (fs.existsSync(caCertFilePath)) {
-        try {
-          const customCert = fs.readFileSync(caCertFilePath, 'utf8');
-          if (customCert && customCert.trim()) {
-            customCerts.push(customCert);
-            caCertificatesCount.custom = customCerts.length;
-          }
-        } catch (err) {
-          console.error(`Failed to read custom CA certificate from ${caCertFilePath}:`, (err).message);
-          throw new Error(`Unable to load custom CA certificate: ${(err).message}`);
-        }
-      }
-    }
-
-    // get NODE_EXTRA_CA_CERTS
-    nodeExtraCerts = getNodeExtraCACerts();
-    caCertificatesCount.extra = nodeExtraCerts.length;
-
-    // merge certs
-    const mergedCerts = mergeCA(systemCerts, rootCerts, customCerts, nodeExtraCerts);
-    caCertificates = mergedCerts;
-
-    return {
-      caCertificates,
-      caCertificatesCount
-    }
-  } catch (err) {
-    console.error('Error configuring CA certificates:', (err).message);
-    throw err; // Re-throw certificate loading errors as they're critical
-  }
-}
-
-module.exports = {
-  getCACertificates
-};
\ No newline at end of file
diff --git a/packages/bruno-electron/src/utils/proxy-util.js b/packages/bruno-electron/src/utils/proxy-util.js
index d1aacac28..dd42541fb 100644
--- a/packages/bruno-electron/src/utils/proxy-util.js
+++ b/packages/bruno-electron/src/utils/proxy-util.js
@@ -88,8 +88,8 @@ function createTimelineAgentClass(BaseAgentClass) {
   return class extends BaseAgentClass {
     constructor(options, timeline) {
 
-      let caCertificateDetails = options.caCertificateDetails || {};
-      delete options.caCertificateDetails;
+      let caCertificatesCount = options.caCertificatesCount || {};
+      delete options.caCertificatesCount;
 
       // For proxy agents, the first argument is the proxy URI and the second is options
       if (options?.proxy) {
@@ -136,7 +136,7 @@ function createTimelineAgentClass(BaseAgentClass) {
         });
       }
 
-      this.caCertificateDetails = caCertificateDetails;
+      this.caCertificatesCount = caCertificatesCount;
     }
 
 
@@ -152,10 +152,10 @@ function createTimelineAgentClass(BaseAgentClass) {
         });
       }
 
-      const rootCerts = this.caCertificateDetails.root || 0;
-      const systemCerts = this.caCertificateDetails.system || 0;
-      const extraCerts = this.caCertificateDetails.extra || 0;
-      const customCerts = this.caCertificateDetails.custom || 0;
+      const rootCerts = this.caCertificatesCount.root || 0;
+      const systemCerts = this.caCertificatesCount.system || 0;
+      const extraCerts = this.caCertificatesCount.extra || 0;
+      const customCerts = this.caCertificatesCount.custom || 0;
 
       this.timeline.push({
         timestamp: new Date(),
diff --git a/packages/bruno-requests/package.json b/packages/bruno-requests/package.json
index 266b3b472..1ca177353 100644
--- a/packages/bruno-requests/package.json
+++ b/packages/bruno-requests/package.json
@@ -27,6 +27,7 @@
     "axios": "^1.9.0",
     "grpc-reflection-js": "^0.3.0",
     "is-ip": "^5.0.1",
+    "system-ca": "^2.0.1",
     "tough-cookie": "^6.0.0"
   },
   "devDependencies": {
diff --git a/packages/bruno-requests/rollup.config.js b/packages/bruno-requests/rollup.config.js
index 9d8f9513e..e6b9e2f16 100644
--- a/packages/bruno-requests/rollup.config.js
+++ b/packages/bruno-requests/rollup.config.js
@@ -39,6 +39,6 @@ module.exports = [
       typescript({ tsconfig: './tsconfig.json' }),
       terser(),
     ],
-    external: ['axios', 'qs']
+    external: ['axios', 'qs', 'system-ca']
   }
 ];
diff --git a/packages/bruno-requests/src/index.ts b/packages/bruno-requests/src/index.ts
index 581e04af2..ffddfeffb 100644
--- a/packages/bruno-requests/src/index.ts
+++ b/packages/bruno-requests/src/index.ts
@@ -2,4 +2,6 @@ export { addDigestInterceptor, getOAuth2Token } from  './auth';
 export { GrpcClient, generateGrpcSampleMessage } from './grpc';
 export { default as cookies } from './cookies';
 
+export { getCACertificates } from './utils/ca-cert';
+
 export * as scripting from './scripting';
\ No newline at end of file
diff --git a/packages/bruno-cli/src/utils/ca-cert.js b/packages/bruno-requests/src/utils/ca-cert.ts
similarity index 50%
rename from packages/bruno-cli/src/utils/ca-cert.js
rename to packages/bruno-requests/src/utils/ca-cert.ts
index bb8516c2f..b15315ab1 100644
--- a/packages/bruno-cli/src/utils/ca-cert.js
+++ b/packages/bruno-requests/src/utils/ca-cert.ts
@@ -1,10 +1,25 @@
-const { systemCertsAsync } = require('system-ca');
-const { rootCertificates } = require('node:tls');
-const fs = require('node:fs');
+import { systemCertsAsync, Options as SystemCAOptions } from 'system-ca';
+import { rootCertificates } from 'node:tls';
+import * as fs from 'node:fs';
 
-let systemCertsCache;
+type T_CACertificatesOptions = {
+  caCertFilePath?: string;
+  shouldKeepDefaultCerts?: boolean;
+}
 
-async function getSystemCerts(systemCAOpts = {}) {
+type T_CACertificatesResult = {
+  caCertificates: string;
+  caCertificatesCount: {
+    system: number;
+    root: number;
+    custom: number;
+    extra: number;
+  };
+}
+
+let systemCertsCache: string[] | undefined;
+
+async function getSystemCerts(systemCAOpts: SystemCAOptions = {}): Promise<string[]> {
   if (systemCertsCache) return systemCertsCache;
 
   try {
@@ -17,25 +32,27 @@ async function getSystemCerts(systemCAOpts = {}) {
   }
 }
 
-function certToString(cert) {
+function certToString(cert: string | Buffer) {
   return typeof cert === 'string'
     ? cert
     : Buffer.from(cert.buffer, cert.byteOffset, cert.byteLength).toString('utf8');
 }
 
-function mergeCA(...args) {
-  const ca = new Set();
+function mergeCA(...args: (string | string[])[]): string {
+  const ca = new Set<string>();
   for (const item of args) {
     if (!item) continue;
     const caList = Array.isArray(item) ? item : [item];
     for (const cert of caList) {
-      ca.add(certToString(cert));
+      if (cert) {
+        ca.add(certToString(cert));
+      }
     }
   }
   return [...ca].join('\n');
 }
 
-function getNodeExtraCACerts() {
+function getNodeExtraCACerts(): string[] {
   const extraCACertPath = process.env.NODE_EXTRA_CA_CERTS;
   if (!extraCACertPath) return [];
 
@@ -47,14 +64,34 @@ function getNodeExtraCACerts() {
       }
     }
   } catch (err) {
-    console.error(`Failed to read NODE_EXTRA_CA_CERTS from ${extraCACertPath}:`, err.message);
+    console.error(`Failed to read NODE_EXTRA_CA_CERTS from ${extraCACertPath}:`, (err as Error).message);
   }
 
   return [];
 }
 
+/**
+ * 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 {Promise<T_CACertificatesResult>} - CA certificates and their count
+ */
 
-const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true }) => {
+const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true }: T_CACertificatesOptions): Promise<T_CACertificatesResult> => {
   try {
     let caCertificates = '';
     let caCertificatesCount = {
@@ -64,20 +101,11 @@ const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true
       extra: 0
     }
 
-    let systemCerts = [];
-    let rootCerts = [];
-    let customCerts = [];
-    let nodeExtraCerts = [];
+    let systemCerts: string[] = [];
+    let rootCerts: string[] = [];
+    let customCerts: string[] = [];
+    let nodeExtraCerts: string[] = [];
 
-    if (shouldKeepDefaultCerts) {
-      // get system certs
-      systemCerts = await getSystemCerts();
-      caCertificatesCount.system = systemCerts.length;
-
-      // get root certs
-      rootCerts = [...rootCertificates];
-      caCertificatesCount.root = rootCerts.length;
-    }
 
     // handle user-provided custom CA certificate file with optional default certificates
     if (caCertFilePath) {
@@ -90,10 +118,30 @@ const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true
             caCertificatesCount.custom = customCerts.length;
           }
         } catch (err) {
-          console.error(`Failed to read custom CA certificate from ${caCertFilePath}:`, (err).message);
-          throw new Error(`Unable to load custom CA certificate: ${(err).message}`);
+          console.error(`Failed to read custom CA certificate from ${caCertFilePath}:`, (err as Error).message);
+          throw new Error(`Unable to load custom CA certificate: ${(err as Error).message}`);
         }
+      } else {
+        throw new Error(`Invalid custom CA certificate path: ${caCertFilePath}`);
       }
+
+      if (shouldKeepDefaultCerts) {
+        // get system certs
+        systemCerts = await getSystemCerts();
+        caCertificatesCount.system = systemCerts.length;
+
+        // get root certs
+        rootCerts = [...rootCertificates];
+        caCertificatesCount.root = rootCerts.length;
+      }
+    } else {
+      // get system certs
+      systemCerts = await getSystemCerts();
+      caCertificatesCount.system = systemCerts.length;
+
+      // get root certs
+      rootCerts = [...rootCertificates];
+      caCertificatesCount.root = rootCerts.length;
     }
 
     // get NODE_EXTRA_CA_CERTS
@@ -109,11 +157,11 @@ const getCACertificates = async ({ caCertFilePath, shouldKeepDefaultCerts = true
       caCertificatesCount
     }
   } catch (err) {
-    console.error('Error configuring CA certificates:', (err).message);
+    console.error('Error configuring CA certificates:', (err as Error).message);
     throw err; // Re-throw certificate loading errors as they're critical
   }
 }
 
-module.exports = {
+export {
   getCACertificates
 };
\ No newline at end of file
diff --git a/playwright.config.ts b/playwright.config.ts
index c4cf7f6df..8dabe2970 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -35,12 +35,14 @@ export default defineConfig({
     {
       command: 'npm run dev:web',
       url: 'http://localhost:3000',
-      reuseExistingServer: !process.env.CI
+      reuseExistingServer: !process.env.CI,
+      timeout: 10 * 60 * 1000
     },
     {
       command: 'npm start --workspace=packages/bruno-tests',
       url: 'http://localhost:8081/ping',
-      reuseExistingServer: !process.env.CI
+      reuseExistingServer: !process.env.CI,
+      timeout: 10 * 60 * 1000
     }
   ]
 });