From 086d0d98ef0262d435e1ae1254d9ea5720dd0f93 Mon Sep 17 00:00:00 2001
From: srikary12 <121927567+srikary12@users.noreply.github.com>
Date: Wed, 26 Nov 2025 12:17:52 +0530
Subject: [PATCH 1/3] feature/autoSave (#582)

---
 .../components/RequestPane/QueryUrl/index.js  |  7 +++--
 .../src/components/SingleLineEditor/index.js  | 24 ++++++++++++++++
 .../ReduxStore/slices/collections/actions.js  | 28 +++++++++++--------
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
index a1d7dd86a..69963f45f 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
@@ -10,12 +10,14 @@ import SingleLineEditor from 'components/SingleLineEditor';
 import { isMacOS } from 'utils/common/platform';
 import { hasRequestChanges } from 'utils/collections';
 import StyledWrapper from './StyledWrapper';
+import { usePreferences } from 'providers/Preferences/index';
 import GenerateCodeItem from 'components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index';
 import toast from 'react-hot-toast';
 
 const QueryUrl = ({ item, collection, handleRun }) => {
   const { theme, storedTheme } = useTheme();
   const dispatch = useDispatch();
+  const autoSavePreference = usePreferences().preferences.request.autoSave;
   const method = item.draft ? get(item, 'draft.request.method') : get(item, 'request.method');
   const url = item.draft ? get(item, 'draft.request.url', '') : get(item, 'request.url', '');
   const isMac = isMacOS();
@@ -33,8 +35,8 @@ const QueryUrl = ({ item, collection, handleRun }) => {
     setMethodSelectorWidth(el.offsetWidth);
   }, [method]);
 
-  const onSave = (finalValue) => {
-    dispatch(saveRequest(item.uid, collection.uid));
+  const onSave = (notify = 1) => {
+    dispatch(saveRequest(item.uid, collection.uid, notify));
   };
 
   const onUrlChange = (value) => {
@@ -118,6 +120,7 @@ const QueryUrl = ({ item, collection, handleRun }) => {
           highlightPathParams={true}
           item={item}
           showNewlineArrow={true}
+          autoSave={autoSavePreference}
         />
         <div className="flex items-center h-full mr-2 cursor-pointer" id="send-request" onClick={handleRun}>
           <div
diff --git a/packages/bruno-app/src/components/SingleLineEditor/index.js b/packages/bruno-app/src/components/SingleLineEditor/index.js
index 7718ed28e..9c031ba1d 100644
--- a/packages/bruno-app/src/components/SingleLineEditor/index.js
+++ b/packages/bruno-app/src/components/SingleLineEditor/index.js
@@ -5,6 +5,7 @@ import { defineCodeMirrorBrunoVariablesMode } from 'utils/common/codemirror';
 import { MaskedEditor } from 'utils/common/masked-editor';
 import { setupAutoComplete } from 'utils/codemirror/autocomplete';
 import StyledWrapper from './StyledWrapper';
+import { usePreferences } from 'providers/Preferences/index';
 import { IconEye, IconEyeOff } from '@tabler/icons';
 import { setupLinkAware } from 'utils/codemirror/linkAware';
 
@@ -19,6 +20,7 @@ class SingleLineEditor extends Component {
     this.cachedValue = props.value || '';
     this.editorRef = React.createRef();
     this.variables = {};
+    this.autoSaveInterval = null;
     this.readOnly = props.readOnly || false;
 
     this.state = {
@@ -100,6 +102,7 @@ class SingleLineEditor extends Component {
     this.editor.on('change', this._onEdit);
     this.editor.on('paste', this._onPaste);
     this.addOverlay(variables);
+    this.startAutosave();
     this._enableMaskedEditor(this.props.isSecret);
     this.setState({ maskInput: this.props.isSecret });
 
@@ -140,6 +143,26 @@ class SingleLineEditor extends Component {
     }
   };
 
+  startAutosave = () => {
+    if (this.props.autoSave && this.props.onSave) {
+      this.autoSaveInterval = setInterval(this.saveEditorContent, this.props.autoSaveInterval || 15000); // Default to 15 sec
+    }
+  };
+
+  clearAutosave = () => {
+    if (this.autoSaveInterval) {
+      clearInterval(this.autoSaveInterval);
+    }
+  };
+
+  saveEditorContent = () => {
+    if (this.props.onSave) {
+      const content = this.editor.getValue();
+      console.log(content);
+      this.props.onSave(content, 0);
+    }
+  };
+  
   _onPaste = (_, event) => this.props.onPaste?.(event);
 
   componentDidUpdate(prevProps) {
@@ -190,6 +213,7 @@ class SingleLineEditor extends Component {
   }
 
   componentWillUnmount() {
+    this.clearAutosave();
     if (this.editor) {
       if (this.editor?._destroyLinkAware) {
         this.editor._destroyLinkAware();
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 27a068d05..0639e046e 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -94,28 +94,32 @@ export const renameCollection = (newName, collectionUid) => (dispatch, getState)
   });
 };
 
-export const saveRequest = (itemUid, collectionUid, saveSilently) => (dispatch, getState) => {
+
+export const saveRequest = (itemUid, collectionUid, saveSilently, notify = 1) => (dispatch, getState) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
 
-  return new Promise((resolve, reject) => {
-    if (!collection) {
-      return reject(new Error('Collection not found'));
-    }
+    return new Promise((resolve, reject) => {
+      if (!collection) {
+        return reject(new Error('Collection not found'));
+      }
 
-    const collectionCopy = cloneDeep(collection);
-    const item = findItemInCollection(collectionCopy, itemUid);
-    if (!item) {
-      return reject(new Error('Not able to locate item'));
-    }
+      const collectionCopy = cloneDeep(collection);
+      const item = findItemInCollection(collectionCopy, itemUid);
+      if (!item) {
+        return reject(new Error('Not able to locate item'));
+      }
 
-    const itemToSave = transformRequestToSaveToFilesystem(item);
-    const { ipcRenderer } = window;
+      const itemToSave = transformRequestToSaveToFilesystem(item);
+      const { ipcRenderer } = window;
 
     itemSchema
       .validate(itemToSave)
       .then(() => ipcRenderer.invoke('renderer:save-request', item.pathname, itemToSave))
       .then(() => {
+        if (notify === 1) {
+          toast.success('Request saved successfully');
+        }
         if (!saveSilently) {
           toast.success('Request saved successfully');
         }

From 4ce5debc4c9484493f911aa1111528a11ace2a56 Mon Sep 17 00:00:00 2001
From: Pooja <pooja@usebruno.com>
Date: Tue, 2 Dec 2025 13:46:06 +0530
Subject: [PATCH 2/3] feature/autoSave (#582) (#6225)

---
 .../actions/common/setup-node-deps/action.yml |   1 +
 .github/workflows/tests.yml                   |   3 +
 contributing.md                               |   1 +
 package-lock.json                             | 258 ++++----
 package.json                                  |   2 +
 .../CollectionSettings/Presets/index.js       |   5 +-
 .../CollectionSettings/Vars/index.js          |   4 +
 .../DeprecationWarning/StyledWrapper.js       |  33 ++
 .../components/DeprecationWarning/index.js    |  16 +
 .../components/FolderSettings/Vars/index.js   |   4 +
 .../Icons/IconAlertTriangleFilled/index.js    |  14 +
 .../components/Preferences/General/index.js   |  64 +-
 .../components/RequestPane/GrpcBody/index.js  |   4 +-
 .../RequestPane/GrpcQueryUrl/index.js         |  14 +-
 .../components/RequestPane/QueryUrl/index.js  |   7 +-
 .../src/components/RequestPane/Vars/index.js  |   3 +
 .../Sidebar/CreateCollection/StyledWrapper.js |  12 +
 .../Sidebar/CreateCollection/index.js         | 340 +++++++----
 .../components/Sidebar/NewRequest/index.js    |  18 +-
 .../src/components/SingleLineEditor/index.js  |  24 -
 .../src/providers/ReduxStore/index.js         |   3 +-
 .../middlewares/autosave/middleware.js        | 161 +++++
 .../src/providers/ReduxStore/slices/app.js    |   4 +
 .../ReduxStore/slices/collections/actions.js  | 211 +++++--
 .../ReduxStore/slices/collections/index.js    |   9 +
 packages/bruno-app/src/themes/dark.js         |  13 +
 packages/bruno-app/src/themes/light.js        |  13 +
 .../bruno-app/src/utils/common/platform.js    |   4 +-
 .../src/postman/postman-translations.js       |  12 +
 .../src/utils/jscode-shift-translator.js      |   9 +-
 .../postman-request.spec.js                   |  16 +
 .../transpiler-tests/request.test.js          |  16 +
 .../src/app/collection-watcher.js             | 292 +++++----
 .../bruno-electron/src/app/collections.js     |  26 +-
 packages/bruno-electron/src/ipc/collection.js | 456 ++++++++++-----
 .../bruno-electron/src/ipc/network/index.js   |  16 +-
 .../bruno-electron/src/store/preferences.js   |   8 +
 .../src/utils/collection-import.js            |  32 +-
 .../bruno-electron/src/utils/collection.js    |  62 ++
 .../bruno-electron/src/utils/filesystem.js    |  52 +-
 packages/bruno-filestore/package.json         |  15 +-
 packages/bruno-filestore/rollup.config.js     |  59 +-
 .../bruno-filestore/src/formats/bru/index.ts  |  14 +-
 .../tests/oauth2-additional-params.spec.js    |   2 +-
 .../src/formats/yml/common/assertions.ts      | 146 +++++
 .../src/formats/yml/common/auth-oauth2.ts     | 553 ++++++++++++++++++
 .../src/formats/yml/common/auth.ts            | 245 ++++++++
 .../src/formats/yml/common/body.ts            | 234 ++++++++
 .../src/formats/yml/common/headers.ts         |  45 ++
 .../src/formats/yml/common/params.ts          |  57 ++
 .../src/formats/yml/common/scripts.ts         |  51 ++
 .../src/formats/yml/common/variables.ts       |  80 +++
 .../bruno-filestore/src/formats/yml/index.ts  |  20 +
 .../formats/yml/items/parseGraphQLRequest.ts  | 128 ++++
 .../src/formats/yml/items/parseGrpcRequest.ts | 112 ++++
 .../src/formats/yml/items/parseHttpRequest.ts | 186 ++++++
 .../src/formats/yml/items/parseScript.ts      |  25 +
 .../yml/items/parseWebsocketRequest.ts        |  87 +++
 .../yml/items/stringifyGraphQLRequest.ts      | 150 +++++
 .../formats/yml/items/stringifyGrpcRequest.ts | 123 ++++
 .../formats/yml/items/stringifyHttpRequest.ts | 201 +++++++
 .../src/formats/yml/items/stringifyScript.ts  |  22 +
 .../yml/items/stringifyWebsocketRequest.ts    |  91 +++
 .../src/formats/yml/parseCollection.ts        | 177 ++++++
 .../src/formats/yml/parseEnvironment.ts       |  42 ++
 .../src/formats/yml/parseFolder.ts            |  82 +++
 .../src/formats/yml/parseItem.ts              |  46 ++
 .../src/formats/yml/stringifyCollection.ts    | 190 ++++++
 .../src/formats/yml/stringifyEnvironment.ts   |  57 ++
 .../src/formats/yml/stringifyFolder.ts        |  92 +++
 .../src/formats/yml/stringifyItem.ts          |  37 ++
 .../bruno-filestore/src/formats/yml/utils.ts  |  14 +
 packages/bruno-filestore/src/index.ts         |  81 ++-
 packages/bruno-filestore/src/types.ts         | 127 +---
 packages/bruno-filestore/src/utils/index.ts   |  15 +
 packages/bruno-filestore/src/workers/index.ts |  14 +-
 .../src/workers/worker-script.ts              |  24 +-
 packages/bruno-filestore/tsconfig.json        |  11 +-
 .../bruno-js/src/sandbox/node-vm/index.js     |   7 +-
 packages/bruno-lang/v2/src/bruToJson.js       |  16 -
 .../bruno-lang/v2/tests/bruToJson.spec.js     |  54 ++
 packages/bruno-schema-types/.gitignore        |  18 +
 packages/bruno-schema-types/package.json      |  52 ++
 .../src/collection/collection.ts              |  23 +
 .../src/collection/environment.ts             |  19 +
 .../src/collection/examples.ts                |  35 ++
 .../src/collection/folder.ts                  |  24 +
 .../src/collection/index.ts                   |  22 +
 .../bruno-schema-types/src/collection/item.ts |  45 ++
 .../bruno-schema-types/src/common/auth.ts     | 106 ++++
 .../bruno-schema-types/src/common/file.ts     |  11 +
 .../bruno-schema-types/src/common/graphql.ts  |   5 +
 .../bruno-schema-types/src/common/index.ts    |  23 +
 .../src/common/key-value.ts                   |  13 +
 .../src/common/multipart-form.ts              |  14 +
 .../bruno-schema-types/src/common/scripts.ts  |   5 +
 packages/bruno-schema-types/src/common/uid.ts |   5 +
 .../src/common/variables.ts                   |  16 +
 packages/bruno-schema-types/src/index.ts      |  11 +
 .../bruno-schema-types/src/requests/grpc.ts   |  37 ++
 .../bruno-schema-types/src/requests/http.ts   |  56 ++
 .../bruno-schema-types/src/requests/index.ts  |  27 +
 .../src/requests/websocket.ts                 |  28 +
 packages/bruno-schema-types/tsconfig.json     |  20 +
 scripts/setup.js                              |   3 +-
 .../draft/draft-values-in-requests.spec.ts    |   1 +
 .../open/open-multiple-collections.spec.ts    |   2 +-
 tests/preferences/autosave/autosave.spec.ts   | 198 +++++++
 108 files changed, 5943 insertions(+), 850 deletions(-)
 create mode 100644 packages/bruno-app/src/components/DeprecationWarning/StyledWrapper.js
 create mode 100644 packages/bruno-app/src/components/DeprecationWarning/index.js
 create mode 100644 packages/bruno-app/src/components/Icons/IconAlertTriangleFilled/index.js
 create mode 100644 packages/bruno-app/src/components/Sidebar/CreateCollection/StyledWrapper.js
 create mode 100644 packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js
 create mode 100644 packages/bruno-filestore/src/formats/yml/common/assertions.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/common/auth-oauth2.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/common/auth.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/common/body.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/common/headers.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/common/params.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/common/scripts.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/common/variables.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/index.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/parseGrpcRequest.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/parseHttpRequest.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/parseScript.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/parseWebsocketRequest.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/stringifyGraphQLRequest.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/stringifyGrpcRequest.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/stringifyHttpRequest.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/stringifyScript.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/items/stringifyWebsocketRequest.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/parseCollection.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/parseEnvironment.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/parseFolder.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/parseItem.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/stringifyCollection.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/stringifyEnvironment.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/stringifyFolder.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/stringifyItem.ts
 create mode 100644 packages/bruno-filestore/src/formats/yml/utils.ts
 create mode 100644 packages/bruno-filestore/src/utils/index.ts
 create mode 100644 packages/bruno-schema-types/.gitignore
 create mode 100644 packages/bruno-schema-types/package.json
 create mode 100644 packages/bruno-schema-types/src/collection/collection.ts
 create mode 100644 packages/bruno-schema-types/src/collection/environment.ts
 create mode 100644 packages/bruno-schema-types/src/collection/examples.ts
 create mode 100644 packages/bruno-schema-types/src/collection/folder.ts
 create mode 100644 packages/bruno-schema-types/src/collection/index.ts
 create mode 100644 packages/bruno-schema-types/src/collection/item.ts
 create mode 100644 packages/bruno-schema-types/src/common/auth.ts
 create mode 100644 packages/bruno-schema-types/src/common/file.ts
 create mode 100644 packages/bruno-schema-types/src/common/graphql.ts
 create mode 100644 packages/bruno-schema-types/src/common/index.ts
 create mode 100644 packages/bruno-schema-types/src/common/key-value.ts
 create mode 100644 packages/bruno-schema-types/src/common/multipart-form.ts
 create mode 100644 packages/bruno-schema-types/src/common/scripts.ts
 create mode 100644 packages/bruno-schema-types/src/common/uid.ts
 create mode 100644 packages/bruno-schema-types/src/common/variables.ts
 create mode 100644 packages/bruno-schema-types/src/index.ts
 create mode 100644 packages/bruno-schema-types/src/requests/grpc.ts
 create mode 100644 packages/bruno-schema-types/src/requests/http.ts
 create mode 100644 packages/bruno-schema-types/src/requests/index.ts
 create mode 100644 packages/bruno-schema-types/src/requests/websocket.ts
 create mode 100644 packages/bruno-schema-types/tsconfig.json
 create mode 100644 tests/preferences/autosave/autosave.spec.ts

diff --git a/.github/actions/common/setup-node-deps/action.yml b/.github/actions/common/setup-node-deps/action.yml
index f99758768..66c32f298 100644
--- a/.github/actions/common/setup-node-deps/action.yml
+++ b/.github/actions/common/setup-node-deps/action.yml
@@ -23,4 +23,5 @@ runs:
         npm run sandbox:bundle-libraries --workspace=packages/bruno-js
         npm run build:bruno-converters
         npm run build:bruno-requests
+        npm run build:schema-types
         npm run build:bruno-filestore
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ffbe6df2f..60dd85f77 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -30,6 +30,7 @@ jobs:
           npm run sandbox:bundle-libraries --workspace=packages/bruno-js
           npm run build --workspace=packages/bruno-converters
           npm run build --workspace=packages/bruno-requests
+          npm run build --workspace=packages/bruno-schema-types
           npm run build --workspace=packages/bruno-filestore
 
       - name: Lint Check
@@ -83,6 +84,7 @@ jobs:
           npm run sandbox:bundle-libraries --workspace=packages/bruno-js
           npm run build --workspace=packages/bruno-converters
           npm run build --workspace=packages/bruno-requests
+          npm run build --workspace=packages/bruno-schema-types
           npm run build --workspace=packages/bruno-filestore
 
       - name: Run Local Testbench
@@ -134,6 +136,7 @@ jobs:
         npm run sandbox:bundle-libraries --workspace=packages/bruno-js
         npm run build:bruno-converters
         npm run build:bruno-requests
+        npm run build:schema-types
         npm run build:bruno-filestore
 
     - name: Run Playwright tests
diff --git a/contributing.md b/contributing.md
index 6206d59f5..988dcf36d 100644
--- a/contributing.md
+++ b/contributing.md
@@ -70,6 +70,7 @@ npm run build:bruno-query
 npm run build:bruno-common
 npm run build:bruno-converters
 npm run build:bruno-requests
+npm run build:schema-types
 npm run build:bruno-filestore
 
 # bundle js sandbox libraries
diff --git a/package-lock.json b/package-lock.json
index ad4fd8d9b..6adf47774 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
         "packages/bruno-common",
         "packages/bruno-converters",
         "packages/bruno-schema",
+        "packages/bruno-schema-types",
         "packages/bruno-query",
         "packages/bruno-js",
         "packages/bruno-lang",
@@ -3554,6 +3555,16 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/@develar/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/@develar/schema-utils/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -5566,6 +5577,13 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@opencollection/types": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@opencollection/types/-/types-0.1.0.tgz",
+      "integrity": "sha512-/v64ShE+KyDUAfAlO6Qd5wBwPArd603VC44eife/CdmrtPUSIiFBYcZ9gxAD7LlW99J36wb5IkMpKFDvViINiA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@parcel/watcher": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
@@ -6964,25 +6982,6 @@
         "@rsbuild/core": "1.x"
       }
     },
-    "node_modules/@rsbuild/plugin-sass/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/@rsbuild/plugin-sass/node_modules/postcss": {
       "version": "8.4.49",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
@@ -8407,6 +8406,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/nanoid": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/nanoid/-/nanoid-2.1.0.tgz",
+      "integrity": "sha512-xdkn/oRTA0GSNPLIKZgHWqDTWZsVrieKomxJBOQUK9YDD+zfSgmwD5t4WJYra5S7XyhTw7tfvwznW+pFexaepQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/node": {
       "version": "22.15.17",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.17.tgz",
@@ -8843,6 +8851,10 @@
       "resolved": "packages/bruno-schema",
       "link": true
     },
+    "node_modules/@usebruno/schema-types": {
+      "resolved": "packages/bruno-schema-types",
+      "link": true
+    },
     "node_modules/@usebruno/tests": {
       "resolved": "packages/bruno-tests",
       "link": true
@@ -9306,16 +9318,6 @@
         }
       }
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/amdefine": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz",
@@ -19413,6 +19415,24 @@
       "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==",
       "license": "MIT"
     },
+    "node_modules/nanoid": {
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/native-reg": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/native-reg/-/native-reg-1.1.1.tgz",
@@ -21241,25 +21261,6 @@
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "license": "MIT"
     },
-    "node_modules/postcss/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/posthog-node": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-4.2.1.tgz",
@@ -23735,6 +23736,16 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/schema-utils/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -28437,24 +28448,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "packages/bruno-app/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "packages/bruno-app/node_modules/semver": {
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
@@ -30233,24 +30226,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "packages/bruno-converters/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "packages/bruno-converters/node_modules/rimraf": {
       "version": "5.0.10",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
@@ -31805,24 +31780,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "packages/bruno-electron/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "packages/bruno-electron/node_modules/semver": {
       "version": "7.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
@@ -31852,20 +31809,27 @@
       "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
+        "@types/nanoid": "^2.1.0",
         "@usebruno/lang": "0.12.0",
-        "lodash": "^4.17.21"
+        "ajv": "^8.17.1",
+        "lodash": "^4.17.21",
+        "yaml": "^2.3.4"
       },
       "devDependencies": {
         "@babel/preset-env": "^7.22.0",
         "@babel/preset-typescript": "^7.22.0",
+        "@opencollection/types": "0.1.0",
         "@rollup/plugin-commonjs": "^23.0.2",
+        "@rollup/plugin-json": "^6.1.0",
         "@rollup/plugin-node-resolve": "^15.0.1",
-        "@rollup/plugin-typescript": "^9.0.2",
+        "@rollup/plugin-typescript": "^12.1.2",
         "@types/jest": "^29.5.11",
         "@types/lodash": "^4.14.191",
         "@types/node": "^24.1.0",
+        "@usebruno/schema-types": "0.0.1",
         "babel-jest": "^29.7.0",
         "jest": "^29.2.0",
+        "nanoid": "3.3.8",
         "rimraf": "^3.0.2",
         "rollup": "3.29.5",
         "rollup-plugin-dts": "^5.0.0",
@@ -31874,6 +31838,33 @@
         "typescript": "^4.8.4"
       }
     },
+    "packages/bruno-filestore/node_modules/@rollup/plugin-typescript": {
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
+      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.1.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0||^3.0.0||^4.0.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
+      }
+    },
     "packages/bruno-filestore/node_modules/@types/node": {
       "version": "24.1.0",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
@@ -31954,6 +31945,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "packages/bruno-filestore/node_modules/yaml": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+      "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      }
+    },
     "packages/bruno-graphql-docs": {
       "name": "@usebruno/graphql-docs",
       "version": "0.1.0",
@@ -32056,24 +32059,6 @@
         "proxy-from-env": "^1.1.0"
       }
     },
-    "packages/bruno-js/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "packages/bruno-js/node_modules/xml-formatter": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/xml-formatter/-/xml-formatter-3.5.0.tgz",
@@ -32242,21 +32227,26 @@
         "yup": "^0.32.11"
       }
     },
-    "packages/bruno-schema/node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
+    "packages/bruno-schema-types": {
+      "name": "@usebruno/schema-types",
+      "version": "0.0.1",
+      "license": "MIT",
+      "devDependencies": {
+        "typescript": "^5.0.0"
+      }
+    },
+    "packages/bruno-schema-types/node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
       "bin": {
-        "nanoid": "bin/nanoid.cjs"
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "node": ">=14.17"
       }
     },
     "packages/bruno-tests": {
diff --git a/package.json b/package.json
index 520eaad33..c13afb087 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "packages/bruno-common",
     "packages/bruno-converters",
     "packages/bruno-schema",
+    "packages/bruno-schema-types",
     "packages/bruno-query",
     "packages/bruno-js",
     "packages/bruno-lang",
@@ -61,6 +62,7 @@
     "build:bruno-converters": "npm run build --workspace=packages/bruno-converters",
     "build:bruno-query": "npm run build --workspace=packages/bruno-query",
     "build:graphql-docs": "npm run build --workspace=packages/bruno-graphql-docs",
+    "build:schema-types": "npm run build --workspace=packages/bruno-schema-types",
     "build:electron": "node ./scripts/build-electron.js",
     "build:electron:mac": "./scripts/build-electron.sh mac",
     "build:electron:win": "./scripts/build-electron.sh win",
diff --git a/packages/bruno-app/src/components/CollectionSettings/Presets/index.js b/packages/bruno-app/src/components/CollectionSettings/Presets/index.js
index 30fd44081..ca467b547 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Presets/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Presets/index.js
@@ -4,10 +4,12 @@ import StyledWrapper from './StyledWrapper';
 import { updateCollectionPresets } from 'providers/ReduxStore/slices/collections';
 import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
 import { get } from 'lodash';
+import DeprecationWarning from 'components/DeprecationWarning';
 
 const PresetsSettings = ({ collection }) => {
   const dispatch = useDispatch();
   const initialPresets = { requestType: 'http', requestUrl: '' };
+  const deprecationWarningMessage = 'Presets is deprecated and will be removed in v3.0.0';
 
   // Get presets from draft.brunoConfig if it exists, otherwise from brunoConfig
   const currentPresets = collection.draft?.brunoConfig
@@ -35,7 +37,8 @@ const PresetsSettings = ({ collection }) => {
 
   return (
     <StyledWrapper className="h-full w-full">
-      <div className="text-xs mb-4 text-muted">
+      <DeprecationWarning message={deprecationWarningMessage} />
+      <div className="text-xs mb-4 mt-4 text-muted">
         These presets will be used as the default values for new requests in this collection.
       </div>
       <div className="bruno-form">
diff --git a/packages/bruno-app/src/components/CollectionSettings/Vars/index.js b/packages/bruno-app/src/components/CollectionSettings/Vars/index.js
index 02375f19a..7e0142520 100644
--- a/packages/bruno-app/src/components/CollectionSettings/Vars/index.js
+++ b/packages/bruno-app/src/components/CollectionSettings/Vars/index.js
@@ -4,12 +4,15 @@ import VarsTable from './VarsTable';
 import StyledWrapper from './StyledWrapper';
 import { saveCollectionSettings } from 'providers/ReduxStore/slices/collections/actions';
 import { useDispatch } from 'react-redux';
+import DeprecationWarning from 'components/DeprecationWarning';
 
 const Vars = ({ collection }) => {
   const dispatch = useDispatch();
   const requestVars = collection.draft?.root ? get(collection, 'draft.root.request.vars.req', []) : get(collection, 'root.request.vars.req', []);
   const responseVars = collection.draft?.root ? get(collection, 'draft.root.request.vars.res', []) : get(collection, 'root.request.vars.res', []);
   const handleSave = () => dispatch(saveCollectionSettings(collection.uid));
+  const deprecationWarningMessage = 'Post response vars is deprecated and will be removed in v3.0.0';
+
   return (
     <StyledWrapper className="w-full flex flex-col">
       <div className="flex-1 mt-2">
@@ -18,6 +21,7 @@ const Vars = ({ collection }) => {
       </div>
       <div className="flex-1">
         <div className="mt-1 mb-1 title text-xs">Post Response</div>
+        <DeprecationWarning message={deprecationWarningMessage} />
         <VarsTable collection={collection} vars={responseVars} varType="response" />
       </div>
       <div className="mt-6">
diff --git a/packages/bruno-app/src/components/DeprecationWarning/StyledWrapper.js b/packages/bruno-app/src/components/DeprecationWarning/StyledWrapper.js
new file mode 100644
index 000000000..71e681879
--- /dev/null
+++ b/packages/bruno-app/src/components/DeprecationWarning/StyledWrapper.js
@@ -0,0 +1,33 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  .deprecation-warning {
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 8px;
+    gap: 4px;
+    margin-bottom: 8px;
+    background: ${(props) => props.theme.deprecationWarning.bg};
+    border: 1px solid ${(props) => props.theme.deprecationWarning.border};
+    border-radius: 6px;
+
+    .warning-icon {
+      color: ${(props) => props.theme.deprecationWarning.icon};
+      flex-shrink: 0;
+      width: 16px;
+      height: 16px;
+    }
+
+    .warning-text {
+      font-family: 'Inter', sans-serif;
+      font-style: normal;
+      font-size: 14px;
+      line-height: 17px;
+      color: ${(props) => props.theme.deprecationWarning.text};
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/DeprecationWarning/index.js b/packages/bruno-app/src/components/DeprecationWarning/index.js
new file mode 100644
index 000000000..387475814
--- /dev/null
+++ b/packages/bruno-app/src/components/DeprecationWarning/index.js
@@ -0,0 +1,16 @@
+import React from 'react';
+import IconAlertTriangleFilled from '../Icons/IconAlertTriangleFilled';
+import StyledWrapper from './StyledWrapper';
+
+const DeprecationWarning = ({ message }) => {
+  return (
+    <StyledWrapper>
+      <div className="deprecation-warning">
+        <IconAlertTriangleFilled className="warning-icon" size={16} />
+        <span className="warning-text">{message}</span>
+      </div>
+    </StyledWrapper>
+  );
+};
+
+export default DeprecationWarning;
diff --git a/packages/bruno-app/src/components/FolderSettings/Vars/index.js b/packages/bruno-app/src/components/FolderSettings/Vars/index.js
index 69f901fab..34c72cd25 100644
--- a/packages/bruno-app/src/components/FolderSettings/Vars/index.js
+++ b/packages/bruno-app/src/components/FolderSettings/Vars/index.js
@@ -4,12 +4,15 @@ import VarsTable from './VarsTable';
 import StyledWrapper from './StyledWrapper';
 import { saveFolderRoot } from 'providers/ReduxStore/slices/collections/actions';
 import { useDispatch } from 'react-redux';
+import DeprecationWarning from 'components/DeprecationWarning';
 
 const Vars = ({ collection, folder }) => {
   const dispatch = useDispatch();
   const requestVars = folder.draft ? get(folder, 'draft.request.vars.req', []) : get(folder, 'root.request.vars.req', []);
   const responseVars = folder.draft ? get(folder, 'draft.request.vars.res', []) : get(folder, 'root.request.vars.res', []);
   const handleSave = () => dispatch(saveFolderRoot(collection.uid, folder.uid));
+  const deprecationWarningMessage = 'Post response vars is deprecated and will be removed in v3.0.0';
+
   return (
     <StyledWrapper className="w-full flex flex-col">
       <div className="flex-1 mt-2">
@@ -18,6 +21,7 @@ const Vars = ({ collection, folder }) => {
       </div>
       <div className="flex-1">
         <div className="mt-1 mb-1 title text-xs">Post Response</div>
+        <DeprecationWarning message={deprecationWarningMessage} />
         <VarsTable folder={folder} collection={collection} vars={responseVars} varType="response" />
       </div>
       <div className="mt-6">
diff --git a/packages/bruno-app/src/components/Icons/IconAlertTriangleFilled/index.js b/packages/bruno-app/src/components/Icons/IconAlertTriangleFilled/index.js
new file mode 100644
index 000000000..508a608b1
--- /dev/null
+++ b/packages/bruno-app/src/components/Icons/IconAlertTriangleFilled/index.js
@@ -0,0 +1,14 @@
+import React from 'react';
+
+const IconAlertTriangleFilled = ({ size = 16, ...props }) => {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width={size} height={size} viewBox="0 0 24 24" fill="none" {...props}>
+      <path
+        d="M12 1.67c.955 0 1.845 .467 2.39 1.247l.105 .16l8.114 13.548a2.914 2.914 0 0 1 -2.307 4.363l-.195 .008h-16.225a2.914 2.914 0 0 1 -2.582 -4.2l.099 -.185l8.11 -13.538a2.914 2.914 0 0 1 2.491 -1.403zm.01 13.33l-.127 .007a1 1 0 0 0 0 1.986l.117 .007l.127 -.007a1 1 0 0 0 0 -1.986l-.117 -.007zm-.01 -7a1 1 0 0 0 -.993 .883l-.007 .117v4l.007 .117a1 1 0 0 0 1.986 0l.007 -.117v-4l-.007 -.117a1 1 0 0 0 -.993 -.883z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+};
+
+export default IconAlertTriangleFilled;
diff --git a/packages/bruno-app/src/components/Preferences/General/index.js b/packages/bruno-app/src/components/Preferences/General/index.js
index 14eff0709..fa7bf0dea 100644
--- a/packages/bruno-app/src/components/Preferences/General/index.js
+++ b/packages/bruno-app/src/components/Preferences/General/index.js
@@ -37,6 +37,25 @@ const General = ({ close }) => {
       .test('isValidTimeout', 'Request Timeout must be equal or greater than 0', (value) => {
         return value === undefined || Number(value) >= 0;
       }),
+    autoSave: Yup.object({
+      enabled: Yup.boolean(),
+      interval: Yup.mixed()
+        .transform((value, originalValue) => {
+          return originalValue === '' ? undefined : value;
+        })
+        .test('isNumber', 'Save Delay must be a number', (value) => {
+          return value === undefined || !isNaN(value);
+        })
+        .test('isValidInterval', 'Save Delay must be at least 500ms', (value) => {
+          return value === undefined || Number(value) >= 500;
+        })
+    }).test('intervalRequired', 'Save Delay is required when Auto Save is enabled', (value) => {
+      // If autosave is enabled, interval must be provided
+      if (value.enabled && (value.interval === undefined || value.interval === '')) {
+        return false;
+      }
+      return true;
+    }),
     defaultCollectionLocation: Yup.string().max(1024)
   });
 
@@ -53,6 +72,10 @@ const General = ({ close }) => {
       timeout: preferences.request.timeout,
       storeCookies: get(preferences, 'request.storeCookies', true),
       sendCookies: get(preferences, 'request.sendCookies', true),
+      autoSave: {
+        enabled: get(preferences, 'autoSave.enabled', false),
+        interval: get(preferences, 'autoSave.interval', 1000)
+      },
       defaultCollectionLocation: get(preferences, 'general.defaultCollectionLocation', '')
     },
     validationSchema: preferencesSchema,
@@ -83,12 +106,16 @@ const General = ({ close }) => {
           storeCookies: newPreferences.storeCookies,
           sendCookies: newPreferences.sendCookies
         },
+        autoSave: {
+          enabled: newPreferences.autoSave.enabled,
+          interval: newPreferences.autoSave.interval
+        },
         general: {
           defaultCollectionLocation: newPreferences.defaultCollectionLocation
         }
       }))
       .then(() => {
-        toast.success('Preferences saved successfully')
+        toast.success('Preferences saved successfully');
         close();
       })
       .catch((err) => console.log(err) && toast.error('Failed to update preferences'));
@@ -250,6 +277,40 @@ const General = ({ close }) => {
         {formik.touched.timeout && formik.errors.timeout ? (
           <div className="text-red-500">{formik.errors.timeout}</div>
         ) : null}
+        <div className="flex items-center mt-6">
+          <input
+            id="autoSaveEnabled"
+            type="checkbox"
+            name="autoSave.enabled"
+            checked={formik.values.autoSave.enabled}
+            onChange={formik.handleChange}
+            className="mousetrap mr-0"
+          />
+          <label className="block ml-2 select-none" htmlFor="autoSaveEnabled">
+            Enable Auto Save
+          </label>
+        </div>
+        <div className={`flex flex-col mt-2 ${!formik.values.autoSave.enabled ? 'opacity-50' : ''}`}>
+          <label className="block select-none" htmlFor="autoSaveInterval">
+            Save Delay (in ms)
+          </label>
+          <input
+            type="text"
+            name="autoSave.interval"
+            id="autoSaveInterval"
+            className="block textbox mt-2 w-24"
+            autoComplete="off"
+            autoCorrect="off"
+            autoCapitalize="off"
+            spellCheck="false"
+            onChange={formik.handleChange}
+            value={formik.values.autoSave.interval}
+            disabled={!formik.values.autoSave.enabled}
+          />
+        </div>
+        {formik.touched.autoSave?.interval && formik.errors.autoSave?.interval && (
+          <div className="text-red-500">{formik.errors.autoSave.interval}</div>
+        )}
         <div className="flex flex-col mt-6">
           <label className="block select-none default-collection-location-label" htmlFor="defaultCollectionLocation">
             Default Collection Location
@@ -257,6 +318,7 @@ const General = ({ close }) => {
           <input
             type="text"
             name="defaultCollectionLocation"
+            id="defaultCollectionLocation"
             className="block textbox mt-2 w-full cursor-pointer default-collection-location-input"
             autoComplete="off"
             autoCorrect="off"
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js b/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
index 690bc32e8..499c235ac 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
@@ -41,8 +41,8 @@ const SingleGrpcMessage = ({ message, item, collection, index, methodType, isCol
 
     dispatch(updateRequestBody({
       content: currentMessages,
-            itemUid: item.uid,
-            collectionUid: collection.uid
+      itemUid: item.uid,
+      collectionUid: collection.uid
     }));
   };
 
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
index fb1911e3b..8f2eaa4a4 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
@@ -129,11 +129,15 @@ const GrpcQueryUrl = ({ item, collection, handleRun }) => {
     setProtoFilePath('');
     setIsReflectionMode(true);
 
-    dispatch(updateRequestProtoPath({
-      protoPath: '',
-      itemUid: item.uid,
-      collectionUid: collection.uid
-    }));
+    // Only update protoPath if it was previously set (to avoid creating unnecessary draft state)
+    const currentProtoPath = getPropertyFromDraftOrRequest(item, 'request.protoPath', '');
+    if (currentProtoPath) {
+      dispatch(updateRequestProtoPath({
+        protoPath: '',
+        itemUid: item.uid,
+        collectionUid: collection.uid
+      }));
+    }
 
     if (methods && methods.length > 0) {
       toast.success(`Loaded ${methods.length} gRPC methods from reflection`);
diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
index 69963f45f..0814a7418 100644
--- a/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/index.js
@@ -10,14 +10,12 @@ import SingleLineEditor from 'components/SingleLineEditor';
 import { isMacOS } from 'utils/common/platform';
 import { hasRequestChanges } from 'utils/collections';
 import StyledWrapper from './StyledWrapper';
-import { usePreferences } from 'providers/Preferences/index';
 import GenerateCodeItem from 'components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index';
 import toast from 'react-hot-toast';
 
 const QueryUrl = ({ item, collection, handleRun }) => {
   const { theme, storedTheme } = useTheme();
   const dispatch = useDispatch();
-  const autoSavePreference = usePreferences().preferences.request.autoSave;
   const method = item.draft ? get(item, 'draft.request.method') : get(item, 'request.method');
   const url = item.draft ? get(item, 'draft.request.url', '') : get(item, 'request.url', '');
   const isMac = isMacOS();
@@ -35,8 +33,8 @@ const QueryUrl = ({ item, collection, handleRun }) => {
     setMethodSelectorWidth(el.offsetWidth);
   }, [method]);
 
-  const onSave = (notify = 1) => {
-    dispatch(saveRequest(item.uid, collection.uid, notify));
+  const onSave = () => {
+    dispatch(saveRequest(item.uid, collection.uid));
   };
 
   const onUrlChange = (value) => {
@@ -120,7 +118,6 @@ const QueryUrl = ({ item, collection, handleRun }) => {
           highlightPathParams={true}
           item={item}
           showNewlineArrow={true}
-          autoSave={autoSavePreference}
         />
         <div className="flex items-center h-full mr-2 cursor-pointer" id="send-request" onClick={handleRun}>
           <div
diff --git a/packages/bruno-app/src/components/RequestPane/Vars/index.js b/packages/bruno-app/src/components/RequestPane/Vars/index.js
index eb292e9c2..662d328fe 100644
--- a/packages/bruno-app/src/components/RequestPane/Vars/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Vars/index.js
@@ -2,10 +2,12 @@ import React from 'react';
 import get from 'lodash/get';
 import VarsTable from './VarsTable';
 import StyledWrapper from './StyledWrapper';
+import DeprecationWarning from 'components/DeprecationWarning';
 
 const Vars = ({ item, collection }) => {
   const requestVars = item.draft ? get(item, 'draft.request.vars.req') : get(item, 'request.vars.req');
   const responseVars = item.draft ? get(item, 'draft.request.vars.res') : get(item, 'request.vars.res');
+  const deprecationWarningMessage = 'Post response vars is deprecated and will be removed in v3.0.0';
 
   return (
     <StyledWrapper className="w-full flex flex-col">
@@ -15,6 +17,7 @@ const Vars = ({ item, collection }) => {
       </div>
       <div>
         <div className="mt-1 mb-1 title text-xs">Post Response</div>
+        <DeprecationWarning message={deprecationWarningMessage} />
         <VarsTable item={item} collection={collection} vars={responseVars} varType="response" />
       </div>
     </StyledWrapper>
diff --git a/packages/bruno-app/src/components/Sidebar/CreateCollection/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/CreateCollection/StyledWrapper.js
new file mode 100644
index 000000000..4f8bad5d0
--- /dev/null
+++ b/packages/bruno-app/src/components/Sidebar/CreateCollection/StyledWrapper.js
@@ -0,0 +1,12 @@
+import styled from 'styled-components';
+
+const StyledWrapper = styled.div`
+  .advanced-options {
+    .caret {
+      color: ${(props) => props.theme.textLink};
+      fill: ${(props) => props.theme.textLink};
+    }
+  }
+`;
+
+export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js b/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js
index 642cf1ca9..2a3f759ce 100644
--- a/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js
+++ b/packages/bruno-app/src/components/Sidebar/CreateCollection/index.js
@@ -1,19 +1,22 @@
-import React, { useRef, useEffect } from 'react';
+import React, { useRef, useEffect, forwardRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 import { browseDirectory } from 'providers/ReduxStore/slices/collections/actions';
 import { createCollection } from 'providers/ReduxStore/slices/collections/actions';
 import toast from 'react-hot-toast';
+import Portal from 'components/Portal';
 import Modal from 'components/Modal';
 import { sanitizeName, validateName, validateNameError } from 'utils/common/regex';
 import PathDisplay from 'components/PathDisplay/index';
 import { useState } from 'react';
-import { IconArrowBackUp, IconEdit } from '@tabler/icons';
+import { IconArrowBackUp, IconEdit, IconCaretDown } from '@tabler/icons';
 import Help from 'components/Help';
 import { multiLineMsg } from "utils/common";
 import { formatIpcError } from "utils/common/error";
 import { toggleSidebarCollapse } from 'providers/ReduxStore/slices/app';
+import Dropdown from 'components/Dropdown';
+import StyledWrapper from './StyledWrapper';
 import get from 'lodash/get';
 
 const CreateCollection = ({ onClose }) => {
@@ -22,13 +25,17 @@ const CreateCollection = ({ onClose }) => {
   const [isEditing, toggleEditing] = useState(false);
   const preferences = useSelector((state) => state.app.preferences);
   const defaultLocation = get(preferences, 'general.defaultCollectionLocation', '');
+  const [showAdvanced, setShowAdvanced] = useState(false);
+  const dropdownTippyRef = useRef();
+  const onDropdownCreate = (ref) => (dropdownTippyRef.current = ref);
 
   const formik = useFormik({
     enableReinitialize: true,
     initialValues: {
       collectionName: '',
       collectionFolderName: '',
-      collectionLocation: defaultLocation
+      collectionLocation: defaultLocation,
+      format: 'yml'
     },
     validationSchema: Yup.object({
       collectionName: Yup.string()
@@ -38,15 +45,16 @@ const CreateCollection = ({ onClose }) => {
       collectionFolderName: Yup.string()
         .min(1, 'must be at least 1 character')
         .max(255, 'must be 255 characters or less')
-        .test('is-valid-collection-name', function(value) {
+        .test('is-valid-collection-name', function (value) {
           const isValid = validateName(value);
           return isValid ? true : this.createError({ message: validateNameError(value) });
         })
         .required('folder name is required'),
-      collectionLocation: Yup.string().min(1, 'location is required').required('location is required')
+      collectionLocation: Yup.string().min(1, 'location is required').required('location is required'),
+      format: Yup.string().oneOf(['bru', 'yml'], 'invalid format').required('format is required')
     }),
     onSubmit: (values) => {
-      dispatch(createCollection(values.collectionName, values.collectionFolderName, values.collectionLocation))
+      dispatch(createCollection(values.collectionName, values.collectionFolderName, values.collectionLocation, values.format))
         .then(() => {
           toast.success('Collection created!');
           dispatch(toggleSidebarCollapse());
@@ -78,130 +86,212 @@ const CreateCollection = ({ onClose }) => {
 
   const onSubmit = () => formik.handleSubmit();
 
-  return (
-    <Modal size="sm" title="Create Collection" confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
-      <form className="bruno-form" onSubmit={e => e.preventDefault()}>
-        <div>
-          <label htmlFor="collection-name" className="flex items-center font-semibold">
-            Name
-          </label>
-          <input
-            id="collection-name"
-            type="text"
-            name="collectionName"
-            ref={inputRef}
-            className="block textbox mt-2 w-full"
-            onChange={(e) => {
-              formik.handleChange(e);
-              !isEditing && formik.setFieldValue('collectionFolderName', sanitizeName(e.target.value));
-            }}
-            autoComplete="off"
-            autoCorrect="off"
-            autoCapitalize="off"
-            spellCheck="false"
-            value={formik.values.collectionName || ''}
-          />
-          {formik.touched.collectionName && formik.errors.collectionName ? (
-            <div className="text-red-500">{formik.errors.collectionName}</div>
-          ) : null}
+  const AdvancedOptions = forwardRef((props, ref) => {
+    return (
+      <div ref={ref} className="flex mr-2 text-link cursor-pointer items-center">
+        <button
+          className="btn-advanced"
+          type="button"
+        >
+          Options
+        </button>
+        <IconCaretDown className="caret ml-1" size={14} strokeWidth={2} />
+      </div>
+    );
+  });
 
-          <label htmlFor="collection-location" className="block font-semibold mt-3 flex items-center">
-            Location
-            <Help>
-              <p>
-                Bruno stores your collections on your computer's filesystem.
-              </p>
-              <p className="mt-2">
-                Choose the location where you want to store this collection.
-              </p>
-            </Help>
-          </label>
-          <input
-            id="collection-location"
-            type="text"
-            name="collectionLocation"
-            className="block textbox mt-2 w-full cursor-pointer"
-            autoComplete="off"
-            autoCorrect="off"
-            autoCapitalize="off"
-            spellCheck="false"
-            value={formik.values.collectionLocation || ''}
-            onClick={browse}
-            onChange={e => {
-              formik.setFieldValue('collectionLocation', e.target.value);
-            }}
-          />
-          {formik.touched.collectionLocation && formik.errors.collectionLocation ? (
-            <div className="text-red-500">{formik.errors.collectionLocation}</div>
-          ) : null}
-          <div className="mt-1">
-            <span
-              className="text-link cursor-pointer hover:underline" onClick={browse}
-              style={{
-                fontSize: '0.8125rem'
-              }}
-            >
-              Browse
-            </span>
-          </div>
-          {formik.values.collectionName?.trim()?.length > 0 && (
-            <div className="mt-4">
-              <div className="flex items-center justify-between">
-                <label htmlFor="filename" className="flex items-center font-semibold">
-                  Folder Name
-                  <Help width="300">
-                    <p>
-                      The name of the folder used to store the collection.
-                    </p>
-                    <p className="mt-2">
-                      You can choose a folder name different from your collection's name or one compatible with filesystem rules.
-                    </p>
-                  </Help>
-                </label>
-                {isEditing ? (
-                  <IconArrowBackUp 
-                    className="cursor-pointer opacity-50 hover:opacity-80" 
-                    size={16} 
-                    strokeWidth={1.5} 
-                    onClick={() => toggleEditing(false)} 
-                  />
-                ) : (
-                  <IconEdit
-                    className="cursor-pointer opacity-50 hover:opacity-80" 
-                    size={16} 
-                    strokeWidth={1.5} 
-                    onClick={() => toggleEditing(true)} 
-                  />
-                )}
+  return (
+    <Portal>
+      <StyledWrapper>
+        <Modal size="sm" title="Create Collection" hideFooter={true} handleCancel={onClose}>
+          <form className="bruno-form" onSubmit={formik.handleSubmit}>
+            <div>
+              <label htmlFor="collection-name" className="flex items-center font-semibold">
+                Name
+              </label>
+              <input
+                id="collection-name"
+                type="text"
+                name="collectionName"
+                ref={inputRef}
+                className="block textbox mt-2 w-full"
+                onChange={(e) => {
+                  formik.handleChange(e);
+                  !isEditing && formik.setFieldValue('collectionFolderName', sanitizeName(e.target.value));
+                }}
+                autoComplete="off"
+                autoCorrect="off"
+                autoCapitalize="off"
+                spellCheck="false"
+                value={formik.values.collectionName || ''}
+              />
+              {formik.touched.collectionName && formik.errors.collectionName ? (
+                <div className="text-red-500">{formik.errors.collectionName}</div>
+              ) : null}
+
+              <label htmlFor="collection-location" className="font-semibold mt-3 flex items-center">
+                Location
+                <Help>
+                  <p>
+                    Bruno stores your collections on your computer's filesystem.
+                  </p>
+                  <p className="mt-2">
+                    Choose the location where you want to store this collection.
+                  </p>
+                </Help>
+              </label>
+              <input
+                id="collection-location"
+                type="text"
+                name="collectionLocation"
+                className="block textbox mt-2 w-full cursor-pointer"
+                autoComplete="off"
+                autoCorrect="off"
+                autoCapitalize="off"
+                spellCheck="false"
+                value={formik.values.collectionLocation || ''}
+                onClick={browse}
+                onChange={(e) => {
+                  formik.setFieldValue('collectionLocation', e.target.value);
+                }}
+              />
+              {formik.touched.collectionLocation && formik.errors.collectionLocation ? (
+                <div className="text-red-500">{formik.errors.collectionLocation}</div>
+              ) : null}
+              <div className="mt-1">
+                <span
+                  className="text-link cursor-pointer hover:underline"
+                  onClick={browse}
+                  style={{
+                    fontSize: '0.8125rem'
+                  }}
+                >
+                  Browse
+                </span>
               </div>
-              {isEditing ? (
-                <input
-                  id="collection-folder-name"
-                  type="text"
-                  name="collectionFolderName"
-                  className="block textbox mt-2 w-full"
-                  onChange={formik.handleChange}
-                  autoComplete="off"
-                  autoCorrect="off"
-                  autoCapitalize="off"
-                  spellCheck="false"
-                  value={formik.values.collectionFolderName || ''}
-                />
-              ) : (
-                <div className='relative flex flex-row gap-1 items-center justify-between'>
-                  <PathDisplay
-                    baseName={formik.values.collectionFolderName}
-                  />
+              {formik.values.collectionName?.trim()?.length > 0 && (
+                <div className="mt-4">
+                  <div className="flex items-center justify-between">
+                    <label htmlFor="filename" className="flex items-center font-semibold">
+                      Folder Name
+                      <Help width="300">
+                        <p>
+                          The name of the folder used to store the collection.
+                        </p>
+                        <p className="mt-2">
+                          You can choose a folder name different from your collection's name or one compatible with filesystem rules.
+                        </p>
+                      </Help>
+                    </label>
+                    {isEditing ? (
+                      <IconArrowBackUp
+                        className="cursor-pointer opacity-50 hover:opacity-80"
+                        size={16}
+                        strokeWidth={1.5}
+                        onClick={() => toggleEditing(false)}
+                      />
+                    ) : (
+                      <IconEdit
+                        className="cursor-pointer opacity-50 hover:opacity-80"
+                        size={16}
+                        strokeWidth={1.5}
+                        onClick={() => toggleEditing(true)}
+                      />
+                    )}
+                  </div>
+                  {isEditing ? (
+                    <input
+                      id="collection-folder-name"
+                      type="text"
+                      name="collectionFolderName"
+                      className="block textbox mt-2 w-full"
+                      onChange={formik.handleChange}
+                      autoComplete="off"
+                      autoCorrect="off"
+                      autoCapitalize="off"
+                      spellCheck="false"
+                      value={formik.values.collectionFolderName || ''}
+                    />
+                  ) : (
+                    <div className="relative flex flex-row gap-1 items-center justify-between">
+                      <PathDisplay
+                        baseName={formik.values.collectionFolderName}
+                      />
+                    </div>
+                  )}
+                  {formik.touched.collectionFolderName && formik.errors.collectionFolderName ? (
+                    <div className="text-red-500">{formik.errors.collectionFolderName}</div>
+                  ) : null}
+                </div>
+              )}
+
+              {showAdvanced && (
+                <div className="mt-4">
+                  <label htmlFor="format" className="flex items-center font-semibold">
+                    File Format
+                    <Help width="300">
+                      <p>
+                        Choose the file format for storing requests in this collection.
+                      </p>
+                      <p className="mt-2">
+                        <strong>OpenCollection (YAML):</strong> Industry-standard YAML format (.yml files)
+                      </p>
+                      <p className="mt-1">
+                        <strong>BRU:</strong> Bruno's native file format (.bru files)
+                      </p>
+                    </Help>
+                  </label>
+                  <select
+                    id="format"
+                    name="format"
+                    className="block textbox mt-2 w-full"
+                    value={formik.values.format}
+                    onChange={formik.handleChange}
+                  >
+                    <option value="yml">OpenCollection (YAML)</option>
+                    <option value="bru">BRU Format (.bru)</option>
+                  </select>
+                  {formik.touched.format && formik.errors.format ? (
+                    <div className="text-red-500">{formik.errors.format}</div>
+                  ) : null}
                 </div>
               )}
-              {formik.touched.collectionFolderName && formik.errors.collectionFolderName ? (
-                <div className="text-red-500">{formik.errors.collectionFolderName}</div>
-              ) : null}
             </div>
-          )}
-        </div>
-      </form>
-    </Modal>
+            <div className="flex justify-between items-center mt-8 bruno-modal-footer">
+              <div className="flex advanced-options">
+                <Dropdown onCreate={onDropdownCreate} icon={<AdvancedOptions />} placement="bottom-start">
+                  <div
+                    className="dropdown-item"
+                    key="show-file-format"
+                    onClick={(e) => {
+                      dropdownTippyRef.current.hide();
+                      setShowAdvanced(!showAdvanced);
+                    }}
+                  >
+                    {showAdvanced ? 'Hide File Format' : 'Show File Format'}
+                  </div>
+                </Dropdown>
+              </div>
+              <div className="flex justify-end">
+                <span className="mr-2">
+                  <button type="button" onClick={onClose} className="btn btn-md btn-close">
+                    Cancel
+                  </button>
+                </span>
+                <span>
+                  <button
+                    type="submit"
+                    className="submit btn btn-md btn-secondary"
+                  >
+                    Create
+                  </button>
+                </span>
+              </div>
+            </div>
+          </form>
+        </Modal>
+      </StyledWrapper>
+    </Portal>
   );
 };
 
diff --git a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
index c148dc649..afb460344 100644
--- a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
+++ b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js
@@ -32,6 +32,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
   const {
     brunoConfig: { presets: collectionPresets = {} }
   } = collection;
+
   const [curlRequestTypeDetected, setCurlRequestTypeDetected] = useState(null);
   const [showFilesystemName, toggleShowFilesystemName] = useState(false);
 
@@ -145,12 +146,13 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
     onSubmit: (values) => {
       const isGrpcRequest = values.requestType === 'grpc-request';
       const isWsRequest = values.requestType === 'ws-request';
+      const filename = values.filename;
 
       if (isGrpcRequest) {
         dispatch(
           newGrpcRequest({
             requestName: values.requestName,
-            filename: values.filename,
+            filename: filename,
             requestType: values.requestType,
             requestUrl: values.requestUrl,
             collectionUid: collection.uid,
@@ -168,7 +170,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
         dispatch(newWsRequest({
           requestName: values.requestName,
           requestMethod: values.requestMethod,
-          filename: values.filename,
+          filename: filename,
           requestType: values.requestType,
           requestUrl: values.requestUrl,
           collectionUid: collection.uid,
@@ -185,7 +187,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
           newEphemeralHttpRequest({
             uid: uid,
             requestName: values.requestName,
-            filename: values.filename,
+            filename: filename,
             requestType: values.requestType,
             requestUrl: values.requestUrl,
             requestMethod: values.requestMethod,
@@ -210,7 +212,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
         dispatch(
           newHttpRequest({
             requestName: values.requestName,
-            filename: values.filename,
+            filename: filename,
             requestType: curlRequestTypeDetected,
             requestUrl: request.url,
             requestMethod: request.method,
@@ -231,7 +233,7 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
         dispatch(
           newHttpRequest({
             requestName: values.requestName,
-            filename: values.filename,
+            filename: filename,
             requestType: values.requestType,
             requestUrl: values.requestUrl,
             requestMethod: values.requestMethod,
@@ -476,11 +478,13 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
                       value={formik.values.filename || ''}
                       data-testid="file-name"
                     />
-                    <span className="absolute right-2 top-4 flex justify-center items-center file-extension">.bru</span>
+                    <span className="absolute right-2 top-4 flex justify-center items-center file-extension">.{collection.format}</span>
                   </div>
                 ) : (
                   <div className="relative flex flex-row gap-1 items-center justify-between">
-                    <PathDisplay baseName={formik.values.filename ? `${formik.values.filename}.bru` : ''} />
+                    <PathDisplay
+                      baseName={formik.values.filename ? `${formik.values.filename}.${collection.format}` : ''}
+                    />
                   </div>
                 )}
                 {formik.touched.filename && formik.errors.filename ? (
diff --git a/packages/bruno-app/src/components/SingleLineEditor/index.js b/packages/bruno-app/src/components/SingleLineEditor/index.js
index 9c031ba1d..7718ed28e 100644
--- a/packages/bruno-app/src/components/SingleLineEditor/index.js
+++ b/packages/bruno-app/src/components/SingleLineEditor/index.js
@@ -5,7 +5,6 @@ import { defineCodeMirrorBrunoVariablesMode } from 'utils/common/codemirror';
 import { MaskedEditor } from 'utils/common/masked-editor';
 import { setupAutoComplete } from 'utils/codemirror/autocomplete';
 import StyledWrapper from './StyledWrapper';
-import { usePreferences } from 'providers/Preferences/index';
 import { IconEye, IconEyeOff } from '@tabler/icons';
 import { setupLinkAware } from 'utils/codemirror/linkAware';
 
@@ -20,7 +19,6 @@ class SingleLineEditor extends Component {
     this.cachedValue = props.value || '';
     this.editorRef = React.createRef();
     this.variables = {};
-    this.autoSaveInterval = null;
     this.readOnly = props.readOnly || false;
 
     this.state = {
@@ -102,7 +100,6 @@ class SingleLineEditor extends Component {
     this.editor.on('change', this._onEdit);
     this.editor.on('paste', this._onPaste);
     this.addOverlay(variables);
-    this.startAutosave();
     this._enableMaskedEditor(this.props.isSecret);
     this.setState({ maskInput: this.props.isSecret });
 
@@ -143,26 +140,6 @@ class SingleLineEditor extends Component {
     }
   };
 
-  startAutosave = () => {
-    if (this.props.autoSave && this.props.onSave) {
-      this.autoSaveInterval = setInterval(this.saveEditorContent, this.props.autoSaveInterval || 15000); // Default to 15 sec
-    }
-  };
-
-  clearAutosave = () => {
-    if (this.autoSaveInterval) {
-      clearInterval(this.autoSaveInterval);
-    }
-  };
-
-  saveEditorContent = () => {
-    if (this.props.onSave) {
-      const content = this.editor.getValue();
-      console.log(content);
-      this.props.onSave(content, 0);
-    }
-  };
-  
   _onPaste = (_, event) => this.props.onPaste?.(event);
 
   componentDidUpdate(prevProps) {
@@ -213,7 +190,6 @@ class SingleLineEditor extends Component {
   }
 
   componentWillUnmount() {
-    this.clearAutosave();
     if (this.editor) {
       if (this.editor?._destroyLinkAware) {
         this.editor._destroyLinkAware();
diff --git a/packages/bruno-app/src/providers/ReduxStore/index.js b/packages/bruno-app/src/providers/ReduxStore/index.js
index b86305011..14dcdbe04 100644
--- a/packages/bruno-app/src/providers/ReduxStore/index.js
+++ b/packages/bruno-app/src/providers/ReduxStore/index.js
@@ -9,12 +9,13 @@ import globalEnvironmentsReducer from './slices/global-environments';
 import logsReducer from './slices/logs';
 import performanceReducer from './slices/performance';
 import { draftDetectMiddleware } from './middlewares/draft/middleware';
+import { autosaveMiddleware } from './middlewares/autosave/middleware';
 
 const isDevEnv = () => {
   return import.meta.env.MODE === 'development';
 };
 
-let middleware = [tasksMiddleware.middleware, draftDetectMiddleware];
+let middleware = [tasksMiddleware.middleware, draftDetectMiddleware, autosaveMiddleware];
 if (isDevEnv()) {
   middleware = [...middleware, debugMiddleware.middleware];
 }
diff --git a/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js b/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js
new file mode 100644
index 000000000..8260b293d
--- /dev/null
+++ b/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js
@@ -0,0 +1,161 @@
+import { saveRequest, saveCollectionSettings, saveFolderRoot } from '../../slices/collections/actions';
+import { flattenItems, isItemARequest, isItemAFolder } from 'utils/collections';
+
+const actionsToIntercept = [
+  // Request-level actions
+  'collections/requestUrlChanged',
+  'collections/updateAuth',
+  'collections/addQueryParam',
+  'collections/moveQueryParam',
+  'collections/updateQueryParam',
+  'collections/deleteQueryParam',
+  'collections/updatePathParam',
+  'collections/addRequestHeader',
+  'collections/updateRequestHeader',
+  'collections/deleteRequestHeader',
+  'collections/moveRequestHeader',
+  'collections/addFormUrlEncodedParam',
+  'collections/updateFormUrlEncodedParam',
+  'collections/deleteFormUrlEncodedParam',
+  'collections/moveFormUrlEncodedParam',
+  'collections/addMultipartFormParam',
+  'collections/updateMultipartFormParam',
+  'collections/deleteMultipartFormParam',
+  'collections/moveMultipartFormParam',
+  'collections/updateRequestAuthMode',
+  'collections/updateRequestBodyMode',
+  'collections/updateRequestBody',
+  'collections/updateRequestGraphqlQuery',
+  'collections/updateRequestGraphqlVariables',
+  'collections/updateRequestScript',
+  'collections/updateResponseScript',
+  'collections/updateRequestTests',
+  'collections/updateRequestMethod',
+  'collections/addAssertion',
+  'collections/updateAssertion',
+  'collections/deleteAssertion',
+  'collections/moveAssertion',
+  'collections/addVar',
+  'collections/updateVar',
+  'collections/deleteVar',
+  'collections/moveVar',
+  'collections/updateRequestDocs',
+  'collections/runRequestEvent',
+
+  // Folder-level actions
+  'collections/addFolderHeader',
+  'collections/updateFolderHeader',
+  'collections/deleteFolderHeader',
+  'collections/addFolderVar',
+  'collections/updateFolderVar',
+  'collections/deleteFolderVar',
+  'collections/updateFolderRequestScript',
+  'collections/updateFolderResponseScript',
+  'collections/updateFolderTests',
+  'collections/updateFolderAuth',
+  'collections/updateFolderAuthMode',
+  'collections/updateFolderDocs',
+
+  // Collection-level actions
+  'collections/addCollectionHeader',
+  'collections/updateCollectionHeader',
+  'collections/deleteCollectionHeader',
+  'collections/addCollectionVar',
+  'collections/updateCollectionVar',
+  'collections/deleteCollectionVar',
+  'collections/updateCollectionAuth',
+  'collections/updateCollectionAuthMode',
+  'collections/updateCollectionRequestScript',
+  'collections/updateCollectionResponseScript',
+  'collections/updateCollectionTests',
+  'collections/updateCollectionDocs',
+  'collections/updateCollectionClientCertificates',
+  'collections/updateCollectionProtobuf',
+  'collections/updateCollectionProxy'
+];
+
+// Simple object to track pending save timers
+const pendingTimers = {};
+
+// Helper to schedule autosave for an item
+const scheduleAutoSave = (key, save, interval) => {
+  // Clear any existing timer for this entity
+  clearTimeout(pendingTimers[key]);
+
+  // Schedule a new save
+  pendingTimers[key] = setTimeout(() => {
+    save();
+    delete pendingTimers[key];
+  }, interval);
+};
+
+// Helper to find and schedule saves for all existing drafts
+const saveExistingDrafts = (dispatch, getState, interval) => {
+  const collections = getState().collections.collections;
+
+  collections.forEach((collection) => {
+    // Check collection-level draft
+    if (collection.draft) {
+      const key = `collection-${collection.uid}`;
+      scheduleAutoSave(key, () => dispatch(saveCollectionSettings(collection.uid, null, true)), interval);
+    }
+
+    // Check all items (requests and folders) for drafts
+    const allItems = flattenItems(collection.items);
+    allItems.forEach((item) => {
+      if (item.draft) {
+        if (isItemARequest(item)) {
+          const key = `request-${item.uid}`;
+          scheduleAutoSave(key, () => dispatch(saveRequest(item.uid, collection.uid, true)), interval);
+        } else if (isItemAFolder(item)) {
+          const key = `folder-${item.uid}`;
+          scheduleAutoSave(key, () => dispatch(saveFolderRoot(collection.uid, item.uid, true)), interval);
+        }
+      }
+    });
+  });
+};
+
+export const autosaveMiddleware = ({ dispatch, getState }) => (next) => (action) => {
+  // Let the action update the state first
+  const result = next(action);
+
+  // Check if autosave is enabled
+  const { autoSave } = getState().app.preferences;
+  if (!autoSave?.enabled) return result;
+
+  // When autosave is enabled (or settings change), save any existing drafts
+  if (action.type === 'app/updatePreferences' && action.payload?.autoSave?.enabled) {
+    saveExistingDrafts(dispatch, getState, autoSave.interval);
+    return result;
+  }
+
+  // Only handle actions that create dirty state
+  if (!actionsToIntercept.includes(action.type)) return result;
+
+  const { itemUid, folderUid, collectionUid } = action.payload;
+  const interval = autoSave.interval;
+
+  // Determine what to save based on what IDs are present
+  let key, save;
+
+  if (itemUid) {
+    // Request change
+    key = `request-${itemUid}`;
+    save = () => dispatch(saveRequest(itemUid, collectionUid, true));
+  } else if (folderUid) {
+    // Folder change
+    key = `folder-${folderUid}`;
+    save = () => dispatch(saveFolderRoot(collectionUid, folderUid, true));
+  } else if (collectionUid) {
+    // Collection change
+    key = `collection-${collectionUid}`;
+    save = () => dispatch(saveCollectionSettings(collectionUid, null, true));
+  }
+
+  if (key && save) {
+    scheduleAutoSave(key, save, interval);
+  }
+
+  return result;
+};
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/app.js b/packages/bruno-app/src/providers/ReduxStore/slices/app.js
index cb3f1f74a..df6ab3587 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/app.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/app.js
@@ -28,6 +28,10 @@ const initialState = {
     },
     general: {
       defaultCollectionLocation: ''
+    },
+    autoSave: {
+      enabled: false,
+      interval: 1000
     }
   },
   generateCode: {
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
index 0639e046e..64df682cd 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -94,33 +94,29 @@ export const renameCollection = (newName, collectionUid) => (dispatch, getState)
   });
 };
 
-
-export const saveRequest = (itemUid, collectionUid, saveSilently, notify = 1) => (dispatch, getState) => {
+export const saveRequest = (itemUid, collectionUid, silent = false) => (dispatch, getState) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
 
-    return new Promise((resolve, reject) => {
-      if (!collection) {
-        return reject(new Error('Collection not found'));
-      }
+  return new Promise((resolve, reject) => {
+    if (!collection) {
+      return reject(new Error('Collection not found'));
+    }
 
-      const collectionCopy = cloneDeep(collection);
-      const item = findItemInCollection(collectionCopy, itemUid);
-      if (!item) {
-        return reject(new Error('Not able to locate item'));
-      }
+    const collectionCopy = cloneDeep(collection);
+    const item = findItemInCollection(collectionCopy, itemUid);
+    if (!item) {
+      return reject(new Error('Not able to locate item'));
+    }
 
-      const itemToSave = transformRequestToSaveToFilesystem(item);
-      const { ipcRenderer } = window;
+    const itemToSave = transformRequestToSaveToFilesystem(item);
+    const { ipcRenderer } = window;
 
     itemSchema
       .validate(itemToSave)
-      .then(() => ipcRenderer.invoke('renderer:save-request', item.pathname, itemToSave))
+      .then(() => ipcRenderer.invoke('renderer:save-request', item.pathname, itemToSave, collection.format))
       .then(() => {
-        if (notify === 1) {
-          toast.success('Request saved successfully');
-        }
-        if (!saveSilently) {
+        if (!silent) {
           toast.success('Request saved successfully');
         }
         dispatch(
@@ -152,7 +148,8 @@ export const saveMultipleRequests = (items) => (dispatch, getState) => {
         if (itemIsValid) {
           itemsToSave.push({
             item: itemToSave,
-            pathname: item.pathname
+            pathname: item.pathname,
+            format: collection.format
           });
         }
       }
@@ -186,7 +183,7 @@ export const saveCollectionRoot = (collectionUid) => (dispatch, getState) => {
     const { ipcRenderer } = window;
 
     ipcRenderer
-      .invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave)
+      .invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave, collectionCopy.brunoConfig)
       .then(() => {
         toast.success('Collection Settings saved successfully');
         dispatch(saveCollectionDraft({ collectionUid }));
@@ -199,7 +196,7 @@ export const saveCollectionRoot = (collectionUid) => (dispatch, getState) => {
   });
 };
 
-export const saveFolderRoot = (collectionUid, folderUid) => (dispatch, getState) => {
+export const saveFolderRoot = (collectionUid, folderUid, silent = false) => (dispatch, getState) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
   const folder = findItemInCollection(collection, folderUid);
@@ -220,14 +217,17 @@ export const saveFolderRoot = (collectionUid, folderUid) => (dispatch, getState)
 
     const folderData = {
       name: folder.name,
-      pathname: folder.pathname,
+      folderPathname: folder.pathname,
+      collectionPathname: collection.pathname,
       root: folderRootToSave
     };
 
     ipcRenderer
       .invoke('renderer:save-folder-root', folderData)
       .then(() => {
-        toast.success('Folder Settings saved successfully');
+        if (!silent) {
+          toast.success('Folder Settings saved successfully');
+        }
         // If there was a draft, save it to root and clear the draft
         if (folder.draft) {
           dispatch(saveFolderDraft({ collectionUid, folderUid }));
@@ -257,10 +257,10 @@ export const saveMultipleCollections = (collectionDrafts) => (dispatch, getState
 
         let savePromises = [];
 
-        savePromises.push(ipcRenderer.invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave));
+        savePromises.push(ipcRenderer.invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave, collectionCopy.brunoConfig));
 
         if (collectionCopy.draft?.brunoConfig) {
-          savePromises.push(ipcRenderer.invoke('renderer:update-bruno-config', collectionCopy.draft.brunoConfig, collectionCopy.pathname, collectionDraft.collectionUid));
+          savePromises.push(ipcRenderer.invoke('renderer:update-bruno-config', collectionCopy.draft.brunoConfig, collectionCopy.pathname, collectionCopy.root));
         }
 
         Promise.all(savePromises)
@@ -298,7 +298,8 @@ export const saveMultipleFolders = (folderDrafts) => (dispatch, getState) => {
         const folderRootToSave = transformFolderRootToSave(folder);
         const folderData = {
           name: folder.name,
-          pathname: folder.pathname,
+          folderPathname: folder.pathname,
+          collectionPathname: collection.pathname,
           root: folderRootToSave
         };
 
@@ -693,7 +694,7 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
         const fullName = path.join(collection.pathname, directoryName);
         const { ipcRenderer } = window;
 
-        const folderBruJsonData = {
+        const folderData = {
           meta: {
             name: folderName,
             seq: items?.length + 1
@@ -706,7 +707,7 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
         };
 
         ipcRenderer
-          .invoke('renderer:new-folder', { pathname: fullName, folderBruJsonData })
+          .invoke('renderer:new-folder', { pathname: fullName, folderData, format: collection.format })
           .then(resolve)
           .catch((error) => {
             toast.error('Failed to create a new folder!');
@@ -726,7 +727,7 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
           const fullName = path.join(currentItem.pathname, directoryName);
           const { ipcRenderer } = window;
 
-          const folderBruJsonData = {
+          const folderData = {
             meta: {
               name: folderName,
               seq: items?.length + 1
@@ -739,7 +740,7 @@ export const newFolder = (folderName, directoryName, collectionUid, itemUid) =>
           };
 
           ipcRenderer
-            .invoke('renderer:new-folder', { pathname: fullName, folderBruJsonData })
+            .invoke('renderer:new-folder', { pathname: fullName, folderData, format: collection.format })
             .then(resolve)
             .catch((error) => {
               toast.error('Failed to create a new folder!');
@@ -775,7 +776,7 @@ export const renameItem =
       const { ipcRenderer } = window;
 
       const renameName = async () => {
-        return ipcRenderer.invoke('renderer:rename-item-name', { itemPath: item.pathname, newName }).catch((err) => {
+          return ipcRenderer.invoke('renderer:rename-item-name', { itemPath: item.pathname, newName, collectionPathname: collection.pathname }).catch((err) => {
           toast.error('Failed to rename the item name');
           console.error(err);
           throw new Error('Failed to rename the item name');
@@ -788,12 +789,12 @@ export const renameItem =
         if (item.type === 'folder') {
           newPath = path.join(dirname, trim(newFilename));
         } else {
-          const filename = resolveRequestFilename(newFilename);
+            const filename = resolveRequestFilename(newFilename, collection.format);
           newPath = path.join(dirname, filename);
         }
 
         return ipcRenderer
-          .invoke('renderer:rename-item-filename', { oldPath: item.pathname, newPath, newName, newFilename })
+            .invoke('renderer:rename-item-filename', { oldPath: item.pathname, newPath, newName, newFilename, collectionPathname: collection.pathname })
           .catch((err) => {
             toast.error('Failed to rename the file');
             console.error(err);
@@ -857,7 +858,7 @@ export const cloneItem = (newName, newFilename, itemUid, collectionUid) => (disp
     }
 
     const parentItem = findParentItemInCollection(collectionCopy, itemUid);
-    const filename = resolveRequestFilename(newFilename);
+    const filename = resolveRequestFilename(newFilename, collection.format);
     const itemToSave = refreshUidsInItem(transformRequestToSaveToFilesystem(item));
     set(itemToSave, 'name', trim(newName));
     set(itemToSave, 'filename', trim(filename));
@@ -971,13 +972,13 @@ export const pasteItem = (targetCollectionUid, targetItemUid = null) => (dispatc
         const existingItems = targetItem ? targetItem.items : targetCollection.items;
 
         // Check for duplicate names and append counter if needed
-        while (find(existingItems, (i) => i.type !== 'folder' && trim(i.filename) === trim(resolveRequestFilename(newFilename)))) {
+        while (find(existingItems, (i) => i.type !== 'folder' && trim(i.filename) === trim(resolveRequestFilename(newFilename, targetCollection.format)))) {
           newName = `${copiedItem.name} (${counter})`;
           newFilename = `${sanitizeName(copiedItem.name)} (${counter})`;
           counter++;
         }
 
-        const filename = resolveRequestFilename(newFilename);
+        const filename = resolveRequestFilename(newFilename, targetCollection.format);
         const itemToSave = refreshUidsInItem(transformRequestToSaveToFilesystem(copiedItem));
         set(itemToSave, 'name', trim(newName));
         set(itemToSave, 'filename', trim(filename));
@@ -988,7 +989,7 @@ export const pasteItem = (targetCollectionUid, targetItemUid = null) => (dispatc
         itemToSave.seq = requestItems ? requestItems.length + 1 : 1;
 
         await itemSchema.validate(itemToSave);
-        await ipcRenderer.invoke('renderer:new-request', fullPathname, itemToSave);
+        await ipcRenderer.invoke('renderer:new-request', fullPathname, itemToSave, targetCollection.format);
 
         dispatch(insertTaskIntoQueue({
           uid: uuid(),
@@ -1029,7 +1030,7 @@ export const deleteItem = (itemUid, collectionUid) => (dispatch, getState) => {
               items: directoryItemsWithoutDeletedItem
             });
             if (reorderedSourceItems?.length) {
-              await dispatch(updateItemsSequences({ itemsToResequence: reorderedSourceItems }));
+              await dispatch(updateItemsSequences({ itemsToResequence: reorderedSourceItems, collectionUid }));
             }
           }
           resolve();
@@ -1101,7 +1102,7 @@ export const handleCollectionItemDrop =
           items: draggedItemDirectoryItemsWithoutDraggedItem
         });
         if (reorderedSourceItems?.length) {
-          await dispatch(updateItemsSequences({ itemsToResequence: reorderedSourceItems }));
+            await dispatch(updateItemsSequences({ itemsToResequence: reorderedSourceItems, collectionUid: sourceCollectionUid || collectionUid }));
         }
       }
 
@@ -1123,7 +1124,7 @@ export const handleCollectionItemDrop =
         });
 
         if (reorderedTargetItems?.length) {
-          await dispatch(updateItemsSequences({ itemsToResequence: reorderedTargetItems }));
+            await dispatch(updateItemsSequences({ itemsToResequence: reorderedTargetItems, collectionUid }));
         }
       }
     };
@@ -1140,7 +1141,7 @@ export const handleCollectionItemDrop =
       });
 
       if (reorderedItems?.length) {
-        await dispatch(updateItemsSequences({ itemsToResequence: reorderedItems }));
+          await dispatch(updateItemsSequences({ itemsToResequence: reorderedItems, collectionUid }));
       }
     };
 
@@ -1176,12 +1177,19 @@ export const handleCollectionItemDrop =
   };
 
 export const updateItemsSequences =
-  ({ itemsToResequence }) =>
+  ({ itemsToResequence, collectionUid }) =>
   (dispatch, getState) => {
     return new Promise((resolve, reject) => {
+        const state = getState();
+        const collection = findCollectionByUid(state.collections.collections, collectionUid);
+
+        if (!collection) {
+          return reject(new Error('Collection not found'));
+        }
+
       const { ipcRenderer } = window;
 
-      ipcRenderer.invoke('renderer:resequence-items', itemsToResequence).then(resolve).catch(reject);
+        ipcRenderer.invoke('renderer:resequence-items', itemsToResequence, collection.pathname).then(resolve).catch(reject);
     });
   };
 
@@ -1238,10 +1246,15 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
           text: null,
           xml: null,
           sparql: null,
-          multipartForm: null,
-          formUrlEncoded: null,
-          file: null
+          multipartForm: [],
+          formUrlEncoded: [],
+          file: []
         },
+        vars: {
+          req: [],
+          res: []
+        },
+        assertions: [],
         auth: auth ?? {
           mode: 'inherit'
         }
@@ -1252,7 +1265,7 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
     };
 
     // itemUid is null when we are creating a new request at the root level
-    const resolvedFilename = resolveRequestFilename(filename);
+    const resolvedFilename = resolveRequestFilename(filename, collection.format);
     if (!itemUid) {
       const reqWithSameNameExists = find(
         collection.items,
@@ -1349,13 +1362,23 @@ export const newGrpcRequest = (params) => (dispatch, getState) => {
         },
         auth: auth ?? {
           mode: 'inherit'
-        }
+        },
+        vars: {
+          req: [],
+          res: []
+        },
+        script: {
+          req: null,
+          res: null
+        },
+        assertions: [],
+        tests: null
       }
     };
 
     // itemUid is null when we are creating a new request at the root level
     const parentItem = itemUid ? findItemInCollection(collection, itemUid) : collection;
-    const resolvedFilename = resolveRequestFilename(filename);
+    const resolvedFilename = resolveRequestFilename(filename, collection.format);
 
     if (!parentItem) {
       return reject(new Error('Parent item not found'));
@@ -1419,13 +1442,23 @@ export const newWsRequest = (params) => (dispatch, getState) => {
         },
         auth: auth ?? {
           mode: 'inherit'
-        }
+        },
+        vars: {
+          req: [],
+          res: []
+        },
+        script: {
+          req: null,
+          res: null
+        },
+        assertions: [],
+        tests: null
       }
     };
 
     // itemUid is null when we are creating a new request at the root level
     const parentItem = itemUid ? findItemInCollection(collection, itemUid) : collection;
-    const resolvedFilename = resolveRequestFilename(filename);
+    const resolvedFilename = resolveRequestFilename(filename, collection.format);
 
     if (!parentItem) {
       return reject(new Error('Parent item not found'));
@@ -1722,6 +1755,66 @@ export const saveEnvironment = (variables, environmentUid, collectionUid) => (di
   });
 };
 
+/**
+ * Update a variable value directly in the file without affecting draft state
+ * @param {string} pathname - File path
+ * @param {Object} variable - Variable object with uid, name, value, type, enabled
+ * @param {string} scopeType - Type of scope ('request', 'folder', 'collection')
+ * @param {string} collectionUid - Collection UID
+ * @param {string} itemUid - Item/Folder UID (for request/folder)
+ */
+const updateVariableInFile = (pathname, variable, scopeType, collectionUid, itemUid) => (dispatch, getState) => {
+  return new Promise((resolve, reject) => {
+    const { ipcRenderer } = window;
+
+    const state = getState();
+    const collection = findCollectionByUid(state.collections.collections, collectionUid);
+    if (!collection) {
+      return reject(new Error('Collection not found'));
+    }
+
+    const collectionCopy = cloneDeep(collection);
+
+    ipcRenderer
+      .invoke('renderer:update-variable-in-file', pathname, variable, scopeType, collectionCopy.root, collectionCopy.format)
+      .then(() => {
+        // Update Redux state to reflect the change
+        if (scopeType === 'request') {
+          dispatch({
+            type: 'collections/updateRequestVarValue',
+            payload: { collectionUid, itemUid, variable }
+          });
+        } else if (scopeType === 'folder') {
+          dispatch({
+            type: 'collections/updateFolderVarValue',
+            payload: { collectionUid, folderUid: itemUid, variable }
+          });
+        } else if (scopeType === 'collection') {
+          dispatch({
+            type: 'collections/updateCollectionVarValue',
+            payload: { collectionUid, variable }
+          });
+        }
+
+        resolve();
+      })
+      .catch(reject);
+  });
+};
+
+/**
+ * Helper: Execute update action with toast notification
+ * @param {Function} action - The action to dispatch
+ * @param {string} successMessage - Success toast message
+ * @returns {Promise}
+ */
+const executeVariableUpdate = (dispatch, action, successMessage) => {
+  return dispatch(action)
+    .then(() => {
+      toast.success(successMessage);
+    });
+};
+
 /**
  * Update a variable value in its detected scope (inline editing)
  * @param {string} variableName - Name of the variable to update
@@ -2037,7 +2130,7 @@ export const browseFiles = (filters, properties) => (_dispatch, _getState) => {
   });
 };
 
-export const saveCollectionSettings = (collectionUid, brunoConfig = null) => (dispatch, getState) => {
+export const saveCollectionSettings = (collectionUid, brunoConfig = null, silent = false) => (dispatch, getState) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
 
@@ -2055,17 +2148,19 @@ export const saveCollectionSettings = (collectionUid, brunoConfig = null) => (di
     const savePromises = [];
 
     // Save collection.bru file
-    savePromises.push(ipcRenderer.invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave));
+    savePromises.push(ipcRenderer.invoke('renderer:save-collection-root', collectionCopy.pathname, collectionRootToSave, collectionCopy.brunoConfig));
 
     // Save bruno.json if brunoConfig is provided or if there's a brunoConfig draft
     const brunoConfigToSave = brunoConfig || (collectionCopy.draft && collectionCopy.draft.brunoConfig);
     if (brunoConfigToSave) {
-      savePromises.push(ipcRenderer.invoke('renderer:update-bruno-config', brunoConfigToSave, collectionCopy.pathname, collectionUid));
+      savePromises.push(ipcRenderer.invoke('renderer:update-bruno-config', brunoConfigToSave, collectionCopy.pathname, collectionCopy.root));
     }
 
     Promise.all(savePromises)
       .then(() => {
-        toast.success('Collection Settings saved successfully');
+        if (!silent) {
+          toast.success('Collection Settings saved successfully');
+        }
         dispatch(saveCollectionDraft({ collectionUid }));
       })
       .then(resolve)
@@ -2088,7 +2183,7 @@ export const updateBrunoConfig = (brunoConfig, collectionUid) => (dispatch, getS
 
     const { ipcRenderer } = window;
     ipcRenderer
-      .invoke('renderer:update-bruno-config', brunoConfig, collection.pathname, collectionUid)
+      .invoke('renderer:update-bruno-config', brunoConfig, collection.pathname, collection.root)
       .then(resolve)
       .catch(reject);
   });
@@ -2125,12 +2220,12 @@ export const openCollectionEvent = (uid, pathname, brunoConfig) => (dispatch, ge
   });
 };
 
-export const createCollection = (collectionName, collectionFolderName, collectionLocation) => () => {
+export const createCollection = (collectionName, collectionFolderName, collectionLocation, format = 'bru') => () => {
   const { ipcRenderer } = window;
 
   return new Promise((resolve, reject) => {
     ipcRenderer
-      .invoke('renderer:create-collection', collectionName, collectionFolderName, collectionLocation)
+      .invoke('renderer:create-collection', collectionName, collectionFolderName, collectionLocation, format)
       .then(resolve)
       .catch(reject);
   });
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
index 7ba21443b..c66f995f6 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js
@@ -120,6 +120,14 @@ export const collectionsSlice = createSlice({
       // values can be 'unmounted', 'mounting', 'mounted'
       collection.mountStatus = 'unmounted';
 
+      // Add format property from brunoConfig for easy access
+      // YAML collections have 'opencollection' field, BRU collections have 'version' field
+      if (collection.brunoConfig?.opencollection) {
+        collection.format = 'yml';
+      } else {
+        collection.format = collection.brunoConfig?.format || 'bru';
+      }
+
       // TODO: move this to use the nextAction approach
       // last action is used to track the last action performed on the collection
       // this is optional
@@ -2566,6 +2574,7 @@ export const collectionsSlice = createSlice({
 
         if (existingEnv) {
           const prevEphemerals = (existingEnv.variables || []).filter((v) => v.ephemeral);
+          existingEnv.name = environment.name;
           existingEnv.variables = environment.variables;
           /*
            Apply temporary (ephemeral) values only to variables that actually exist in the file. This prevents deleted temporaries from “popping back” after a save. If a variable is present in the file, we temporarily override the UI value while also remembering the on-disk value in persistedValue for future saves.
diff --git a/packages/bruno-app/src/themes/dark.js b/packages/bruno-app/src/themes/dark.js
index 4eb4fd721..e3e3dfe0a 100644
--- a/packages/bruno-app/src/themes/dark.js
+++ b/packages/bruno-app/src/themes/dark.js
@@ -473,6 +473,19 @@ const darkTheme = {
       }
     }
   },
+  deprecationWarning: {
+    bg: 'rgba(250, 83, 67, 0.1)',
+    border: 'rgba(250, 83, 67, 0.1)',
+    icon: '#FA5343',
+    text: '#B8B8B8'
+  },
+
+  preferences: {
+    sidebar: {
+      border: '#444444'
+    }
+  },
+
   examples: {
     buttonBg: '#F59E0B1A',
     buttonColor: '#F59E0B',
diff --git a/packages/bruno-app/src/themes/light.js b/packages/bruno-app/src/themes/light.js
index ec1c64f30..f95e58555 100644
--- a/packages/bruno-app/src/themes/light.js
+++ b/packages/bruno-app/src/themes/light.js
@@ -480,6 +480,19 @@ const lightTheme = {
       }
     }
   },
+  deprecationWarning: {
+    bg: 'rgba(217, 31, 17, 0.1)',
+    border: 'rgba(217, 31, 17, 0.1)',
+    icon: '#D91F11',
+    text: '#343434'
+  },
+
+  preferences: {
+    sidebar: {
+      border: '#EFEFEF'
+    }
+  },
+
   examples: {
     buttonBg: '#D977061A',
     buttonColor: '#D97706',
diff --git a/packages/bruno-app/src/utils/common/platform.js b/packages/bruno-app/src/utils/common/platform.js
index dc1d7d984..d1c62e694 100644
--- a/packages/bruno-app/src/utils/common/platform.js
+++ b/packages/bruno-app/src/utils/common/platform.js
@@ -10,8 +10,8 @@ export const isElectron = () => {
   return window.ipcRenderer ? true : false;
 };
 
-export const resolveRequestFilename = (name) => {
-  return `${trim(name)}.bru`;
+export const resolveRequestFilename = (name, extension = 'bru') => {
+  return `${trim(name)}.${extension}`;
 };
 
 export const getSubdirectoriesFromRoot = (rootPath, pathname) => {
diff --git a/packages/bruno-converters/src/postman/postman-translations.js b/packages/bruno-converters/src/postman/postman-translations.js
index 43c034db9..eb7fc1bbe 100644
--- a/packages/bruno-converters/src/postman/postman-translations.js
+++ b/packages/bruno-converters/src/postman/postman-translations.js
@@ -35,11 +35,23 @@ const replacements = {
   'pm\\.response\\.status': 'res.statusText',
   'pm\\.response\\.headers': 'res.getHeaders()',
   "tests\\['([^']+)'\\]\\s*=\\s*([^;]+);": 'test("$1", function() { expect(Boolean($2)).to.be.true; });',
+
+  // Supported Postman request translations:
+  // - pm.request.url / request.url     -> req.getUrl()
+  // - pm.request.method / request.method -> req.getMethod()
+  // - pm.request.headers / request.headers -> req.getHeaders()
+  // - pm.request.body / request.body   -> req.getBody()
+  // - pm.info.requestName / request.name -> req.getName()
   'pm\\.request\\.url': 'req.getUrl()',
   'pm\\.request\\.method': 'req.getMethod()',
   'pm\\.request\\.headers': 'req.getHeaders()',
   'pm\\.request\\.body': 'req.getBody()',
   'pm\\.info\\.requestName': 'req.getName()',
+  'request\\.url': 'req.getUrl()',
+  'request\\.method': 'req.getMethod()',
+  'request\\.headers': 'req.getHeaders()',
+  'request\\.body': 'req.getBody()',
+  'request\\.name': 'req.getName()',
   // deprecated translations
   'postman\\.setEnvironmentVariable\\(': 'bru.setEnvVar(',
   'postman\\.getEnvironmentVariable\\(': 'bru.getEnvVar(',
diff --git a/packages/bruno-converters/src/utils/jscode-shift-translator.js b/packages/bruno-converters/src/utils/jscode-shift-translator.js
index 14450e054..8af8e07b1 100644
--- a/packages/bruno-converters/src/utils/jscode-shift-translator.js
+++ b/packages/bruno-converters/src/utils/jscode-shift-translator.js
@@ -76,11 +76,18 @@ const simpleTranslations = {
   // Info
   'pm.info.requestName': 'req.getName()',
 
-  // Request properties
+  // Request properties (pm.request.*)
   'pm.request.url': 'req.getUrl()',
   'pm.request.method': 'req.getMethod()',
   'pm.request.headers': 'req.getHeaders()',
   'pm.request.body': 'req.getBody()',
+
+  // Legacy/global request object (request.*)
+  'request.url': 'req.getUrl()',
+  'request.method': 'req.getMethod()',
+  'request.headers': 'req.getHeaders()',
+  'request.body': 'req.getBody()',
+  'request.name': 'req.getName()',
  
   // Response properties
   'pm.response.json': 'res.getBody',
diff --git a/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-request.spec.js b/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-request.spec.js
index 93eed719a..dd3e11331 100644
--- a/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-request.spec.js
+++ b/packages/bruno-converters/tests/postman/postman-to-bruno/postman-translations/postman-request.spec.js
@@ -26,4 +26,20 @@ describe('postmanTranslations - request commands', () => {
     `;
     expect(postmanTranslation(inputScript)).toBe(expectedOutput);
   });
+
+  test('should handle legacy request object without pm prefix', () => {
+    const inputScript = `
+      const url = request.url;
+      const method = request.method;
+      const body = request.body;
+      const name = request.name;
+    `;
+    const expectedOutput = `
+      const url = req.getUrl();
+      const method = req.getMethod();
+      const body = req.getBody();
+      const name = req.getName();
+    `;
+    expect(postmanTranslation(inputScript)).toBe(expectedOutput);
+  });
 }); 
\ No newline at end of file
diff --git a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/request.test.js b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/request.test.js
index a81bc6c72..a0469e2b9 100644
--- a/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/request.test.js
+++ b/packages/bruno-converters/tests/postman/postman-translations/transpiler-tests/request.test.js
@@ -105,4 +105,20 @@ describe('Request Translation', () => {
         expect(translatedCode).toContain('bru.setVar("lastRequestBody", JSON.stringify(requestData));');
         expect(translatedCode).toContain('bru.setEnvVar("lastContentType", contentType);');
     });
+
+  it('should translate legacy request.* properties', () => {
+    const code = `
+        const url = request.url;
+        const method = request.method;
+        const body = request.body;
+        const name = request.name;
+        `;
+    const translatedCode = translateCode(code);
+    expect(translatedCode).toBe(`
+        const url = req.getUrl();
+        const method = req.getMethod();
+        const body = req.getBody();
+        const name = req.getName();
+        `);
+  });
 }); 
\ No newline at end of file
diff --git a/packages/bruno-electron/src/app/collection-watcher.js b/packages/bruno-electron/src/app/collection-watcher.js
index 92f789ea2..aa3f5a188 100644
--- a/packages/bruno-electron/src/app/collection-watcher.js
+++ b/packages/bruno-electron/src/app/collection-watcher.js
@@ -2,7 +2,13 @@ const _ = require('lodash');
 const fs = require('fs');
 const path = require('path');
 const chokidar = require('chokidar');
-const { hasBruExtension, isWSLPath, normalizeAndResolvePath, sizeInMB } = require('../utils/filesystem');
+const {
+  hasRequestExtension,
+  isWSLPath,
+  normalizeAndResolvePath,
+  sizeInMB,
+  getCollectionFormat
+} = require('../utils/filesystem');
 const {
   parseEnvironment,
   parseRequest,
@@ -19,7 +25,7 @@ const { setDotEnvVars } = require('../store/process-env');
 const { setBrunoConfig } = require('../store/bruno-config');
 const EnvironmentSecretsStore = require('../store/env-secrets');
 const UiStateSnapshot = require('../store/ui-state-snapshot');
-const { parseBruFileMeta, hydrateRequestWithUuid } = require('../utils/collection');
+const { parseFileMeta, hydrateRequestWithUuid } = require('../utils/collection');
 const { parseLargeRequestWithRedaction } = require('../utils/parse');
 const { transformBrunoConfigAfterRead } = require('../utils/transfomBrunoConfig');
 
@@ -41,21 +47,45 @@ const isBrunoConfigFile = (pathname, collectionPath) => {
   return dirname === collectionPath && basename === 'bruno.json';
 };
 
-const isBruEnvironmentConfig = (pathname, collectionPath) => {
+const isEnvironmentsFolder = (pathname, collectionPath) => {
   const dirname = path.dirname(pathname);
   const envDirectory = path.join(collectionPath, 'environments');
-  const basename = path.basename(pathname);
 
-  return dirname === envDirectory && hasBruExtension(basename);
+  return dirname === envDirectory;
 };
 
-const isCollectionRootBruFile = (pathname, collectionPath) => {
+const isFolderRootFile = (pathname, collectionPath) => {
+  const basename = path.basename(pathname);
+  const format = getCollectionFormat(collectionPath);
+
+  if (format === 'yml') {
+    return basename === 'folder.yml';
+  } else if (format === 'bru') {
+    return basename === 'folder.bru';
+  }
+
+  return false;
+};
+
+const isCollectionRootFile = (pathname, collectionPath) => {
   const dirname = path.dirname(pathname);
   const basename = path.basename(pathname);
-  return dirname === collectionPath && basename === 'collection.bru';
+
+  // return if we are not at the root of the collection
+  if (dirname !== collectionPath) {
+    return false;
+  }
+
+  return basename === 'collection.bru' || basename === 'opencollection.yml';
 };
 
-const hydrateBruCollectionFileWithUuid = (collectionRoot) => {
+const envHasSecrets = (environment = {}) => {
+  const secrets = _.filter(environment.variables, (v) => v.secret);
+
+  return secrets && secrets.length > 0;
+};
+
+const hydrateCollectionRootWithUuid = (collectionRoot) => {
   const params = _.get(collectionRoot, 'request.params', []);
   const headers = _.get(collectionRoot, 'request.headers', []);
   const requestVars = _.get(collectionRoot, 'request.vars.req', []);
@@ -69,12 +99,6 @@ const hydrateBruCollectionFileWithUuid = (collectionRoot) => {
   return collectionRoot;
 };
 
-const envHasSecrets = (environment = {}) => {
-  const secrets = _.filter(environment.variables, (v) => v.secret);
-
-  return secrets && secrets.length > 0;
-};
-
 const addEnvironmentFile = async (win, pathname, collectionUid, collectionPath) => {
   try {
     const basename = path.basename(pathname);
@@ -86,10 +110,14 @@ const addEnvironmentFile = async (win, pathname, collectionUid, collectionPath)
       }
     };
 
-    let bruContent = fs.readFileSync(pathname, 'utf8');
+    const format = getCollectionFormat(collectionPath);
+    let content = fs.readFileSync(pathname, 'utf8');
 
-    file.data = await parseEnvironment(bruContent);
-    file.data.name = basename.substring(0, basename.length - 4);
+    file.data = await parseEnvironment(content, { format });
+
+    // Extract name by removing the extension
+    const ext = path.extname(basename);
+    file.data.name = basename.substring(0, basename.length - ext.length);
     file.data.uid = getRequestUid(pathname);
 
     _.each(_.get(file, 'data.variables', []), (variable) => (variable.uid = uuid()));
@@ -123,9 +151,14 @@ const changeEnvironmentFile = async (win, pathname, collectionUid, collectionPat
       }
     };
 
-    const bruContent = fs.readFileSync(pathname, 'utf8');
-    file.data = await parseEnvironment(bruContent);
-    file.data.name = basename.substring(0, basename.length - 4);
+    const format = getCollectionFormat(collectionPath);
+    const content = fs.readFileSync(pathname, 'utf8');
+
+    file.data = await parseEnvironment(content, { format });
+
+    // Extract name by removing the extension
+    const ext = path.extname(basename);
+    file.data.name = basename.substring(0, basename.length - ext.length);
     file.data.uid = getRequestUid(pathname);
     _.each(_.get(file, 'data.variables', []), (variable) => (variable.uid = uuid()));
 
@@ -177,29 +210,18 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     try {
       const content = fs.readFileSync(pathname, 'utf8');
       let brunoConfig = JSON.parse(content);
-      /*
-      * This is a temporary migration to convert grpc to protobuf
-      * This got added on september 18, 2025
-      * TODO: Remove this after 1st January, 2026
-      */
-      if (brunoConfig.grpc) {
-        brunoConfig.protobuf = brunoConfig.grpc;
-        delete brunoConfig.grpc;
-        const stringifiedConfig = JSON.stringify(brunoConfig, null, 2);
-        fs.writeFileSync(pathname, stringifiedConfig);
 
-        const payload = {
-          collectionUid,
-          brunoConfig: brunoConfig
-        };
-
-        win.webContents.send('main:bruno-config-update', payload);
-      }
-
-      // Transform the config to add existence checks for protobuf files and import paths
+      // Transform the config to add exists metadata for protobuf files and import paths
       brunoConfig = await transformBrunoConfigAfterRead(brunoConfig, collectionPath);
 
       setBrunoConfig(collectionUid, brunoConfig);
+
+      const payload = {
+        collectionUid,
+        brunoConfig: brunoConfig
+      };
+
+      win.webContents.send('main:bruno-config-update', payload);
     } catch (err) {
       console.error(err);
     }
@@ -223,11 +245,12 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     }
   }
 
-  if (isBruEnvironmentConfig(pathname, collectionPath)) {
+  if (isEnvironmentsFolder(pathname, collectionPath)) {
     return addEnvironmentFile(win, pathname, collectionUid, collectionPath);
   }
 
-  if (isCollectionRootBruFile(pathname, collectionPath)) {
+  if (isCollectionRootFile(pathname, collectionPath)) {
+    const format = getCollectionFormat(collectionPath);
     const file = {
       meta: {
         collectionUid,
@@ -238,20 +261,45 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     };
 
     try {
-      let bruContent = fs.readFileSync(pathname, 'utf8');
+      let content = fs.readFileSync(pathname, 'utf8');
+      let parsed = await parseCollection(content, { format });
 
-      file.data = await parseCollection(bruContent);
+      let collectionRoot, brunoConfig;
+      if (format === 'yml') {
+        collectionRoot = parsed.collectionRoot;
+        brunoConfig = parsed.brunoConfig;
+      } else {
+        collectionRoot = parsed;
+        brunoConfig = undefined;
+      }
 
-      hydrateBruCollectionFileWithUuid(file.data);
+      file.data = collectionRoot;
+
+      hydrateCollectionRootWithUuid(file.data);
       win.webContents.send('main:collection-tree-updated', 'addFile', file);
-      return;
+
+      // in yml format, opencollection.yml also contains the bruno config
+      if (format === 'yml') {
+        // Transform the config to add exists metadata for protobuf files and import paths
+        brunoConfig = await transformBrunoConfigAfterRead(brunoConfig, collectionPath);
+
+        setBrunoConfig(collectionUid, brunoConfig);
+
+        const payload = {
+          collectionUid,
+          brunoConfig: brunoConfig
+        };
+
+        win.webContents.send('main:bruno-config-update', payload);
+      }
     } catch (err) {
       console.error(err);
-      return;
     }
+
+    return;
   }
 
-  if (path.basename(pathname) === 'folder.bru') {
+  if (isFolderRootFile(pathname, collectionPath)) {
     const file = {
       meta: {
         collectionUid,
@@ -262,11 +310,11 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     };
 
     try {
-      let bruContent = fs.readFileSync(pathname, 'utf8');
+      let format = getCollectionFormat(collectionPath);
+      let content = fs.readFileSync(pathname, 'utf8');
+      file.data = await parseFolder(content, { format });
 
-      file.data = await parseCollection(bruContent);
-
-      hydrateBruCollectionFileWithUuid(file.data);
+      hydrateCollectionRootWithUuid(file.data);
       win.webContents.send('main:collection-tree-updated', 'addFile', file);
       return;
     } catch (err) {
@@ -275,7 +323,8 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     }
   }
 
-  if (hasBruExtension(pathname)) {
+  const format = getCollectionFormat(collectionPath);
+  if (hasRequestExtension(pathname, format)) {
     watcher.addFileToProcessing(collectionUid, pathname);
 
     const file = {
@@ -287,11 +336,12 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
     };
 
     const fileStats = fs.statSync(pathname);
-    let bruContent = fs.readFileSync(pathname, 'utf8');
+    let content = fs.readFileSync(pathname, 'utf8');
+
     // If worker thread is not used, we can directly parse the file
     if (!useWorkerThread) {
       try {
-        file.data = await parseRequest(bruContent);
+        file.data = await parseRequest(content, { format });
         file.partial = false;
         file.loading = false;
         file.size = sizeInMB(fileStats?.size);
@@ -314,7 +364,7 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
         type: 'http-request'
       };
 
-      const metaJson = parseBruFileMeta(bruContent);
+      const metaJson = parseFileMeta(content, format);
       file.data = metaJson;
       file.partial = true;
       file.loading = false;
@@ -331,7 +381,10 @@ const add = async (win, pathname, collectionUid, collectionPath, useWorkerThread
         win.webContents.send('main:collection-tree-updated', 'addFile', file);
 
         // This is to update the file info in the UI
-        file.data = await parseRequestViaWorker(bruContent);
+        file.data = await parseRequestViaWorker(content, {
+          format,
+          filename: pathname
+        });
         file.partial = false;
         file.loading = false;
         hydrateRequestWithUuid(file.data, pathname);
@@ -365,18 +418,19 @@ const addDirectory = async (win, pathname, collectionUid, collectionPath) => {
 
   let name = path.basename(pathname);
   let seq;
-  const folderBruFilePath = path.join(pathname, `folder.bru`);
+
+  const format = getCollectionFormat(collectionPath);
+  const folderFilePath = path.join(pathname, `folder.${format}`);
 
   try {
-    if (fs.existsSync(folderBruFilePath)) {
-      let folderBruFileContent = fs.readFileSync(folderBruFilePath, 'utf8');
-      let folderBruData = await parseFolder(folderBruFileContent);
-      name = folderBruData?.meta?.name || name;
-      seq = folderBruData?.meta?.seq;
+    if (fs.existsSync(folderFilePath)) {
+      let folderFileContent = fs.readFileSync(folderFilePath, 'utf8');
+      let folderData = await parseFolder(folderFileContent, { format });
+      name = folderData?.meta?.name || name;
+      seq = folderData?.meta?.seq;
     }
-  }
-  catch(error) {
-    console.error('Error occured while parsing folder.bru file!');
+  } catch (error) {
+    console.error(`Error occured while parsing folder.${format} file`);
     console.error(error);
   }
 
@@ -399,19 +453,22 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
       const content = fs.readFileSync(pathname, 'utf8');
       let brunoConfig = JSON.parse(content);
 
-      // Transform the config to add existence checks for protobuf files and import paths
+      // Transform the config to add file existence checks for protobuf files and import paths
       brunoConfig = await transformBrunoConfigAfterRead(brunoConfig, collectionPath);
 
+      setBrunoConfig(collectionUid, brunoConfig);
+
       const payload = {
         collectionUid,
         brunoConfig: brunoConfig
       };
 
-      setBrunoConfig(collectionUid, brunoConfig);
       win.webContents.send('main:bruno-config-update', payload);
     } catch (err) {
       console.error(err);
     }
+
+    return;
   }
 
   if (isDotEnvFile(pathname, collectionPath)) {
@@ -430,13 +487,15 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
     } catch (err) {
       console.error(err);
     }
+
+    return;
   }
 
-  if (isBruEnvironmentConfig(pathname, collectionPath)) {
+  if (isEnvironmentsFolder(pathname, collectionPath)) {
     return changeEnvironmentFile(win, pathname, collectionUid, collectionPath);
   }
 
-  if (isCollectionRootBruFile(pathname, collectionPath)) {
+  if (isCollectionRootFile(pathname, collectionPath)) {
     const file = {
       meta: {
         collectionUid,
@@ -447,19 +506,46 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
     };
 
     try {
-      let bruContent = fs.readFileSync(pathname, 'utf8');
+      let content = fs.readFileSync(pathname, 'utf8');
+      let format = getCollectionFormat(collectionPath);
+      let parsed = await parseCollection(content, { format });
 
-      file.data = await parseCollection(bruContent);
-      hydrateBruCollectionFileWithUuid(file.data);
+      let collectionRoot, brunoConfig;
+      if (format === 'yml') {
+        collectionRoot = parsed.collectionRoot;
+        brunoConfig = parsed.brunoConfig;
+      } else {
+        collectionRoot = parsed;
+        brunoConfig = undefined;
+      }
+
+      file.data = collectionRoot;
+
+      hydrateCollectionRootWithUuid(file.data);
       win.webContents.send('main:collection-tree-updated', 'change', file);
-      return;
+
+      // in yml format, opencollection.yml also contains the bruno config
+      if (format === 'yml') {
+        // Transform the config to add exists metadata for protobuf files and import paths
+        brunoConfig = await transformBrunoConfigAfterRead(brunoConfig, collectionPath);
+
+        setBrunoConfig(collectionUid, brunoConfig);
+
+        const payload = {
+          collectionUid,
+          brunoConfig: brunoConfig
+        };
+
+        win.webContents.send('main:bruno-config-update', payload);
+      }
     } catch (err) {
       console.error(err);
-      return;
     }
+
+    return;
   }
 
-  if (path.basename(pathname) === 'folder.bru') {
+  if (isFolderRootFile(pathname, collectionPath)) {
     const file = {
       meta: {
         collectionUid,
@@ -470,11 +556,11 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
     };
 
     try {
-      let bruContent = fs.readFileSync(pathname, 'utf8');
+      let format = getCollectionFormat(collectionPath);
+      let content = fs.readFileSync(pathname, 'utf8');
+      file.data = await parseFolder(content, { format });
 
-      file.data = await parseCollection(bruContent);
-
-      hydrateBruCollectionFileWithUuid(file.data);
+      hydrateCollectionRootWithUuid(file.data);
       win.webContents.send('main:collection-tree-updated', 'change', file);
       return;
     } catch (err) {
@@ -483,7 +569,8 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
     }
   }
 
-  if (hasBruExtension(pathname)) {
+  const format = getCollectionFormat(collectionPath);
+  if (hasRequestExtension(pathname, format)) {
     try {
       const file = {
         meta: {
@@ -493,21 +580,18 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
         }
       };
 
-      const bru = fs.readFileSync(pathname, 'utf8');
+      const content = fs.readFileSync(pathname, 'utf8');
       const fileStats = fs.statSync(pathname);
 
-      if (fileStats.size >= MAX_FILE_SIZE) {
-        const parsedData = await parseLargeRequestWithRedaction(bru);
-        file.data = parsedData;
-        file.size = sizeInMB(fileStats?.size);
-        hydrateRequestWithUuid(file.data, pathname);
-        win.webContents.send('main:collection-tree-updated', 'change', file);
+      if (fileStats.size >= MAX_FILE_SIZE && format === 'bru') {
+        file.data = await parseLargeRequestWithRedaction(content);
       } else {
-        file.data = await parseRequest(bru);
-        file.size = sizeInMB(fileStats?.size);
-        hydrateRequestWithUuid(file.data, pathname);
-        win.webContents.send('main:collection-tree-updated', 'change', file);
+        file.data = await parseRequest(content, { format });
       }
+
+      file.size = sizeInMB(fileStats?.size);
+      hydrateRequestWithUuid(file.data, pathname);
+      win.webContents.send('main:collection-tree-updated', 'change', file);
     } catch (err) {
       console.error(err);
     }
@@ -517,16 +601,24 @@ const change = async (win, pathname, collectionUid, collectionPath) => {
 const unlink = (win, pathname, collectionUid, collectionPath) => {
   console.log(`watcher unlink: ${pathname}`);
 
-  if (isBruEnvironmentConfig(pathname, collectionPath)) {
+  if (isEnvironmentsFolder(pathname, collectionPath)) {
     return unlinkEnvironmentFile(win, pathname, collectionUid);
   }
 
-  if (hasBruExtension(pathname)) {
+  const format = getCollectionFormat(collectionPath);
+  if (hasRequestExtension(pathname, format)) {
+    const basename = path.basename(pathname);
+    const dirname = path.dirname(pathname);
+
+    if (basename === 'opencollection.yml' && dirname === collectionPath) {
+      return;
+    }
+
     const file = {
       meta: {
         collectionUid,
         pathname,
-        name: path.basename(pathname)
+        name: basename
       }
     };
     win.webContents.send('main:collection-tree-updated', 'unlink', file);
@@ -540,15 +632,15 @@ const unlinkDir = async (win, pathname, collectionUid, collectionPath) => {
     return;
   }
 
-
-  const folderBruFilePath = path.join(pathname, `folder.bru`);
+  const format = getCollectionFormat(collectionPath);
+  const folderFilePath = path.join(pathname, `folder.${format}`);
 
   let name = path.basename(pathname);
 
-  if (fs.existsSync(folderBruFilePath)) {
-    let folderBruFileContent = fs.readFileSync(folderBruFilePath, 'utf8');
-    let folderBruData = await parseFolder(folderBruFileContent);
-    name = folderBruData?.meta?.name || name;
+  if (fs.existsSync(folderFilePath)) {
+    let folderFileContent = fs.readFileSync(folderFilePath, 'utf8');
+    let folderData = await parseFolder(folderFileContent, { format });
+    name = folderData?.meta?.name || name;
   }
 
   const directory = {
diff --git a/packages/bruno-electron/src/app/collections.js b/packages/bruno-electron/src/app/collections.js
index 29846d98c..1fdbbed16 100644
--- a/packages/bruno-electron/src/app/collections.js
+++ b/packages/bruno-electron/src/app/collections.js
@@ -2,15 +2,19 @@ const fs = require('fs');
 const path = require('path');
 const { dialog, ipcMain } = require('electron');
 const Yup = require('yup');
-const { isDirectory, normalizeAndResolvePath, getCollectionStats } = require('../utils/filesystem');
+const { isDirectory, getCollectionStats } = require('../utils/filesystem');
 const { generateUidBasedOnHash } = require('../utils/common');
 const { transformBrunoConfigAfterRead } = require('../utils/transfomBrunoConfig');
+const { parseCollection } = require('@usebruno/filestore');
 
 // todo: bruno.json config schema validation errors must be propagated to the UI
 const configSchema = Yup.object({
   name: Yup.string().max(256, 'name must be 256 characters or less').required('name is required'),
   type: Yup.string().oneOf(['collection']).required('type is required'),
-  version: Yup.string().oneOf(['1']).required('type is required')
+  // For BRU format collections
+  version: Yup.string().oneOf(['1']).notRequired(),
+  // For YAML format collections (opencollection)
+  opencollection: Yup.string().notRequired()
 });
 
 const readConfigFile = async (pathname) => {
@@ -31,9 +35,25 @@ const validateSchema = async (config) => {
 };
 
 const getCollectionConfigFile = async (pathname) => {
+  // Check for opencollection.yml first
+  const ocYmlPath = path.join(pathname, 'opencollection.yml');
+  if (fs.existsSync(ocYmlPath)) {
+    try {
+      const content = fs.readFileSync(ocYmlPath, 'utf8');
+      const {
+        brunoConfig
+      } = parseCollection(content, { format: 'yml' });
+      await validateSchema(brunoConfig);
+      return brunoConfig;
+    } catch (err) {
+      throw new Error(`Unable to parse opencollection.yml: ${err.message}`);
+    }
+  }
+
+  // Fall back to bruno.json
   const configFilePath = path.join(pathname, 'bruno.json');
   if (!fs.existsSync(configFilePath)) {
-    throw new Error(`The collection is not valid (bruno.json not found)`);
+    throw new Error(`The collection is not valid (neither bruno.json nor opencollection.yml found)`);
   }
 
   const config = await readConfigFile(configFilePath);
diff --git a/packages/bruno-electron/src/ipc/collection.js b/packages/bruno-electron/src/ipc/collection.js
index e05899c87..1d1ba13e7 100644
--- a/packages/bruno-electron/src/ipc/collection.js
+++ b/packages/bruno-electron/src/ipc/collection.js
@@ -26,13 +26,20 @@ const {
   hasBruExtension,
   isDirectory,
   createDirectory,
-  searchForBruFiles,
   sanitizeName,
   isWSLPath,
   safeToRename,
+  getSubDirectories,
   isWindowsOS,
+  readDir,
+  hasRequestExtension,
+  getCollectionFormat,
+  searchForRequestFiles,
+  normalizeAndResolvePath,
   validateName,
-  hasSubDirectories,
+  chooseFileToSave,
+  exists,
+  isFile,
   getCollectionStats,
   sizeInMB,
   safeWriteFileSync,
@@ -42,7 +49,7 @@ const {
   generateUniqueName
 } = require('../utils/filesystem');
 const { openCollectionDialog } = require('../app/collections');
-const { generateUidBasedOnHash, stringifyJson, safeParseJSON, safeStringifyJSON } = require('../utils/common');
+const { generateUidBasedOnHash, stringifyJson, safeStringifyJSON, safeParseJSON } = require('../utils/common');
 const { moveRequestUid, deleteRequestUid } = require('../cache/requestUids');
 const { deleteCookiesForDomain, getDomainsWithCookies, addCookieForDomain, modifyCookieForDomain, parseCookieString, createCookieString, deleteCookie } = require('../utils/cookies');
 const EnvironmentSecretsStore = require('../store/env-secrets');
@@ -71,20 +78,30 @@ const envHasSecrets = (environment = {}) => {
   return secrets && secrets.length > 0;
 };
 
-const validatePathIsInsideCollection = (filePath, lastOpenedCollections) => {
+const findCollectionPathByItemPath = (filePath, lastOpenedCollections) => {
   const openCollectionPaths = collectionWatcher.getAllWatcherPaths();
   const lastOpenedPaths = lastOpenedCollections ? lastOpenedCollections.getAll() : [];
 
   // Combine both currently watched collections and last opened collections
-  // todo: remove the lastOpenedPaths from the list
-  // todo: have a proper way to validate the path without the active watcher logic
   const allCollectionPaths = [...new Set([...openCollectionPaths, ...lastOpenedPaths])];
 
-  const isValid = allCollectionPaths.some((collectionPath) => {
-    return filePath.startsWith(collectionPath + path.sep) || filePath === collectionPath;
-  });
+  // Find the collection path that contains this file
+  // Sort by length descending to find the most specific (deepest) match first
+  const sortedPaths = allCollectionPaths.sort((a, b) => b.length - a.length);
 
-  if (!isValid) {
+  for (const collectionPath of sortedPaths) {
+    if (filePath.startsWith(collectionPath + path.sep) || filePath === collectionPath) {
+      return collectionPath;
+    }
+  }
+
+  return null;
+};
+
+const validatePathIsInsideCollection = (filePath, lastOpenedCollections) => {
+  const collectionPath = findCollectionPathByItemPath(filePath, lastOpenedCollections);
+
+  if (!collectionPath) {
     throw new Error(`Path: ${filePath} should be inside a collection`);
   }
 }
@@ -93,7 +110,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   // create collection
   ipcMain.handle(
     'renderer:create-collection',
-    async (event, collectionName, collectionFolderName, collectionLocation) => {
+    async (event, collectionName, collectionFolderName, collectionLocation, format = 'bru') => {
       try {
         collectionFolderName = sanitizeName(collectionFolderName);
         const dirPath = path.join(collectionLocation, collectionFolderName);
@@ -114,14 +131,34 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         }
 
         const uid = generateUidBasedOnHash(dirPath);
-        const brunoConfig = {
+        let brunoConfig = {
           version: '1',
           name: collectionName,
           type: 'collection',
           ignore: ['node_modules', '.git']
         };
-        const content = await stringifyJson(brunoConfig);
-        await writeFile(path.join(dirPath, 'bruno.json'), content);
+
+        if (format === 'yml') {
+          const collectionRoot = {
+            meta: {
+              name: collectionName
+            }
+          };
+          // For YAML collections, set opencollection instead of version
+          brunoConfig = {
+            opencollection: '1.0.0',
+            name: collectionName,
+            type: 'collection',
+            ignore: ['node_modules', '.git']
+          };
+          const content = stringifyCollection(collectionRoot, brunoConfig, { format });
+          await writeFile(path.join(dirPath, 'opencollection.yml'), content);
+        } else if (format === 'bru') {
+          const content = await stringifyJson(brunoConfig);
+          await writeFile(path.join(dirPath, 'bruno.json'), content);
+        } else {
+          throw new Error(`Invalid format: ${format}`);
+        }
 
         const { size, filesCount } = await getCollectionStats(dirPath);
         brunoConfig.size = size;
@@ -151,26 +188,41 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       // create dir
       await createDirectory(dirPath);
       const uid = generateUidBasedOnHash(dirPath);
+      const format = getCollectionFormat(previousPath);
 
-      // open the bruno.json of previousPath
-      const brunoJsonFilePath = path.join(previousPath, 'bruno.json');
-      const content = fs.readFileSync(brunoJsonFilePath, 'utf8');
+      if (format === 'yml') {
+        const content = fs.readFileSync('opencollection.yml', 'utf8');
+        const {
+          brunoConfig,
+          collectionRoot
+        } = parseCollection(content);
 
-      // Change new name of collection
-      let brunoConfig = JSON.parse(content);
-      brunoConfig.name = collectionName;
-      const cont = await stringifyJson(brunoConfig);
+        brunoConfig.name = collectionName;
 
-      // write the bruno.json to new dir
-      await writeFile(path.join(dirPath, 'bruno.json'), cont);
+        const newContent = stringifyCollection(collectionRoot, brunoConfig, { format });
+        await writeFile(path.join(dirPath, 'opencollection.yml'), newContent);
+      } else if (format === 'bru') {
+        const content = fs.readFileSync('bruno.json', 'utf8');
+        const brunoConfig = JSON.parse(content);
+        brunoConfig.name = collectionName;
+        const newContent = await stringifyJson(brunoConfig);
+        await writeFile(path.join(dirPath, 'bruno.json'), newContent);
+      } else {
+        throw new Error(`Invalid collectionformat: ${format}`);
+      }
 
-      // Now copy all the files with extension name .bru along with the dir
-      const files = searchForBruFiles(previousPath);
+      // Now copy all the files matching the collection's filetype along with the dir
+      const files = searchForRequestFiles(previousPath);
 
       for (const sourceFilePath of files) {
         const relativePath = path.relative(previousPath, sourceFilePath);
         const newFilePath = path.join(dirPath, relativePath);
 
+        // skip if the file is opencollection.yml at the root of the collection
+        if (path.basename(sourceFilePath) === 'opencollection.yml' && path.dirname(sourceFilePath) === previousPath) {
+          continue;
+        }
+
         // handle dir of files
         fs.mkdirSync(path.dirname(newFilePath), { recursive: true });
         // copy each files
@@ -188,17 +240,29 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   // rename collection
   ipcMain.handle('renderer:rename-collection', async (event, newName, collectionPathname) => {
     try {
-      const brunoJsonFilePath = path.join(collectionPathname, 'bruno.json');
-      const content = fs.readFileSync(brunoJsonFilePath, 'utf8');
-      const json = JSON.parse(content);
+      const format = getCollectionFormat(collectionPathname);
 
-      json.name = newName;
+      if (format === 'yml') {
+        const content = fs.readFileSync('opencollection.yml', 'utf8');
+        const {
+          brunoConfig,
+          collectionRoot
+        } = parseCollection(content);
 
-      const newContent = await stringifyJson(json);
-      await writeFile(brunoJsonFilePath, newContent);
+        brunoConfig.name = newName;
+
+        const newContent = stringifyCollection(collectionRoot, brunoConfig, { format });
+        await writeFile(path.join(collectionPathname, 'opencollection.yml'), newContent);
+      } else if (format === 'bru') {
+        const content = fs.readFileSync('bruno.json', 'utf8');
+        const brunoConfig = JSON.parse(content);
+        brunoConfig.name = newName;
+        const newContent = await stringifyJson(brunoConfig);
+        await writeFile(path.join(collectionPathname, 'bruno.json'), newContent);
+      } else {
+        throw new Error(`Invalid format: ${format}`);
+      }
 
-      // todo: listen for bruno.json changes and handle it in watcher
-      // the app will change the name of the collection after parsing the bruno.json file contents
       mainWindow.webContents.send('main:collection-renamed', {
         collectionPathname,
         newName
@@ -210,8 +274,10 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
   ipcMain.handle('renderer:save-folder-root', async (event, folder) => {
     try {
-      const { name: folderName, root: folderRoot = {}, pathname: folderPathname } = folder;
-      const folderBruFilePath = path.join(folderPathname, 'folder.bru');
+      const { name: folderName, root: folderRoot = {}, folderPathname, collectionPathname } = folder;
+
+      const format = getCollectionFormat(collectionPathname);
+      const folderFilePath = path.join(folderPathname, `folder.${format}`);
 
       if (!folderRoot.meta) {
         folderRoot.meta = {
@@ -219,19 +285,23 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         };
       }
 
-      const content = await stringifyFolder(folderRoot);
-      await writeFile(folderBruFilePath, content);
+      const content = await stringifyFolder(folderRoot, { format });
+      await writeFile(folderFilePath, content);
     } catch (error) {
       return Promise.reject(error);
     }
   });
-  ipcMain.handle('renderer:save-collection-root', async (event, collectionPathname, collectionRoot) => {
-    try {
-      const collectionBruFilePath = path.join(collectionPathname, 'collection.bru');
 
-      const content = await stringifyCollection(collectionRoot);
-      await writeFile(collectionBruFilePath, content);
+  // save collection root
+  ipcMain.handle('renderer:save-collection-root', async (event, collectionPathname, collectionRoot, brunoConfig) => {
+    try {
+      const format = getCollectionFormat(collectionPathname);
+      const filename = format === 'yml' ? 'opencollection.yml' : 'collection.bru';
+      const content = await stringifyCollection(collectionRoot, brunoConfig, { format });
+
+      await writeFile(path.join(collectionPathname, filename), content);
     } catch (error) {
+      console.error('Error in save-collection-root:', error);
       return Promise.reject(error);
     }
   });
@@ -242,12 +312,21 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       if (fs.existsSync(pathname)) {
         throw new Error(`path: ${pathname} already exists`);
       }
+
+      const collectionPath = findCollectionPathByItemPath(pathname, lastOpenedCollections);
+      if (!collectionPath) {
+        throw new Error('Collection not found for the given pathname');
+      }
+      const format = getCollectionFormat(collectionPath);
+
       // For the actual filename part, we want to be strict
-      if (!validateName(request?.filename)) {
-        throw new Error(`${request.filename}.bru is not a valid filename`);
+      const baseFilename = request?.filename?.replace(`.${format}`, '');
+      if (!validateName(baseFilename)) {
+        throw new Error(`${request.filename} is not a valid filename`);
       }
       validatePathIsInsideCollection(pathname, lastOpenedCollections);
-      const content = await stringifyRequestViaWorker(request);
+
+      const content = await stringifyRequestViaWorker(request, { format });
       await writeFile(pathname, content);
     } catch (error) {
       return Promise.reject(error);
@@ -255,12 +334,13 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // save request
-  ipcMain.handle('renderer:save-request', async (event, pathname, request) => {
+  ipcMain.handle('renderer:save-request', async (event, pathname, request, format) => {
     try {
       if (!fs.existsSync(pathname)) {
         throw new Error(`path: ${pathname} does not exist`);
       }
-      const content = await stringifyRequestViaWorker(request);
+
+      const content = await stringifyRequestViaWorker(request, { format });
       await writeFile(pathname, content);
     } catch (error) {
       return Promise.reject(error);
@@ -278,7 +358,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
           throw new Error(`path: ${pathname} does not exist`);
         }
 
-        const content = await stringifyRequestViaWorker(request);
+        const content = await stringifyRequestViaWorker(request, { format: r.format });
         await writeFile(pathname, content);
       }
     } catch (error) {
@@ -286,6 +366,70 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
+  // Helper: Parse file content based on scope type
+  const parseFileByType = async (fileContent, scopeType) => {
+    switch (scopeType) {
+      case 'request':
+        return await parseRequestViaWorker(fileContent);
+      case 'folder':
+        return parseFolder(fileContent);
+      case 'collection':
+        return parseCollection(fileContent);
+      default:
+        throw new Error(`Invalid scope type: ${scopeType}`);
+    }
+  };
+
+  const stringifyByType = async (data, scopeType, collectionRoot, format) => {
+    switch (scopeType) {
+      case 'request':
+        return await stringifyRequestViaWorker(data, { format });
+      case 'folder':
+        return stringifyFolder(data, { format });
+      case 'collection':
+        return stringifyCollection(collectionRoot, data, { format });
+      default:
+        throw new Error(`Invalid scope type: ${scopeType}`);
+    }
+  };
+
+  // Helper: Update or create variable in array
+  const updateOrCreateVariable = (variables, variable) => {
+    const existingVar = variables.find((v) => v.name === variable.name);
+
+    if (existingVar) {
+      // Update existing variable
+      return variables.map((v) => (v.name === variable.name ? variable : v));
+    }
+
+    // Create new variable
+    return [...variables, variable];
+  };
+
+  // update variable in request/folder/collection file
+  ipcMain.handle('renderer:update-variable-in-file', async (event, pathname, variable, scopeType, collectionRoot, format) => {
+    try {
+      if (!fs.existsSync(pathname)) {
+        throw new Error(`path: ${pathname} does not exist`);
+      }
+
+      // Read and parse the file
+      const fileContent = fs.readFileSync(pathname, 'utf8');
+      const parsedData = await parseFileByType(fileContent, scopeType);
+
+      // Update the specific variable or create it if it doesn't exist
+      const varsPath = 'request.vars.req';
+      const variables = _.get(parsedData, varsPath, []);
+      const updatedVariables = updateOrCreateVariable(variables, variable);
+
+      _.set(parsedData, varsPath, updatedVariables);
+
+      const content = await stringifyByType(parsedData, scopeType, collectionRoot, format);
+      await writeFile(pathname, content);
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  });
 
   // create environment
   ipcMain.handle('renderer:create-environment', async (event, collectionPathname, name, variables) => {
@@ -295,17 +439,19 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         await createDirectory(envDirPath);
       }
 
+      const format = getCollectionFormat(collectionPathname);
+
       // Get existing environment files to generate unique name
       const existingFiles = fs.existsSync(envDirPath) ? fs.readdirSync(envDirPath) : [];
       const existingEnvNames = existingFiles
-        .filter((file) => file.endsWith('.bru'))
-        .map((file) => path.basename(file, '.bru'));
+        .filter((file) => file.endsWith(`.${format}`))
+        .map((file) => path.basename(file, `.${format}`));
 
       // Generate unique name based on existing environment files
       const sanitizedName = sanitizeName(name);
       const uniqueName = generateUniqueName(sanitizedName, (name) => existingEnvNames.includes(name));
 
-      const envFilePath = path.join(envDirPath, `${uniqueName}.bru`);
+      const envFilePath = path.join(envDirPath, `${uniqueName}.${format}`);
 
       const environment = {
         name: uniqueName,
@@ -316,7 +462,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         environmentSecretsStore.storeEnvSecrets(collectionPathname, environment);
       }
 
-      const content = await stringifyEnvironment(environment);
+      const content = await stringifyEnvironment(environment, { format });
 
       await writeFile(envFilePath, content);
     } catch (error) {
@@ -332,7 +478,10 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         await createDirectory(envDirPath);
       }
 
-      const envFilePath = path.join(envDirPath, `${environment.name}.bru`);
+      const format = getCollectionFormat(collectionPathname);
+      // Determine filetype from collection
+      const envFilePath = path.join(envDirPath, `${environment.name}.${format}`);
+
       if (!fs.existsSync(envFilePath)) {
         throw new Error(`environment: ${envFilePath} does not exist`);
       }
@@ -341,7 +490,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         environmentSecretsStore.storeEnvSecrets(collectionPathname, environment);
       }
 
-      const content = await stringifyEnvironment(environment);
+      const content = await stringifyEnvironment(environment, { format });
       await writeFile(envFilePath, content);
     } catch (error) {
       return Promise.reject(error);
@@ -351,13 +500,15 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   // rename environment
   ipcMain.handle('renderer:rename-environment', async (event, collectionPathname, environmentName, newName) => {
     try {
+      const format = getCollectionFormat(collectionPathname);
       const envDirPath = path.join(collectionPathname, 'environments');
-      const envFilePath = path.join(envDirPath, `${environmentName}.bru`);
+      const envFilePath = path.join(envDirPath, `${environmentName}.${format}`);
+
       if (!fs.existsSync(envFilePath)) {
         throw new Error(`environment: ${envFilePath} does not exist`);
       }
 
-      const newEnvFilePath = path.join(envDirPath, `${newName}.bru`);
+      const newEnvFilePath = path.join(envDirPath, `${newName}.${format}`);
       if (!safeToRename(envFilePath, newEnvFilePath)) {
         throw new Error(`environment: ${newEnvFilePath} already exists`);
       }
@@ -373,8 +524,9 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   // delete environment
   ipcMain.handle('renderer:delete-environment', async (event, collectionPathname, environmentName) => {
     try {
+      const format = getCollectionFormat(collectionPathname);
       const envDirPath = path.join(collectionPathname, 'environments');
-      const envFilePath = path.join(envDirPath, `${environmentName}.bru`);
+      const envFilePath = path.join(envDirPath, `${environmentName}.${format}`);
       if (!fs.existsSync(envFilePath)) {
         throw new Error(`environment: ${envFilePath} does not exist`);
       }
@@ -459,7 +611,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // rename item
-  ipcMain.handle('renderer:rename-item-name', async (event, { itemPath, newName }) => {
+  ipcMain.handle('renderer:rename-item-name', async (event, { itemPath, newName, collectionPathname }) => {
     try {
 
       if (!fs.existsSync(itemPath)) {
@@ -467,35 +619,36 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       }
 
       if (isDirectory(itemPath)) {
-        const folderBruFilePath = path.join(itemPath, 'folder.bru');
-        let folderBruFileJsonContent;
-        if (fs.existsSync(folderBruFilePath)) {
-          const oldFolderBruFileContent = await fs.promises.readFile(folderBruFilePath, 'utf8');
-          folderBruFileJsonContent = await parseFolder(oldFolderBruFileContent);
-          folderBruFileJsonContent.meta.name = newName;
+        const format = getCollectionFormat(collectionPathname);
+        const folderFilePath = path.join(itemPath, `folder.${format}`);
+        let folderFileJsonContent;
+        if (fs.existsSync(folderFilePath)) {
+          const oldFolderFileContent = await fs.promises.readFile(folderFilePath, 'utf8');
+          folderFileJsonContent = await parseFolder(oldFolderFileContent, { format });
+          folderFileJsonContent.meta.name = newName;
         } else {
-          folderBruFileJsonContent = {
+          folderFileJsonContent = {
             meta: {
               name: newName
             }
           };
         }
         
-        const folderBruFileContent = await stringifyFolder(folderBruFileJsonContent);
-        await writeFile(folderBruFilePath, folderBruFileContent);
+        const folderFileContent = await stringifyFolder(folderFileJsonContent, { format });
+        await writeFile(folderFilePath, folderFileContent);
 
         return;
       }
 
-      const isBru = hasBruExtension(itemPath);
-      if (!isBru) {
-        throw new Error(`path: ${itemPath} is not a bru file`);
+      const format = getCollectionFormat(collectionPathname);
+      if (!hasRequestExtension(itemPath, format)) {
+        throw new Error(`path: ${itemPath} is not a valid request file`);
       }
 
       const data = fs.readFileSync(itemPath, 'utf8');
-      const jsonData = parseRequest(data);
+      const jsonData = parseRequest(data, { format });
       jsonData.name = newName;
-      const content = stringifyRequest(jsonData);
+      const content = stringifyRequest(jsonData, { format });
       await writeFile(itemPath, content);
     } catch (error) {
       return Promise.reject(error);
@@ -503,7 +656,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // rename item
-  ipcMain.handle('renderer:rename-item-filename', async (event, { oldPath, newPath, newName, newFilename }) => {
+  ipcMain.handle('renderer:rename-item-filename', async (event, { oldPath, newPath, newName, newFilename, collectionPathname }) => {
     const tempDir = path.join(os.tmpdir(), `temp-folder-${Date.now()}`);
     const isWindowsOSAndNotWSLPathAndItemHasSubDirectories = isDirectory(oldPath) && isWindowsOS() && !isWSLPath(oldPath) && hasSubDirectories(oldPath);
     try {
@@ -516,29 +669,31 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         throw new Error(`path: ${newPath} already exists`);
       }
 
+      const format = getCollectionFormat(collectionPathname);
+
       if (isDirectory(oldPath)) {
-        const folderBruFilePath = path.join(oldPath, 'folder.bru');
-        let folderBruFileJsonContent;
-        if (fs.existsSync(folderBruFilePath)) {
-          const oldFolderBruFileContent = await fs.promises.readFile(folderBruFilePath, 'utf8');
-          folderBruFileJsonContent = await parseFolder(oldFolderBruFileContent);
-          folderBruFileJsonContent.meta.name = newName;
+        const folderFilePath = path.join(oldPath, `folder.${format}`);
+        let folderFileJsonContent;
+        if (fs.existsSync(folderFilePath)) {
+          const oldFolderFileContent = await fs.promises.readFile(folderFilePath, 'utf8');
+          folderFileJsonContent = await parseFolder(oldFolderFileContent, { format });
+          folderFileJsonContent.meta.name = newName;
         } else {
-          folderBruFileJsonContent = {
+          folderFileJsonContent = {
             meta: {
               name: newName
             }
           };
         }
 
-        const folderBruFileContent = await stringifyFolder(folderBruFileJsonContent);
-        await writeFile(folderBruFilePath, folderBruFileContent);
+        const folderFileContent = await stringifyFolder(folderFileJsonContent, { format });
+        await writeFile(folderFilePath, folderFileContent);
         
-        const bruFilesAtSource = await searchForBruFiles(oldPath);
+        const requestFilesAtSource = await searchForRequestFiles(oldPath, collectionPathname);
 
-        for (let bruFile of bruFilesAtSource) {
-          const newBruFilePath = bruFile.replace(oldPath, newPath);
-          moveRequestUid(bruFile, newBruFilePath);
+        for (let requestFile of requestFilesAtSource) {
+          const newRequestFilePath = requestFile.replace(oldPath, newPath);
+          moveRequestUid(requestFile, newRequestFilePath);
         }
 
         /**
@@ -562,8 +717,8 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         return newPath;
       }
 
-      if (!hasBruExtension(oldPath)) {
-        throw new Error(`path: ${oldPath} is not a bru file`);
+      if (!hasRequestExtension(oldPath, format)) {
+        throw new Error(`path: ${oldPath} is not a valid request file`);
       }
 
       if (!validateName(newFilename)) {
@@ -572,11 +727,11 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
       // update name in file and save new copy, then delete old copy
       const data = await fs.promises.readFile(oldPath, 'utf8'); // Use async read
-      const jsonData = parseRequest(data);
+      const jsonData = parseRequest(data, { format });
       jsonData.name = newName;
       moveRequestUid(oldPath, newPath);
 
-      const content = stringifyRequest(jsonData);
+      const content = stringifyRequest(jsonData, { format });
       await fs.promises.unlink(oldPath);
       await writeFile(newPath, content);
 
@@ -600,15 +755,15 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
   });
 
   // new folder
-  ipcMain.handle('renderer:new-folder', async (event, { pathname, folderBruJsonData }) => {
+  ipcMain.handle('renderer:new-folder', async (event, { pathname, folderData, format }) => {
     const resolvedFolderName = sanitizeName(path.basename(pathname));
     pathname = path.join(path.dirname(pathname), resolvedFolderName);
     try {
       if (!fs.existsSync(pathname)) {
         fs.mkdirSync(pathname);
-        const folderBruFilePath = path.join(pathname, 'folder.bru');
-        const content = await stringifyFolder(folderBruJsonData);
-        await writeFile(folderBruFilePath, content);
+        const folderFilePath = path.join(pathname, `folder.${format}`);
+        const content = await stringifyFolder(folderData, { format });
+        await writeFile(folderFilePath, content);
       } else {
         return Promise.reject(new Error('The directory already exists'));
       }
@@ -626,9 +781,9 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         }
 
         // delete the request uid mappings
-        const bruFilesAtSource = await searchForBruFiles(pathname);
-        for (let bruFile of bruFilesAtSource) {
-          deleteRequestUid(bruFile);
+        const requestFilesAtSource = await searchForRequestFiles(pathname);
+        for (let requestFile of requestFilesAtSource) {
+          deleteRequestUid(requestFile);
         }
 
         fs.rmSync(pathname, { recursive: true, force: true });
@@ -672,7 +827,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     lastOpenedCollections.update(collectionPaths);
   })
 
-  ipcMain.handle('renderer:import-collection', async (event, collection, collectionLocation) => {
+  ipcMain.handle('renderer:import-collection', async (event, collection, collectionLocation, format = 'bru') => {
     try {
       let collectionName = sanitizeName(collection.name);
       let collectionPath = path.join(collectionLocation, collectionName);
@@ -685,8 +840,8 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
       const parseCollectionItems = (items = [], currentPath) => {
         items.forEach(async (item) => {
           if (['http-request', 'graphql-request', 'grpc-request', 'ws-request'].includes(item.type)) {
-            let sanitizedFilename = sanitizeName(item?.filename || `${item.name}.bru`);
-            const content = await stringifyRequestViaWorker(item);
+            let sanitizedFilename = sanitizeName(item?.filename || `${item.name}.${format}`);
+            const content = await stringifyRequestViaWorker(item, { format });
             const filePath = path.join(currentPath, sanitizedFilename);
             safeWriteFileSync(filePath, content);
           }
@@ -696,10 +851,10 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
             fs.mkdirSync(folderPath);
 
             if (item?.root?.meta?.name) {
-              const folderBruFilePath = path.join(folderPath, 'folder.bru');
+              const folderFilePath = path.join(folderPath, `folder.${format}`);
               item.root.meta.seq = item.seq;
-              const folderContent = await stringifyFolder(item.root);
-              safeWriteFileSync(folderBruFilePath, folderContent);
+              const folderContent = await stringifyFolder(item.root, { format });
+              safeWriteFileSync(folderFilePath, folderContent);
             }
 
             if (item.items && item.items.length) {
@@ -722,8 +877,8 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         }
 
         environments.forEach(async (env) => {
-          const content = await stringifyEnvironment(env);
-          let sanitizedEnvFilename = sanitizeName(`${env.name}.bru`);
+          const content = await stringifyEnvironment(env, { format });
+          let sanitizedEnvFilename = sanitizeName(`${env.name}.${format}`);
           const filePath = path.join(envDirPath, sanitizedEnvFilename);
           safeWriteFileSync(filePath, content);
         });
@@ -748,13 +903,19 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
       const uid = generateUidBasedOnHash(collectionPath);
       let brunoConfig = getBrunoJsonConfig(collection);
-      const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
 
-      // Write the Bruno configuration to a file
-      await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
+      if (format === 'yml') {
+        const collectionContent = await stringifyCollection(collection.root, brunoConfig, { format });
+        await writeFile(path.join(collectionPath, 'opencollection.yml'), collectionContent);
+      } else if (format === 'bru') {
+        const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
+        await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
 
-      const collectionContent = await stringifyCollection(collection.root);
-      await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
+        const collectionContent = await stringifyCollection(collection.root, brunoConfig, { format });
+        await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
+      } else {
+        throw new Error(`Invalid format: ${format}`);
+      }
 
       const { size, filesCount } = await getCollectionStats(collectionPath);
       brunoConfig.size = size;
@@ -773,17 +934,19 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
-  ipcMain.handle('renderer:clone-folder', async (event, itemFolder, collectionPath) => {
+  ipcMain.handle('renderer:clone-folder', async (event, itemFolder, collectionPath, collectionPathname) => {
     try {
       if (fs.existsSync(collectionPath)) {
         throw new Error(`folder: ${collectionPath} already exists`);
       }
 
+      const format = getCollectionFormat(collectionPathname);
+
       // Recursive function to parse the folder and create files/folders
       const parseCollectionItems = (items = [], currentPath) => {
         items.forEach(async (item) => {
           if (['http-request', 'graphql-request', 'grpc-request'].includes(item.type)) {
-            const content = await stringifyRequestViaWorker(item);            
+            const content = await stringifyRequestViaWorker(item, { format });
             const filePath = path.join(currentPath, item.filename);
             safeWriteFileSync(filePath, content);
           }
@@ -791,13 +954,13 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
             const folderPath = path.join(currentPath, item.filename);
             fs.mkdirSync(folderPath);
 
-            // If folder has a root element, then I should write its folder.bru file
+            // If folder has a root element, then I should write its folder file
             if (item.root) {
-              const folderContent = await stringifyFolder(item.root);
+              const folderContent = await stringifyFolder(item.root, { format });
               folderContent.name = item.name;
               if (folderContent) {
-                const bruFolderPath = path.join(folderPath, `folder.bru`);
-                safeWriteFileSync(bruFolderPath, folderContent);
+                const folderFilePath = path.join(folderPath, `folder.${format}`);
+                safeWriteFileSync(folderFilePath, folderContent);
               }
             }
 
@@ -810,12 +973,12 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
       await createDirectory(collectionPath);
 
-      // If initial folder has a root element, then I should write its folder.bru file
+      // If initial folder has a root element, then I should write its folder file
       if (itemFolder.root) {
-        const folderContent = await stringifyFolder(itemFolder.root);
+        const folderContent = await stringifyFolder(itemFolder.root, { format });
         if (folderContent) {
-          const bruFolderPath = path.join(collectionPath, `folder.bru`);
-          safeWriteFileSync(bruFolderPath, folderContent);
+          const folderFilePath = path.join(collectionPath, `folder.${format}`);
+          safeWriteFileSync(folderFilePath, folderContent);
         }
       }
 
@@ -826,37 +989,39 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
-  ipcMain.handle('renderer:resequence-items', async (event, itemsToResequence) => {
+  ipcMain.handle('renderer:resequence-items', async (event, itemsToResequence, collectionPathname) => {
     try {
+      const format = getCollectionFormat(collectionPathname);
+
       for (let item of itemsToResequence) {
         if (item?.type === 'folder') {
-          const folderRootPath = path.join(item.pathname, 'folder.bru');
-          let folderBruJsonData = {
+          const folderRootPath = path.join(item.pathname, `folder.${format}`);
+          let folderJsonData = {
             meta: {
               name: path.basename(item.pathname),
               seq: item.seq
             }
           };
           if (fs.existsSync(folderRootPath)) {
-            const bru = fs.readFileSync(folderRootPath, 'utf8');
-            folderBruJsonData = await parseCollection(bru);
-            if (!folderBruJsonData?.meta) {
-              folderBruJsonData.meta = {
+            const folderContent = fs.readFileSync(folderRootPath, 'utf8');
+            folderJsonData = await parseFolder(folderContent, { format });
+            if (!folderJsonData?.meta) {
+              folderJsonData.meta = {
                 name: path.basename(item.pathname),
                 seq: item.seq
               };
             }
-            if (folderBruJsonData?.meta?.seq === item.seq) {
+            if (folderJsonData?.meta?.seq === item.seq) {
               continue;
             }
-            folderBruJsonData.meta.seq = item.seq;
+            folderJsonData.meta.seq = item.seq;
           }
-          const content = await stringifyFolder(folderBruJsonData);
+          const content = await stringifyFolder(folderJsonData, { format });
           await writeFile(folderRootPath, content);
         } else {
           if (fs.existsSync(item.pathname)) {
             const itemToSave = transformRequestToSaveToFilesystem(item);
-            const content = await stringifyRequestViaWorker(itemToSave);
+            const content = await stringifyRequestViaWorker(itemToSave, { format });
             await writeFile(item.pathname, content);
           }
         }
@@ -913,11 +1078,11 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         throw new Error(`folder: ${newFolderPath} already exists`);
       }
 
-      const bruFilesAtSource = await searchForBruFiles(folderPath);
+      const requestFilesAtSource = await searchForRequestFiles(folderPath);
 
-      for (let bruFile of bruFilesAtSource) {
-        const newBruFilePath = bruFile.replace(folderPath, newFolderPath);
-        moveRequestUid(bruFile, newBruFilePath);
+      for (let requestFile of requestFilesAtSource) {
+        const newRequestFilePath = requestFile.replace(folderPath, newFolderPath);
+        moveRequestUid(requestFile, newRequestFilePath);
       }
 
       fs.renameSync(folderPath, newFolderPath);
@@ -926,12 +1091,21 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     }
   });
 
-  ipcMain.handle('renderer:update-bruno-config', async (event, brunoConfig, collectionPath, collectionUid) => {
+  ipcMain.handle('renderer:update-bruno-config', async (event, brunoConfig, collectionPath, collectionRoot) => {
     try {
       const transformedBrunoConfig = transformBrunoConfigBeforeSave(brunoConfig);
-      const brunoConfigPath = path.join(collectionPath, 'bruno.json');
-      const content = await stringifyJson(transformedBrunoConfig);
-      await writeFile(brunoConfigPath, content);
+      const format = getCollectionFormat(collectionPath);
+
+      if (format === 'bru') {
+        const brunoConfigPath = path.join(collectionPath, 'bruno.json');
+        const content = await stringifyJson(transformedBrunoConfig);
+        await writeFile(brunoConfigPath, content);
+      } else if (format === 'yml') {
+        const content = await stringifyCollection(collectionRoot, transformedBrunoConfig, { format });
+        await writeFile(path.join(collectionPath, 'opencollection.yml'), content);
+      } else {
+        throw new Error(`Invalid collection format: ${format}`);
+      }
     } catch (error) {
       return Promise.reject(error);
     }
@@ -1219,7 +1393,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
     let fileStats;
     try {
       fileStats = fs.statSync(pathname);
-      if (hasBruExtension(pathname)) {
+      if (hasRequestExtension(pathname)) {
         const file = {
           meta: {
             collectionUid,
@@ -1243,7 +1417,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
         mainWindow.webContents.send('main:collection-tree-updated', 'addFile', file);
       }
     } catch (error) {
-      if (hasBruExtension(pathname)) {
+      if (hasRequestExtension(pathname)) {
         const file = {
           meta: {
             collectionUid,
diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js
index 685680f93..e05126315 100644
--- a/packages/bruno-electron/src/ipc/network/index.js
+++ b/packages/bruno-electron/src/ipc/network/index.js
@@ -22,7 +22,7 @@ const { makeAxiosInstance } = require('./axios-instance');
 const { resolveInheritedSettings } = require('../../utils/collection');
 const { cancelTokens, saveCancelToken, deleteCancelToken } = require('../../utils/cancel-token');
 const { uuid, safeStringifyJSON, safeParseJSON, parseDataFromResponse, parseDataFromRequest } = require('../../utils/common');
-const { chooseFileToSave, writeBinaryFile, writeFile } = require('../../utils/filesystem');
+const { chooseFileToSave, writeFile, getCollectionFormat, hasRequestExtension } = require('../../utils/filesystem');
 const { addCookieToJar, getDomainsWithCookies, getCookieStringForUrl } = require('../../utils/cookies');
 const { createFormData } = require('../../utils/form-data');
 const { findItemInCollectionByPathname, sortFolder, getAllRequestsInFolderRecursively, getEnvVars, getTreePathFromCollectionToItem, mergeVars, sortByNameThenSequence } = require('../../utils/collection');
@@ -605,9 +605,10 @@ const registerNetworkIpc = (mainWindow) => {
 
     const runRequestByItemPathname = async (relativeItemPathname) => {
       return new Promise(async (resolve, reject) => {
-        let itemPathname = path.join(collection?.pathname, relativeItemPathname);
-        if (itemPathname && !itemPathname?.endsWith('.bru')) {
-          itemPathname = `${itemPathname}.bru`;
+        const format = getCollectionFormat(collection.pathname);
+        let itemPathname = path.join(collection.pathname, relativeItemPathname);
+        if (itemPathname && !hasRequestExtension(itemPathname, format)) {
+          itemPathname = `${itemPathname}.${format}`;
         }
         const _item = cloneDeep(findItemInCollectionByPathname(collection, itemPathname));
         if(_item) {
@@ -1093,9 +1094,10 @@ const registerNetworkIpc = (mainWindow) => {
 
       const runRequestByItemPathname = async (relativeItemPathname) => {
         return new Promise(async (resolve, reject) => {
-          let itemPathname = path.join(collection?.pathname, relativeItemPathname);
-          if (itemPathname && !itemPathname?.endsWith('.bru')) {
-            itemPathname = `${itemPathname}.bru`;
+          const format = getCollectionFormat(collection.pathname);
+          let itemPathname = path.join(collection.pathname, relativeItemPathname);
+          if (itemPathname && !hasRequestExtension(itemPathname, format)) {
+            itemPathname = `${itemPathname}.${format}`;
           }
           const _item = cloneDeep(findItemInCollectionByPathname(collection, itemPathname));
           if(_item) {
diff --git a/packages/bruno-electron/src/store/preferences.js b/packages/bruno-electron/src/store/preferences.js
index f904b957c..c05c26f2b 100644
--- a/packages/bruno-electron/src/store/preferences.js
+++ b/packages/bruno-electron/src/store/preferences.js
@@ -49,6 +49,10 @@ const defaultPreferences = {
   },
   general: {
     defaultCollectionLocation: ''
+  },
+  autoSave: {
+    enabled: false,
+    interval: 1000
   }
 };
 
@@ -93,6 +97,10 @@ const preferencesSchema = Yup.object().shape({
   }),
   general: Yup.object({
     defaultCollectionLocation: Yup.string().max(1024).nullable()
+  }),
+  autoSave: Yup.object({
+    enabled: Yup.boolean(),
+    interval: Yup.number().min(100)
   })
 });
 
diff --git a/packages/bruno-electron/src/utils/collection-import.js b/packages/bruno-electron/src/utils/collection-import.js
index 4207a5d23..069085452 100644
--- a/packages/bruno-electron/src/utils/collection-import.js
+++ b/packages/bruno-electron/src/utils/collection-import.js
@@ -22,7 +22,7 @@ async function findUniqueFolderName(baseName, collectionLocation, counter = 0) {
 /**
  * Import a collection - shared logic used by both IPC handler and onboarding service
  */
-async function importCollection(collection, collectionLocation, mainWindow, lastOpenedCollections, uniqueFolderName = null) {
+async function importCollection(collection, collectionLocation, mainWindow, lastOpenedCollections, uniqueFolderName = null, format = 'bru') {
   // Use provided unique folder name or use collection name
   let folderName = uniqueFolderName ? sanitizeName(uniqueFolderName) : sanitizeName(collection.name);
   let collectionPath = path.join(collectionLocation, folderName);
@@ -35,8 +35,8 @@ async function importCollection(collection, collectionLocation, mainWindow, last
   const parseCollectionItems = async (items = [], currentPath) => {
     for (const item of items) {
       if (['http-request', 'graphql-request', 'grpc-request'].includes(item.type)) {
-        let sanitizedFilename = sanitizeName(item.filename || `${item.name}.bru`);
-        const content = await stringifyRequestViaWorker(item);
+        let sanitizedFilename = sanitizeName(item.filename || `${item.name}.${format}`);
+        const content = await stringifyRequestViaWorker(item, { format });
         const filePath = path.join(currentPath, sanitizedFilename);
         safeWriteFileSync(filePath, content);
       }
@@ -46,10 +46,10 @@ async function importCollection(collection, collectionLocation, mainWindow, last
         fs.mkdirSync(folderPath);
 
         if (item.root?.meta?.name) {
-          const folderBruFilePath = path.join(folderPath, 'folder.bru');
+          const folderFilePath = path.join(folderPath, `folder.${format}`);
           item.root.meta.seq = item.seq;
-          const folderContent = await stringifyFolder(item.root);
-          safeWriteFileSync(folderBruFilePath, folderContent);
+          const folderContent = await stringifyFolder(item.root, { format });
+          safeWriteFileSync(folderFilePath, folderContent);
         }
 
         if (item.items && item.items.length) {
@@ -72,8 +72,8 @@ async function importCollection(collection, collectionLocation, mainWindow, last
     }
 
     for (const env of environments) {
-      const content = await stringifyEnvironment(env);
-      let sanitizedEnvFilename = sanitizeName(`${env.name}.bru`);
+      const content = await stringifyEnvironment(env, { format });
+      let sanitizedEnvFilename = sanitizeName(`${env.name}.${format}`);
       const filePath = path.join(envDirPath, sanitizedEnvFilename);
       safeWriteFileSync(filePath, content);
     }
@@ -98,13 +98,19 @@ async function importCollection(collection, collectionLocation, mainWindow, last
 
   const uid = generateUidBasedOnHash(collectionPath);
   let brunoConfig = getBrunoJsonConfig(collection);
-  const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
 
-  // Write the Bruno configuration to a file
-  await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
+  if (format === 'yml') {
+    const collectionContent = await stringifyCollection(collection.root, brunoConfig, { format });
+    await writeFile(path.join(collectionPath, 'opencollection.yml'), collectionContent);
+  } else if (format === 'bru') {
+    const stringifiedBrunoConfig = await stringifyJson(brunoConfig);
+    await writeFile(path.join(collectionPath, 'bruno.json'), stringifiedBrunoConfig);
 
-  const collectionContent = await stringifyCollection(collection.root);
-  await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
+    const collectionContent = await stringifyCollection(collection.root, brunoConfig, { format });
+    await writeFile(path.join(collectionPath, 'collection.bru'), collectionContent);
+  } else {
+    throw new Error(`Invalid format: ${format}`);
+  }
 
   const { size, filesCount } = await getCollectionStats(collectionPath);
   brunoConfig.size = size;
diff --git a/packages/bruno-electron/src/utils/collection.js b/packages/bruno-electron/src/utils/collection.js
index d60e55bd5..02f7c3f9f 100644
--- a/packages/bruno-electron/src/utils/collection.js
+++ b/packages/bruno-electron/src/utils/collection.js
@@ -288,6 +288,67 @@ const parseBruFileMeta = (data) => {
   }
 }
 
+// Parse YML file meta information
+const parseYmlFileMeta = (data) => {
+  try {
+    const yaml = require('js-yaml');
+    const parsed = yaml.load(data);
+
+    if (!parsed || !parsed.meta) {
+      console.log('No "meta" section found in YAML file.');
+      return null;
+    }
+
+    const metaJson = parsed.meta;
+
+    // Transform to the format expected by bruno-app
+    let requestType = metaJson.type;
+    const typeMap = {
+      http: 'http-request',
+      graphql: 'graphql-request',
+      grpc: 'grpc-request',
+      ws: 'ws-request'
+    };
+    requestType = typeMap[requestType] || 'http-request';
+
+    const sequence = metaJson.seq;
+    const transformedJson = {
+      type: requestType,
+      name: metaJson.name,
+      seq: !isNaN(sequence) ? Number(sequence) : 1,
+      settings: {},
+      tags: metaJson.tags || [],
+      request: {
+        method: '',
+        url: '',
+        params: [],
+        headers: [],
+        auth: { mode: 'none' },
+        body: { mode: 'none' },
+        script: {},
+        vars: {},
+        assertions: [],
+        tests: '',
+        docs: ''
+      }
+    };
+
+    return transformedJson;
+  } catch (err) {
+    console.error('Error parsing YAML file meta:', err);
+    return null;
+  }
+};
+
+// Format-aware meta parsing function
+const parseFileMeta = (data, format = 'bru') => {
+  if (format === 'yml') {
+    return parseYmlFileMeta(data);
+  } else {
+    return parseBruFileMeta(data);
+  }
+};
+
 const hydrateRequestWithUuid = (request, pathname) => {
   request.uid = getRequestUid(pathname);
 
@@ -631,6 +692,7 @@ module.exports = {
   findParentItemInCollection,
   findParentItemInCollectionByPathname,
   parseBruFileMeta,
+  parseFileMeta,
   hydrateRequestWithUuid,
   transformRequestToSaveToFilesystem,
   sortCollection,
diff --git a/packages/bruno-electron/src/utils/filesystem.js b/packages/bruno-electron/src/utils/filesystem.js
index 65ea4a106..0f105a828 100644
--- a/packages/bruno-electron/src/utils/filesystem.js
+++ b/packages/bruno-electron/src/utils/filesystem.js
@@ -96,6 +96,17 @@ const hasBruExtension = (filename) => {
   return ['bru'].some((ext) => filename.toLowerCase().endsWith(`.${ext}`));
 };
 
+const hasRequestExtension = (filename, format = null) => {
+  if (!filename || typeof filename !== 'string') return false;
+
+  if (format) {
+    const ext = format === 'yml' ? 'yml' : 'bru';
+    return filename.toLowerCase().endsWith(`.${ext}`);
+  }
+
+  return ['bru', 'yml'].some((ext) => filename.toLowerCase().endsWith(`.${ext}`));
+};
+
 const createDirectory = async (dir) => {
   if (!dir) {
     throw new Error(`directory: path is null`);
@@ -157,8 +168,16 @@ const searchForFiles = (dir, extension) => {
   return results;
 };
 
-const searchForBruFiles = (dir) => {
-  return searchForFiles(dir, '.bru');
+// Search for request files based on collection filetype by reading config
+const searchForRequestFiles = (dir, collectionPath = null) => {
+  const format = getCollectionFormat(collectionPath || dir);
+  if (format === 'yml') {
+    return searchForFiles(dir, '.yml');
+  } else if (format === 'bru') {
+    return searchForFiles(dir, '.bru');
+  } else {
+    throw new Error(`Invalid format: ${format}`);
+  }
 };
 
 const sanitizeName = (name) => {
@@ -196,6 +215,20 @@ const generateUniqueName = (baseName, checkExists) => {
   return uniqueName;
 };
 
+const getCollectionFormat = (collectionPath) => {
+  const ocYmlPath = path.join(collectionPath, 'opencollection.yml');
+  if (fs.existsSync(ocYmlPath)) {
+    return 'yml';
+  }
+
+  const brunoJsonPath = path.join(collectionPath, 'bruno.json');
+  if (fs.existsSync(brunoJsonPath)) {
+    return 'bru';
+  }
+
+  throw new Error(`No collection configuration found at: ${collectionPath}`);
+};
+
 const validateName = (name) => {
     const invalidCharacters = /[<>:"/\\|?*\x00-\x1F]/g; // keeping this for informational purpose
     const reservedDeviceNames = /^(CON|PRN|AUX|NUL|COM[0-9]|LPT[0-9])$/i;
@@ -297,7 +330,14 @@ const getSafePathToWrite = (filePath) => {
 
 async function safeWriteFile(filePath, data, options) {
   const safePath = getSafePathToWrite(filePath);
-  await fs.writeFile(safePath, data, options);
+
+  try {
+    const fsExtra = require('fs-extra');
+    fsExtra.outputFileSync(safePath, data, options);
+  } catch (err) {
+    console.error(`Error writing file at ${safePath}:`, err);
+    return Promise.reject(err);
+  }
 }
 
 function safeWriteFileSync(filePath, data) {
@@ -393,12 +433,13 @@ module.exports = {
   writeFile,
   hasJsonExtension,
   hasBruExtension,
+  hasRequestExtension,
   createDirectory,
   browseDirectory,
   browseFiles,
   chooseFileToSave,
   searchForFiles,
-  searchForBruFiles,
+  searchForRequestFiles,
   sanitizeName,
   isWindowsOS,
   safeToRename,
@@ -412,5 +453,6 @@ module.exports = {
   removePath,
   getPaths,
   isLargeFile,
-  generateUniqueName
+  generateUniqueName,
+  getCollectionFormat
 };
diff --git a/packages/bruno-filestore/package.json b/packages/bruno-filestore/package.json
index edf79b6f1..0b7078d46 100644
--- a/packages/bruno-filestore/package.json
+++ b/packages/bruno-filestore/package.json
@@ -13,7 +13,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "prebuild": "npm run clean",
-    "build": "rollup -c",
+    "build": "rollup -c && tsc --emitDeclarationOnly",
     "watch": "rollup -c -w",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -22,14 +22,18 @@
   "devDependencies": {
     "@babel/preset-env": "^7.22.0",
     "@babel/preset-typescript": "^7.22.0",
+    "@opencollection/types": "0.1.0",
+    "@usebruno/schema-types": "0.0.1",
     "@rollup/plugin-commonjs": "^23.0.2",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
-    "@rollup/plugin-typescript": "^9.0.2",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.191",
     "@types/node": "^24.1.0",
     "babel-jest": "^29.7.0",
     "jest": "^29.2.0",
+    "nanoid": "3.3.8",
     "rimraf": "^3.0.2",
     "rollup": "3.29.5",
     "rollup-plugin-dts": "^5.0.0",
@@ -41,7 +45,10 @@
     "rollup": "3.29.5"
   },
   "dependencies": {
+    "@types/nanoid": "^2.1.0",
     "@usebruno/lang": "0.12.0",
-    "lodash": "^4.17.21"
+    "ajv": "^8.17.1",
+    "lodash": "^4.17.21",
+    "yaml": "^2.3.4"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/bruno-filestore/rollup.config.js b/packages/bruno-filestore/rollup.config.js
index e272dc015..054ea3fbc 100644
--- a/packages/bruno-filestore/rollup.config.js
+++ b/packages/bruno-filestore/rollup.config.js
@@ -1,12 +1,43 @@
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
 const commonjs = require('@rollup/plugin-commonjs');
 const typescript = require('@rollup/plugin-typescript');
-const dts = require('rollup-plugin-dts');
+const json = require('@rollup/plugin-json');
 const { terser } = require('rollup-plugin-terser');
 const peerDepsExternal = require('rollup-plugin-peer-deps-external');
 
 const packageJson = require('./package.json');
 
+const externalDeps = [
+  '@usebruno/lang',
+  '@usebruno/schema-types',
+  /@usebruno\/schema-types\/.*/,
+  '@opencollection/types',
+  /@opencollection\/types\/.*/,
+  // Runtime dependencies
+  'lodash',
+  'yaml',
+  'ajv',
+  // Node built-ins
+  'worker_threads',
+  'path',
+  'fs'
+];
+
+const commonPlugins = [
+  peerDepsExternal(),
+  nodeResolve({
+    extensions: ['.js', '.ts', '.tsx', '.json']
+  }),
+  json(),
+  commonjs(),
+  typescript({
+    tsconfig: './tsconfig.json',
+    declaration: false,
+    declarationMap: false
+  }),
+  terser()
+];
+
 module.exports = [
   {
     input: 'src/index.ts',
@@ -24,16 +55,8 @@ module.exports = [
         exports: 'named'
       }
     ],
-    plugins: [
-      peerDepsExternal(),
-      nodeResolve({
-        extensions: ['.js', '.ts', '.tsx', '.json', '.css']
-      }),
-      commonjs(),
-      typescript({ tsconfig: './tsconfig.json' }),
-      terser(),
-    ],
-    external: ['@usebruno/lang', 'lodash', 'worker_threads', 'path']
+    plugins: commonPlugins,
+    external: externalDeps
   },
   {
     input: 'src/workers/worker-script.ts',
@@ -49,15 +72,7 @@ module.exports = [
         sourcemap: true
       }
     ],
-    plugins: [
-      peerDepsExternal(),
-      nodeResolve({
-        extensions: ['.js', '.ts', '.tsx', '.json', '.css']
-      }),
-      commonjs(),
-      typescript({ tsconfig: './tsconfig.json' }),
-      terser(),
-    ],
-    external: ['@usebruno/lang', 'lodash', 'worker_threads', 'path']
+    plugins: commonPlugins,
+    external: externalDeps
   }
-]; 
\ No newline at end of file
+];
diff --git a/packages/bruno-filestore/src/formats/bru/index.ts b/packages/bruno-filestore/src/formats/bru/index.ts
index 3d3fe02ba..0078428b4 100644
--- a/packages/bruno-filestore/src/formats/bru/index.ts
+++ b/packages/bruno-filestore/src/formats/bru/index.ts
@@ -9,7 +9,7 @@ import {
 } from '@usebruno/lang';
 import { getOauth2AdditionalParameters } from './utils/oauth2-additional-params';
 
-export const bruRequestToJson = (data: string | any, parsed: boolean = false): any => {
+export const parseBruRequest = (data: string | any, parsed: boolean = false): any => {
   try {
     const json = parsed ? data : bruToJsonV2(data);
 
@@ -109,12 +109,12 @@ export const bruRequestToJson = (data: string | any, parsed: boolean = false): a
     }
     return transformedJson;
   } catch (error) {
-    console.log('bruRequestToJson error', error);
+    console.log('parseBruRequest error', error);
     throw error;
   }
 };
 
-export const jsonRequestToBru = (json: any): string => {
+export const stringifyBruRequest = (json: any): string => {
   try {
     let type = _.get(json, 'type');
     switch (type) {
@@ -227,7 +227,7 @@ export const jsonRequestToBru = (json: any): string => {
   }
 };
 
-export const bruCollectionToJson = (data: string | any, parsed: boolean = false): any => {
+export const parseBruCollection = (data: string | any, parsed: boolean = false): any => {
   try {
     const json = parsed ? data : _collectionBruToJson(data);
 
@@ -273,7 +273,7 @@ export const bruCollectionToJson = (data: string | any, parsed: boolean = false)
   }
 };
 
-export const jsonCollectionToBru = (json: any, isFolder?: boolean): string => {
+export const stringifyBruCollection = (json: any, isFolder?: boolean): string => {
   try {
     const collectionBruJson: any = {
       headers: _.get(json, 'request.headers', []),
@@ -314,7 +314,7 @@ export const jsonCollectionToBru = (json: any, isFolder?: boolean): string => {
   }
 };
 
-export const bruEnvironmentToJson = (bru: string): any => {
+export const parseBruEnvironment = (bru: string): any => {
   try {
     const json = bruToEnvJsonV2(bru);
 
@@ -331,7 +331,7 @@ export const bruEnvironmentToJson = (bru: string): any => {
   }
 };
 
-export const jsonEnvironmentToBru = (json: any): string => {
+export const stringifyBruEnvironment = (json: any): string => {
   try {
     const bru = envJsonToBruV2(json);
     return bru;
diff --git a/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js b/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js
index 707c6127c..51039f1aa 100644
--- a/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js
+++ b/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js
@@ -1,5 +1,5 @@
 const { getOauth2AdditionalParameters } = require('../utils/oauth2-additional-params');
-const { bruRequestToJson, bruCollectionToJson } = require('../index');
+const { parseBruRequest, parseBruCollection } = require('../index');
 const { getBruJsonWithAdditionalParams } = require('./fixtures/oauth2-additional-params');
 
 describe('getOauth2AdditionalParameters', () => {
diff --git a/packages/bruno-filestore/src/formats/yml/common/assertions.ts b/packages/bruno-filestore/src/formats/yml/common/assertions.ts
new file mode 100644
index 000000000..03c243903
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/assertions.ts
@@ -0,0 +1,146 @@
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import type { Assertion } from '@opencollection/types/common/assertions';
+import { uuid } from '../../../utils';
+
+const OPERATORS = [
+  'eq',
+  'neq',
+  'gt',
+  'gte',
+  'lt',
+  'lte',
+  'in',
+  'notIn',
+  'contains',
+  'notContains',
+  'length',
+  'matches',
+  'notMatches',
+  'startsWith',
+  'endsWith',
+  'between',
+  'isEmpty',
+  'isNotEmpty',
+  'isNull',
+  'isUndefined',
+  'isDefined',
+  'isTruthy',
+  'isFalsy',
+  'isJson',
+  'isNumber',
+  'isString',
+  'isBoolean',
+  'isArray'
+] as const;
+
+const UNARY_OPERATORS = [
+  'isEmpty',
+  'isNotEmpty',
+  'isNull',
+  'isUndefined',
+  'isDefined',
+  'isTruthy',
+  'isFalsy',
+  'isJson',
+  'isNumber',
+  'isString',
+  'isBoolean',
+  'isArray'
+] as const;
+
+type Operator = typeof OPERATORS[number];
+
+const parseAssertionOperator = (str: string = ''): { operator: Operator; value: string | undefined } => {
+  if (!str || typeof str !== 'string' || !str.length) {
+    return {
+      operator: 'eq',
+      value: str
+    };
+  }
+
+  const [firstWord, ...rest] = str.trim().split(' ');
+  const remainingValue = rest.join(' ');
+
+  // Check if first word is a unary operator
+  if (UNARY_OPERATORS.includes(firstWord as any)) {
+    return {
+      operator: firstWord as Operator,
+      value: undefined
+    };
+  }
+
+  // Check if first word is any recognized operator
+  if (OPERATORS.includes(firstWord as any)) {
+    return {
+      operator: firstWord as Operator,
+      value: remainingValue
+    };
+  }
+
+  // If not a recognized operator, treat the whole string as value with 'eq' operator
+  return {
+    operator: 'eq',
+    value: str
+  };
+};
+
+export const toOpenCollectionAssertions = (assertions: BrunoKeyValue[] | null | undefined): Assertion[] | undefined => {
+  if (!assertions?.length) {
+    return undefined;
+  }
+
+  const ocAssertions: Assertion[] = assertions.map((assertion: BrunoKeyValue): Assertion => {
+    const { operator, value } = parseAssertionOperator(assertion.value || '');
+
+    const ocAssertion: Assertion = {
+      expression: assertion.name || '',
+      operator,
+      ...(value !== undefined && { value })
+    };
+
+    if (assertion?.description?.trim().length) {
+      ocAssertion.description = assertion.description;
+    }
+
+    if (assertion.enabled === false) {
+      ocAssertion.disabled = true;
+    }
+
+    return ocAssertion;
+  });
+
+  return ocAssertions.length > 0 ? ocAssertions : undefined;
+};
+
+export const toBrunoAssertions = (assertions: Assertion[] | null | undefined): BrunoKeyValue[] | undefined => {
+  if (!assertions?.length) {
+    return undefined;
+  }
+
+  const brunoAssertions: BrunoKeyValue[] = assertions.map((assertion: Assertion): BrunoKeyValue => {
+    // Reconstruct the "operator value" format that Bruno uses
+    let valueString = assertion.operator;
+    if (assertion.value !== undefined && assertion.value !== null) {
+      valueString = `${assertion.operator} ${assertion.value}`;
+    }
+
+    const brunoAssertion: BrunoKeyValue = {
+      uid: uuid(),
+      name: assertion.expression || '',
+      value: valueString,
+      enabled: assertion.disabled !== true
+    };
+
+    if (assertion.description) {
+      if (typeof assertion.description === 'string' && assertion.description.trim().length) {
+        brunoAssertion.description = assertion.description;
+      } else if (typeof assertion.description === 'object' && assertion.description.content?.trim().length) {
+        brunoAssertion.description = assertion.description.content;
+      }
+    }
+
+    return brunoAssertion;
+  });
+
+  return brunoAssertions.length > 0 ? brunoAssertions : undefined;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/auth-oauth2.ts b/packages/bruno-filestore/src/formats/yml/common/auth-oauth2.ts
new file mode 100644
index 000000000..5e52918cd
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/auth-oauth2.ts
@@ -0,0 +1,553 @@
+import type {
+  AuthOAuth2,
+  OAuth2AdditionalParameter,
+  OAuth2AuthorizationCodeFlow,
+  OAuth2ClientCredentials,
+  OAuth2ClientCredentialsFlow,
+  OAuth2ImplicitFlow,
+  OAuth2PKCE,
+  OAuth2ResourceOwner,
+  OAuth2ResourceOwnerPasswordFlow,
+  OAuth2Settings,
+  OAuth2TokenConfig
+} from '@opencollection/types/common/auth';
+import type {
+  OAuth2 as BrunoOAuth2,
+  OAuthAdditionalParameter as BrunoOAuthAdditionalParameter
+} from '@usebruno/schema-types/common/auth';
+import { isString, isNonEmptyString } from '../../../utils';
+
+const normalizeBoolean = (value?: boolean | null): boolean | undefined =>
+  typeof value === 'boolean' ? value : undefined;
+
+const mapSendIn = (sendIn?: string | null): OAuth2AdditionalParameter['placement'] | undefined => {
+  if (!isString(sendIn)) {
+    return undefined;
+  }
+
+  switch (sendIn.trim().toLowerCase()) {
+    case 'headers':
+      return 'header';
+    case 'queryparams':
+      return 'query';
+    case 'body':
+      return 'body';
+    default:
+      return undefined;
+  }
+};
+
+const mapAdditionalParameters = (params?: BrunoOAuthAdditionalParameter[] | null): OAuth2AdditionalParameter[] | undefined => {
+  if (!Array.isArray(params) || params.length === 0) {
+    return undefined;
+  }
+
+  const mapped = params
+    .filter((param) => param && isNonEmptyString(param.name))
+    .map((param) => {
+      const placement = mapSendIn(param!.sendIn);
+      if (!placement) {
+        return undefined;
+      }
+
+      const mappedParam: OAuth2AdditionalParameter = {
+        name: param!.name!.trim(),
+        placement
+      };
+
+      isNonEmptyString(param!.value) && (mappedParam.value = param.value);
+
+      return mappedParam;
+    })
+    .filter((param): param is OAuth2AdditionalParameter => Boolean(param));
+
+  return mapped.length > 0 ? mapped : undefined;
+};
+
+const buildClientCredentials = (oauth: BrunoOAuth2): OAuth2ClientCredentials | undefined => {
+  const credentials: OAuth2ClientCredentials = {};
+
+  isNonEmptyString(oauth.clientId) && (credentials.clientId = oauth.clientId);
+  isNonEmptyString(oauth.clientSecret) && (credentials.clientSecret = oauth.clientSecret);
+  isNonEmptyString(oauth.credentialsPlacement) && (credentials.placement = oauth.credentialsPlacement);
+
+  return Object.keys(credentials).length > 0 ? credentials : undefined;
+};
+
+const buildResourceOwner = (oauth: BrunoOAuth2): OAuth2ResourceOwner | undefined => {
+  const resourceOwner: OAuth2ResourceOwner = {};
+
+  isNonEmptyString(oauth.username) && (resourceOwner.username = oauth.username);
+  isNonEmptyString(oauth.password) && (resourceOwner.password = oauth.password);
+
+  return Object.keys(resourceOwner).length > 0 ? resourceOwner : undefined;
+};
+
+const buildPkce = (pkce?: boolean | null): OAuth2PKCE | undefined => {
+  if (pkce === null || pkce === undefined) {
+    return undefined;
+  }
+
+  return { enabled: Boolean(pkce) };
+};
+
+const buildTokenConfig = (oauth: BrunoOAuth2): OAuth2TokenConfig | undefined => {
+  const tokenConfig: OAuth2TokenConfig = {};
+
+  isNonEmptyString(oauth.credentialsId) && (tokenConfig.id = oauth.credentialsId);
+
+  if (!isNonEmptyString(oauth.tokenPlacement)) {
+    // default to header
+    tokenConfig.placement = { header: '' };
+  }
+
+  if (oauth.tokenPlacement === 'header') {
+    tokenConfig.placement = {
+      header: oauth.tokenHeaderPrefix as string
+    };
+  }
+
+  if (oauth.tokenPlacement === 'url') {
+    tokenConfig.placement = {
+      query: oauth.tokenQueryKey as string
+    };
+  }
+
+  return Object.keys(tokenConfig).length > 0 ? tokenConfig : undefined;
+};
+
+const buildSettings = (oauth: BrunoOAuth2): OAuth2Settings | undefined => {
+  const autoFetchToken = normalizeBoolean(oauth.autoFetchToken);
+  const autoRefreshToken = normalizeBoolean(oauth.autoRefreshToken);
+
+  const settings: OAuth2Settings = {};
+  if (autoFetchToken !== undefined) settings.autoFetchToken = autoFetchToken;
+  if (autoRefreshToken !== undefined) settings.autoRefreshToken = autoRefreshToken;
+
+  return Object.keys(settings).length > 0 ? settings : undefined;
+};
+
+const buildClientCredentialsFlow = (oauth: BrunoOAuth2): OAuth2ClientCredentialsFlow => {
+  const flow: OAuth2ClientCredentialsFlow = {
+    type: 'oauth2',
+    flow: 'client_credentials'
+  };
+
+  isNonEmptyString(oauth.accessTokenUrl) && (flow.accessTokenUrl = oauth.accessTokenUrl);
+  isNonEmptyString(oauth.refreshTokenUrl) && (flow.refreshTokenUrl = oauth.refreshTokenUrl);
+
+  const credentials = buildClientCredentials(oauth);
+  if (credentials) flow.credentials = credentials;
+
+  isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
+
+  const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
+  if (accessTokenRequest) {
+    flow.additionalParameters = { accessTokenRequest };
+  }
+
+  const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
+  if (refreshTokenRequest) {
+    flow.additionalParameters = { refreshTokenRequest };
+  }
+
+  const tokenConfig = buildTokenConfig(oauth);
+  if (tokenConfig) flow.tokenConfig = tokenConfig;
+
+  const settings = buildSettings(oauth);
+  if (settings) flow.settings = settings;
+
+  return flow;
+};
+
+const buildResourceOwnerPasswordFlow = (oauth: BrunoOAuth2): OAuth2ResourceOwnerPasswordFlow => {
+  const flow: OAuth2ResourceOwnerPasswordFlow = {
+    type: 'oauth2',
+    flow: 'resource_owner_password'
+  };
+
+  isNonEmptyString(oauth.accessTokenUrl) && (flow.accessTokenUrl = oauth.accessTokenUrl);
+  isNonEmptyString(oauth.refreshTokenUrl) && (flow.refreshTokenUrl = oauth.refreshTokenUrl);
+
+  const credentials = buildClientCredentials(oauth);
+  if (credentials) flow.credentials = credentials;
+
+  const resourceOwner = buildResourceOwner(oauth);
+  if (resourceOwner) flow.resourceOwner = resourceOwner;
+
+  isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
+
+  const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
+  if (accessTokenRequest) {
+    flow.additionalParameters = { accessTokenRequest };
+  }
+
+  const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
+  if (refreshTokenRequest) {
+    flow.additionalParameters = { refreshTokenRequest };
+  }
+
+  const tokenConfig = buildTokenConfig(oauth);
+  if (tokenConfig) flow.tokenConfig = tokenConfig;
+
+  const settings = buildSettings(oauth);
+  if (settings) flow.settings = settings;
+
+  return flow;
+};
+
+const buildAuthorizationCodeFlow = (oauth: BrunoOAuth2): OAuth2AuthorizationCodeFlow => {
+  const flow: OAuth2AuthorizationCodeFlow = {
+    type: 'oauth2',
+    flow: 'authorization_code'
+  };
+
+  isNonEmptyString(oauth.authorizationUrl) && (flow.authorizationUrl = oauth.authorizationUrl);
+  isNonEmptyString(oauth.accessTokenUrl) && (flow.accessTokenUrl = oauth.accessTokenUrl);
+  isNonEmptyString(oauth.refreshTokenUrl) && (flow.refreshTokenUrl = oauth.refreshTokenUrl);
+  isNonEmptyString(oauth.callbackUrl) && (flow.callbackUrl = oauth.callbackUrl);
+
+  const credentials = buildClientCredentials(oauth);
+  if (credentials) flow.credentials = credentials;
+
+  const authorizationRequest = mapAdditionalParameters(oauth.additionalParameters?.authorization);
+  if (authorizationRequest) {
+    flow.additionalParameters = { authorizationRequest };
+  }
+
+  const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
+  if (accessTokenRequest) {
+    flow.additionalParameters = { accessTokenRequest };
+  }
+
+  const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
+  if (refreshTokenRequest) {
+    flow.additionalParameters = { refreshTokenRequest };
+  }
+
+  isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
+  isNonEmptyString(oauth.state) && (flow.state = oauth.state);
+
+  const pkce = buildPkce(oauth.pkce);
+  if (pkce) flow.pkce = pkce;
+
+  const tokenConfig = buildTokenConfig(oauth);
+  if (tokenConfig) flow.tokenConfig = tokenConfig;
+
+  const settings = buildSettings(oauth);
+  if (settings) flow.settings = settings;
+
+  return flow;
+};
+
+const buildImplicitFlow = (oauth: BrunoOAuth2): OAuth2ImplicitFlow => {
+  const flow: OAuth2ImplicitFlow = {
+    type: 'oauth2',
+    flow: 'implicit'
+  };
+
+  isNonEmptyString(oauth.authorizationUrl) && (flow.authorizationUrl = oauth.authorizationUrl);
+  isNonEmptyString(oauth.callbackUrl) && (flow.callbackUrl = oauth.callbackUrl);
+  isNonEmptyString(oauth.clientId) && (flow.credentials = { clientId: oauth.clientId });
+  isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
+  isNonEmptyString(oauth.state) && (flow.state = oauth.state);
+
+  const authorizationRequest = mapAdditionalParameters(oauth.additionalParameters?.authorization);
+  if (authorizationRequest) {
+    flow.additionalParameters = { authorizationRequest };
+  }
+
+  const tokenConfig = buildTokenConfig(oauth);
+  if (tokenConfig) flow.tokenConfig = tokenConfig;
+
+  const settings = buildSettings(oauth);
+  if (settings) flow.settings = settings;
+
+  return flow;
+};
+
+export const toOpenCollectionOAuth2 = (oauth?: BrunoOAuth2 | null): AuthOAuth2 | undefined => {
+  if (!oauth) {
+    return undefined;
+  }
+
+  switch (oauth.grantType) {
+    case 'client_credentials':
+      return buildClientCredentialsFlow(oauth);
+    case 'password':
+      return buildResourceOwnerPasswordFlow(oauth);
+    case 'authorization_code':
+      return buildAuthorizationCodeFlow(oauth);
+    case 'implicit':
+      return buildImplicitFlow(oauth);
+    default:
+      console.warn(`toOpenCollectionOAuth2: Unsupported OAuth2 grant type "${oauth.grantType}".`);
+      return undefined;
+  }
+};
+
+const reversePlacementMapping = (placement?: OAuth2AdditionalParameter['placement']): 'headers' | 'queryparams' | 'body' | null => {
+  if (!placement) {
+    return null;
+  }
+
+  switch (placement) {
+    case 'header':
+      return 'headers';
+    case 'query':
+      return 'queryparams';
+    case 'body':
+      return 'body';
+    default:
+      return null;
+  }
+};
+
+const reverseAdditionalParameters = (params?: OAuth2AdditionalParameter[]): BrunoOAuthAdditionalParameter[] | null => {
+  if (!Array.isArray(params) || params.length === 0) {
+    return null;
+  }
+
+  const mapped = params.map((param): BrunoOAuthAdditionalParameter => {
+    const sendIn = reversePlacementMapping(param.placement);
+
+    return {
+      name: param.name || null,
+      value: param.value || null,
+      sendIn: sendIn || 'headers',
+      enabled: true
+    };
+  });
+
+  return mapped.length > 0 ? mapped : null;
+};
+
+export const toBrunoOAuth2 = (oauth: AuthOAuth2 | null | undefined): BrunoOAuth2 | null => {
+  if (!oauth) {
+    return null;
+  }
+
+  const brunoOAuth: BrunoOAuth2 = {
+    grantType: 'authorization_code',
+    username: null,
+    password: null,
+    callbackUrl: null,
+    authorizationUrl: null,
+    accessTokenUrl: null,
+    clientId: null,
+    clientSecret: null,
+    scope: null,
+    state: null,
+    pkce: false, // Default to false for all grant types
+    credentialsPlacement: null,
+    credentialsId: null,
+    tokenPlacement: null,
+    tokenHeaderPrefix: null,
+    tokenQueryKey: null,
+    refreshTokenUrl: null,
+    autoRefreshToken: false, // Default to false
+    autoFetchToken: true, // Default to true
+    additionalParameters: null
+  };
+
+  switch (oauth.flow) {
+    case 'client_credentials':
+      brunoOAuth.grantType = 'client_credentials';
+      if (oauth.accessTokenUrl) brunoOAuth.accessTokenUrl = oauth.accessTokenUrl;
+      if (oauth.refreshTokenUrl) brunoOAuth.refreshTokenUrl = oauth.refreshTokenUrl;
+      if (oauth.credentials?.clientId) brunoOAuth.clientId = oauth.credentials.clientId;
+      if (oauth.credentials?.clientSecret) brunoOAuth.clientSecret = oauth.credentials.clientSecret;
+      if (oauth.credentials?.placement) brunoOAuth.credentialsPlacement = oauth.credentials.placement;
+      if (oauth.scope) brunoOAuth.scope = oauth.scope;
+
+      // token config
+      if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.placement) {
+        if ('header' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'header';
+          brunoOAuth.tokenHeaderPrefix = oauth.tokenConfig.placement.header || '';
+        } else if ('query' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'url';
+          brunoOAuth.tokenQueryKey = oauth.tokenConfig.placement.query || '';
+        }
+      }
+
+      // additional parameters
+      if (oauth.additionalParameters) {
+        const tempParams: Record<string, any> = {};
+        if (oauth.additionalParameters.accessTokenRequest) {
+          const tokenParams = reverseAdditionalParameters(oauth.additionalParameters.accessTokenRequest);
+          if (tokenParams) {
+            tempParams.token = tokenParams;
+          }
+        }
+        if (oauth.additionalParameters.refreshTokenRequest) {
+          const refreshParams = reverseAdditionalParameters(oauth.additionalParameters.refreshTokenRequest);
+          if (refreshParams) {
+            tempParams.refresh = refreshParams;
+          }
+        }
+        // Only set additionalParameters if there are actual parameters
+        if (Object.keys(tempParams).length > 0) {
+          brunoOAuth.additionalParameters = tempParams;
+        }
+      }
+      break;
+
+    case 'resource_owner_password':
+      brunoOAuth.grantType = 'password';
+      if (oauth.accessTokenUrl) brunoOAuth.accessTokenUrl = oauth.accessTokenUrl;
+      if (oauth.refreshTokenUrl) brunoOAuth.refreshTokenUrl = oauth.refreshTokenUrl;
+      if (oauth.credentials?.clientId) brunoOAuth.clientId = oauth.credentials.clientId;
+      if (oauth.credentials?.clientSecret) brunoOAuth.clientSecret = oauth.credentials.clientSecret;
+      if (oauth.credentials?.placement) brunoOAuth.credentialsPlacement = oauth.credentials.placement;
+      if (oauth.resourceOwner?.username) brunoOAuth.username = oauth.resourceOwner.username;
+      if (oauth.resourceOwner?.password) brunoOAuth.password = oauth.resourceOwner.password;
+      if (oauth.scope) brunoOAuth.scope = oauth.scope;
+
+      // token config
+      if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.placement) {
+        if ('header' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'header';
+          brunoOAuth.tokenHeaderPrefix = oauth.tokenConfig.placement.header || '';
+        } else if ('query' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'url';
+          brunoOAuth.tokenQueryKey = oauth.tokenConfig.placement.query || '';
+        }
+      }
+
+      // additional parameters
+      if (oauth.additionalParameters) {
+        const tempParams: Record<string, any> = {};
+        if (oauth.additionalParameters.accessTokenRequest) {
+          const tokenParams = reverseAdditionalParameters(oauth.additionalParameters.accessTokenRequest);
+          if (tokenParams) {
+            tempParams.token = tokenParams;
+          }
+        }
+        if (oauth.additionalParameters.refreshTokenRequest) {
+          const refreshParams = reverseAdditionalParameters(oauth.additionalParameters.refreshTokenRequest);
+          if (refreshParams) {
+            tempParams.refresh = refreshParams;
+          }
+        }
+        // Only set additionalParameters if there are actual parameters
+        if (Object.keys(tempParams).length > 0) {
+          brunoOAuth.additionalParameters = tempParams;
+        }
+      }
+      break;
+
+    case 'authorization_code':
+      brunoOAuth.grantType = 'authorization_code';
+      if (oauth.authorizationUrl) brunoOAuth.authorizationUrl = oauth.authorizationUrl;
+      if (oauth.accessTokenUrl) brunoOAuth.accessTokenUrl = oauth.accessTokenUrl;
+      if (oauth.refreshTokenUrl) brunoOAuth.refreshTokenUrl = oauth.refreshTokenUrl;
+      if (oauth.callbackUrl) brunoOAuth.callbackUrl = oauth.callbackUrl;
+      if (oauth.credentials?.clientId) brunoOAuth.clientId = oauth.credentials.clientId;
+      if (oauth.credentials?.clientSecret) brunoOAuth.clientSecret = oauth.credentials.clientSecret;
+      if (oauth.credentials?.placement) brunoOAuth.credentialsPlacement = oauth.credentials.placement;
+      if (oauth.scope) brunoOAuth.scope = oauth.scope;
+      if (oauth.state) brunoOAuth.state = oauth.state;
+
+      // token config
+      if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.placement) {
+        if ('header' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'header';
+          brunoOAuth.tokenHeaderPrefix = oauth.tokenConfig.placement.header || '';
+        } else if ('query' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'url';
+          brunoOAuth.tokenQueryKey = oauth.tokenConfig.placement.query || '';
+        }
+      }
+
+      // additional parameters
+      if (oauth.additionalParameters) {
+        const tempParams: Record<string, any> = {};
+        if (oauth.additionalParameters.authorizationRequest) {
+          const authParams = reverseAdditionalParameters(oauth.additionalParameters.authorizationRequest);
+          if (authParams) {
+            tempParams.authorization = authParams;
+          }
+        }
+        if (oauth.additionalParameters.accessTokenRequest) {
+          const tokenParams = reverseAdditionalParameters(oauth.additionalParameters.accessTokenRequest);
+          if (tokenParams) {
+            tempParams.token = tokenParams;
+          }
+        }
+        if (oauth.additionalParameters.refreshTokenRequest) {
+          const refreshParams = reverseAdditionalParameters(oauth.additionalParameters.refreshTokenRequest);
+          if (refreshParams) {
+            tempParams.refresh = refreshParams;
+          }
+        }
+        // Only set additionalParameters if there are actual parameters
+        if (Object.keys(tempParams).length > 0) {
+          brunoOAuth.additionalParameters = tempParams;
+        }
+      }
+      break;
+
+    case 'implicit':
+      brunoOAuth.grantType = 'implicit';
+      if (oauth.authorizationUrl) brunoOAuth.authorizationUrl = oauth.authorizationUrl;
+      if (oauth.callbackUrl) brunoOAuth.callbackUrl = oauth.callbackUrl;
+      if (oauth.credentials?.clientId) brunoOAuth.clientId = oauth.credentials.clientId;
+      if (oauth.scope) brunoOAuth.scope = oauth.scope;
+      if (oauth.state) brunoOAuth.state = oauth.state;
+
+      // token config
+      if (oauth.tokenConfig?.id) brunoOAuth.credentialsId = oauth.tokenConfig.id;
+      if (oauth.tokenConfig?.placement) {
+        if ('header' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'header';
+          brunoOAuth.tokenHeaderPrefix = oauth.tokenConfig.placement.header || '';
+        } else if ('query' in oauth.tokenConfig.placement) {
+          brunoOAuth.tokenPlacement = 'url';
+          brunoOAuth.tokenQueryKey = oauth.tokenConfig.placement.query || '';
+        }
+      }
+
+      // additional parameters
+      if (oauth.additionalParameters) {
+        const tempParams: Record<string, any> = {};
+        if (oauth.additionalParameters.authorizationRequest) {
+          const authParams = reverseAdditionalParameters(oauth.additionalParameters.authorizationRequest);
+          if (authParams) {
+            tempParams.authorization = authParams;
+          }
+        }
+        // Only set additionalParameters if there are actual parameters
+        if (Object.keys(tempParams).length > 0) {
+          brunoOAuth.additionalParameters = tempParams;
+        }
+      }
+      break;
+
+    default:
+      return null;
+  }
+
+  if (oauth.settings?.autoFetchToken !== undefined) {
+    brunoOAuth.autoFetchToken = oauth.settings.autoFetchToken;
+  }
+  if (oauth.settings?.autoRefreshToken !== undefined) {
+    brunoOAuth.autoRefreshToken = oauth.settings.autoRefreshToken;
+  }
+
+  if (brunoOAuth.grantType === 'authorization_code' && oauth.flow === 'authorization_code') {
+    const authCodeFlow = oauth as OAuth2AuthorizationCodeFlow;
+    if (authCodeFlow.pkce?.enabled !== undefined) {
+      brunoOAuth.pkce = authCodeFlow.pkce.enabled;
+    }
+  }
+
+  if (brunoOAuth.additionalParameters === null) {
+    delete brunoOAuth.additionalParameters;
+  }
+
+  return brunoOAuth;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/auth.ts b/packages/bruno-filestore/src/formats/yml/common/auth.ts
new file mode 100644
index 000000000..72e054843
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/auth.ts
@@ -0,0 +1,245 @@
+import type {
+  Auth,
+  AuthApiKey,
+  AuthAwsV4,
+  AuthBasic,
+  AuthBearer,
+  AuthDigest,
+  AuthNTLM,
+  AuthWsse
+} from '@opencollection/types/common/auth';
+import type { Auth as BrunoAuth } from '@usebruno/schema-types/common/auth';
+import { isString } from '../../../utils';
+import { toOpenCollectionOAuth2, toBrunoOAuth2 } from './auth-oauth2';
+
+const buildAwsV4Auth = (config?: BrunoAuth['awsv4']): AuthAwsV4 => {
+  const auth: AuthAwsV4 = { type: 'awsv4' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.accessKeyId)) auth.accessKeyId = config.accessKeyId;
+  if (isString(config.secretAccessKey)) auth.secretAccessKey = config.secretAccessKey;
+  if (isString(config.sessionToken)) auth.sessionToken = config.sessionToken;
+  if (isString(config.service)) auth.service = config.service;
+  if (isString(config.region)) auth.region = config.region;
+  if (isString(config.profileName)) auth.profileName = config.profileName;
+
+  return auth;
+};
+
+const buildBasicAuth = (config?: BrunoAuth['basic']): AuthBasic => {
+  const auth: AuthBasic = { type: 'basic' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.username)) auth.username = config.username;
+  if (isString(config.password)) auth.password = config.password;
+
+  return auth;
+};
+
+const buildBearerAuth = (config?: BrunoAuth['bearer']): AuthBearer => {
+  const auth: AuthBearer = { type: 'bearer' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.token)) auth.token = config.token;
+
+  return auth;
+};
+
+const buildDigestAuth = (config?: BrunoAuth['digest']): AuthDigest => {
+  const auth: AuthDigest = { type: 'digest' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.username)) auth.username = config.username;
+  if (isString(config.password)) auth.password = config.password;
+
+  return auth;
+};
+
+const buildNtlmAuth = (config?: BrunoAuth['ntlm']): AuthNTLM => {
+  const auth: AuthNTLM = { type: 'ntlm' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.username)) auth.username = config.username;
+  if (isString(config.password)) auth.password = config.password;
+  if (isString(config.domain)) auth.domain = config.domain;
+
+  return auth;
+};
+
+const buildWsseAuth = (config?: BrunoAuth['wsse']): AuthWsse => {
+  const auth: AuthWsse = { type: 'wsse' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.username)) auth.username = config.username;
+  if (isString(config.password)) auth.password = config.password;
+
+  return auth;
+};
+
+const buildApiKeyAuth = (config?: BrunoAuth['apikey']): AuthApiKey => {
+  const auth: AuthApiKey = { type: 'apikey' };
+
+  if (!config) {
+    return auth;
+  }
+
+  if (isString(config.key)) auth.key = config.key;
+  if (isString(config.value)) auth.value = config.value;
+
+  if (isString(config.placement)) {
+    if (config.placement === 'header') {
+      auth.placement = 'header';
+    } else if (config.placement === 'queryparams') {
+      auth.placement = 'query';
+    }
+  }
+
+  return auth;
+};
+
+export const toOpenCollectionAuth = (auth?: BrunoAuth | null): Auth | undefined => {
+  if (!auth || auth.mode === 'none') {
+    return undefined;
+  }
+
+  if (auth.mode === 'inherit') {
+    return 'inherit';
+  }
+
+  switch (auth.mode) {
+    case 'awsv4':
+      return buildAwsV4Auth(auth.awsv4);
+    case 'basic':
+      return buildBasicAuth(auth.basic);
+    case 'bearer':
+      return buildBearerAuth(auth.bearer);
+    case 'digest':
+      return buildDigestAuth(auth.digest);
+    case 'ntlm':
+      return buildNtlmAuth(auth.ntlm);
+    case 'wsse':
+      return buildWsseAuth(auth.wsse);
+    case 'apikey':
+      return buildApiKeyAuth(auth.apikey);
+    case 'oauth2':
+      return toOpenCollectionOAuth2(auth.oauth2);
+    default:
+      console.warn(`toOpenCollectionAuth failed: Unsupported auth mode "${auth.mode}".`);
+      return undefined;
+  }
+};
+
+export const toBrunoAuth = (auth: Auth | null | undefined): BrunoAuth | null => {
+  const brunoAuth: BrunoAuth = {
+    mode: 'none',
+    awsv4: null,
+    basic: null,
+    bearer: null,
+    digest: null,
+    ntlm: null,
+    oauth2: null,
+    wsse: null,
+    apikey: null
+  };
+
+  if (!auth) {
+    return brunoAuth;
+  }
+
+  if (auth === 'inherit') {
+    brunoAuth.mode = 'inherit';
+    return brunoAuth;
+  }
+
+  switch (auth.type) {
+    case 'awsv4':
+      brunoAuth.mode = 'awsv4';
+      brunoAuth.awsv4 = {
+        accessKeyId: auth.accessKeyId || null,
+        secretAccessKey: auth.secretAccessKey || null,
+        sessionToken: auth.sessionToken || null,
+        service: auth.service || null,
+        region: auth.region || null,
+        profileName: auth.profileName || null
+      };
+      break;
+
+    case 'basic':
+      brunoAuth.mode = 'basic';
+      brunoAuth.basic = {
+        username: auth.username || null,
+        password: auth.password || null
+      };
+      break;
+
+    case 'bearer':
+      brunoAuth.mode = 'bearer';
+      brunoAuth.bearer = {
+        token: auth.token || null
+      };
+      break;
+
+    case 'digest':
+      brunoAuth.mode = 'digest';
+      brunoAuth.digest = {
+        username: auth.username || null,
+        password: auth.password || null
+      };
+      break;
+
+    case 'ntlm':
+      brunoAuth.mode = 'ntlm';
+      brunoAuth.ntlm = {
+        username: auth.username || null,
+        password: auth.password || null,
+        domain: auth.domain || null
+      };
+      break;
+
+    case 'wsse':
+      brunoAuth.mode = 'wsse';
+      brunoAuth.wsse = {
+        username: auth.username || null,
+        password: auth.password || null
+      };
+      break;
+
+    case 'apikey':
+      brunoAuth.mode = 'apikey';
+      brunoAuth.apikey = {
+        key: auth.key || null,
+        value: auth.value || null,
+        placement: auth.placement === 'query' ? 'queryparams' : (auth.placement === 'header' ? 'header' : null)
+      };
+      break;
+
+    case 'oauth2':
+      brunoAuth.mode = 'oauth2';
+      brunoAuth.oauth2 = toBrunoOAuth2(auth);
+      break;
+
+    default:
+      console.warn('toBrunoAuth failed: Unsupported auth type');
+      break;
+  }
+
+  return brunoAuth;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/body.ts b/packages/bruno-filestore/src/formats/yml/common/body.ts
new file mode 100644
index 000000000..998de5f66
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/body.ts
@@ -0,0 +1,234 @@
+import type { HttpRequestBody as BrunoHttpRequestBody } from '@usebruno/schema-types/requests/http';
+import type {
+  HttpRequestBody,
+  RawBody,
+  FormUrlEncodedBody,
+  FormUrlEncodedEntry,
+  MultipartFormBody,
+  MultipartFormEntry,
+  FileBody,
+  FileBodyEntry
+} from '@opencollection/types/requests/http';
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import { uuid } from '../../../utils';
+
+export const toOpenCollectionBody = (body: BrunoHttpRequestBody | null | undefined): HttpRequestBody | undefined => {
+  if (!body) {
+    return undefined;
+  }
+
+  switch (body.mode) {
+    case 'none':
+      return undefined;
+
+    case 'json':
+      const rawBody: RawBody = {
+        type: 'json',
+        data: body.json || ''
+      };
+      return rawBody;
+
+    case 'text':
+      const textBody: RawBody = {
+        type: 'text',
+        data: body.text || ''
+      };
+      return textBody;
+
+    case 'xml':
+      const xmlBody: RawBody = {
+        type: 'xml',
+        data: body.xml || ''
+      };
+      return xmlBody;
+
+    case 'sparql':
+      const sparqlBody: RawBody = {
+        type: 'sparql',
+        data: body.sparql || ''
+      };
+      return sparqlBody;
+
+    case 'formUrlEncoded':
+      const formEntries: FormUrlEncodedEntry[] = body.formUrlEncoded?.map((entry: BrunoKeyValue): FormUrlEncodedEntry => {
+        const formEntry: FormUrlEncodedEntry = {
+          name: entry.name || '',
+          value: entry.value || ''
+        };
+
+        if (entry?.description?.trim().length) {
+          formEntry.description = entry.description;
+        }
+
+        if (entry.enabled === false) {
+          formEntry.disabled = true;
+        }
+
+        return formEntry;
+      }) || [];
+
+      const formBody: FormUrlEncodedBody = {
+        type: 'form-urlencoded',
+        ...(formEntries.length > 0 && { data: formEntries })
+      } as FormUrlEncodedBody;
+      return formBody;
+
+    case 'multipartForm':
+      const multipartEntries: MultipartFormEntry[] = body.multipartForm?.map((entry): MultipartFormEntry => {
+        const multipartEntry: MultipartFormEntry = {
+          name: entry.name || '',
+          type: entry.type,
+          value: entry.value || (entry.type === 'file' ? [] : '')
+        };
+
+        if (entry?.description?.trim().length) {
+          multipartEntry.description = entry.description;
+        }
+
+        if (entry.enabled === false) {
+          multipartEntry.disabled = true;
+        }
+
+        return multipartEntry;
+      }) || [];
+
+      const multipartBody: MultipartFormBody = {
+        type: 'multipart-form',
+        ...(multipartEntries.length > 0 && { data: multipartEntries })
+      } as MultipartFormBody;
+      return multipartBody;
+
+    case 'file':
+      const fileEntries: FileBodyEntry[] = body.file?.map((file): FileBodyEntry => {
+        return {
+          filePath: file.filePath || '',
+          contentType: file.contentType || '',
+          selected: file.selected ?? false
+        };
+      }) || [];
+
+      const fileBody: FileBody = {
+        type: 'file',
+        ...(fileEntries.length > 0 && { data: fileEntries })
+      } as FileBody;
+      return fileBody;
+
+    case 'graphql':
+      // GraphQL body is handled separately in GraphQL request stringify
+      return undefined;
+
+    default:
+      return undefined;
+  }
+};
+
+export const toBrunoBody = (body: HttpRequestBody | null | undefined): BrunoHttpRequestBody | undefined => {
+  if (!body) {
+    return {
+      mode: 'none',
+      json: null,
+      text: null,
+      xml: null,
+      sparql: null,
+      formUrlEncoded: [],
+      multipartForm: [],
+      graphql: null,
+      file: []
+    };
+  }
+
+  const brunoBody: BrunoHttpRequestBody = {
+    mode: 'none',
+    json: null,
+    text: null,
+    xml: null,
+    sparql: null,
+    formUrlEncoded: [],
+    multipartForm: [],
+    graphql: null,
+    file: []
+  };
+
+  switch (body.type) {
+    case 'json':
+      brunoBody.mode = 'json';
+      brunoBody.json = body.data || '';
+      break;
+
+    case 'text':
+      brunoBody.mode = 'text';
+      brunoBody.text = body.data || '';
+      break;
+
+    case 'xml':
+      brunoBody.mode = 'xml';
+      brunoBody.xml = body.data || '';
+      break;
+
+    case 'sparql':
+      brunoBody.mode = 'sparql';
+      brunoBody.sparql = body.data || '';
+      break;
+
+    case 'form-urlencoded':
+      brunoBody.mode = 'formUrlEncoded';
+      brunoBody.formUrlEncoded = body.data?.map((entry): BrunoKeyValue => {
+        const formEntry: BrunoKeyValue = {
+          uid: uuid(),
+          name: entry.name || '',
+          value: entry.value || '',
+          enabled: entry.disabled !== true
+        };
+
+        if (entry.description) {
+          if (typeof entry.description === 'string' && entry.description.trim().length) {
+            formEntry.description = entry.description;
+          } else if (typeof entry.description === 'object' && entry.description.content?.trim().length) {
+            formEntry.description = entry.description.content;
+          }
+        }
+
+        return formEntry;
+      }) || [];
+      break;
+
+    case 'multipart-form':
+      brunoBody.mode = 'multipartForm';
+      brunoBody.multipartForm = body.data?.map((entry): any => {
+        const multipartEntry: any = {
+          uid: uuid(),
+          type: entry.type,
+          name: entry.name || '',
+          value: entry.value || (entry.type === 'file' ? [] : ''),
+          contentType: null,
+          enabled: entry.disabled !== true
+        };
+
+        if (entry.description) {
+          if (typeof entry.description === 'string' && entry.description.trim().length) {
+            multipartEntry.description = entry.description;
+          } else if (typeof entry.description === 'object' && entry.description.content?.trim().length) {
+            multipartEntry.description = entry.description.content;
+          }
+        }
+
+        return multipartEntry;
+      }) || [];
+      break;
+
+    case 'file':
+      brunoBody.mode = 'file';
+      brunoBody.file = body.data?.map((file): any => ({
+        uid: uuid(),
+        filePath: file.filePath || '',
+        contentType: file.contentType || '',
+        selected: file.selected ?? false
+      })) || [];
+      break;
+
+    default:
+      break;
+  }
+
+  return brunoBody;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/headers.ts b/packages/bruno-filestore/src/formats/yml/common/headers.ts
new file mode 100644
index 000000000..7dac67c08
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/headers.ts
@@ -0,0 +1,45 @@
+import type { FolderRequest as BrunoFolderRequest } from '@usebruno/schema-types/collection/folder';
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import type { HttpHeader } from '@opencollection/types/requests/http';
+import { uuid } from '../../../utils';
+
+export const toOpenCollectionHttpHeaders = (headers: BrunoFolderRequest['headers']): HttpHeader[] | undefined => {
+  if (!headers?.length) {
+    return undefined;
+  }
+
+  const ocHeaders = headers.map((header: BrunoKeyValue): HttpHeader => {
+    const httpHeader: HttpHeader = {
+      name: header.name || '',
+      value: header.value || ''
+    };
+    if (header?.description?.trim().length) {
+      httpHeader.description = header.description;
+    }
+    if (header.enabled === false) {
+      httpHeader.disabled = true;
+    }
+    return httpHeader;
+  });
+
+  return ocHeaders.length ? ocHeaders : undefined;
+};
+
+export const toBrunoHttpHeaders = (headers: HttpHeader[] | null | undefined): BrunoKeyValue[] | undefined => {
+  if (!headers?.length) {
+    return undefined;
+  }
+
+  const brunoHeaders = headers.map((header: HttpHeader): BrunoKeyValue => {
+    const brunoHeader: BrunoKeyValue = {
+      uid: uuid(),
+      name: header.name || '',
+      value: header.value || '',
+      enabled: header.disabled !== true
+    };
+
+    return brunoHeader;
+  });
+
+  return brunoHeaders.length ? brunoHeaders : undefined;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/params.ts b/packages/bruno-filestore/src/formats/yml/common/params.ts
new file mode 100644
index 000000000..eefd755b0
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/params.ts
@@ -0,0 +1,57 @@
+import type { HttpRequestParam as BrunoHttpRequestParam } from '@usebruno/schema-types/requests/http';
+import type { HttpRequestParam } from '@opencollection/types/requests/http';
+import { uuid } from '../../../utils';
+
+export const toOpenCollectionParams = (params: BrunoHttpRequestParam[] | null | undefined): HttpRequestParam[] | undefined => {
+  if (!params?.length) {
+    return undefined;
+  }
+
+  const ocParams = params.map((param: BrunoHttpRequestParam): HttpRequestParam => {
+    const ocParam: HttpRequestParam = {
+      name: param.name || '',
+      value: param.value || '',
+      type: param.type
+    };
+
+    if (param?.description?.trim().length) {
+      ocParam.description = param.description;
+    }
+
+    if (param.enabled === false) {
+      ocParam.disabled = true;
+    }
+
+    return ocParam;
+  });
+
+  return ocParams.length ? ocParams : undefined;
+};
+
+export const toBrunoParams = (params: HttpRequestParam[] | null | undefined): BrunoHttpRequestParam[] | undefined => {
+  if (!params?.length) {
+    return undefined;
+  }
+
+  const brunoParams = params.map((param: HttpRequestParam): BrunoHttpRequestParam => {
+    const brunoParam: BrunoHttpRequestParam = {
+      uid: uuid(),
+      name: param.name || '',
+      value: param.value || '',
+      type: param.type,
+      enabled: param.disabled !== true
+    };
+
+    if (param.description) {
+      if (typeof param.description === 'string' && param.description.trim().length) {
+        brunoParam.description = param.description;
+      } else if (typeof param.description === 'object' && param.description.content?.trim().length) {
+        brunoParam.description = param.description.content;
+      }
+    }
+
+    return brunoParam;
+  });
+
+  return brunoParams.length ? brunoParams : undefined;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/scripts.ts b/packages/bruno-filestore/src/formats/yml/common/scripts.ts
new file mode 100644
index 000000000..694166691
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/scripts.ts
@@ -0,0 +1,51 @@
+import { Scripts } from '@opencollection/types/common/scripts';
+import { FolderRequest as BrunoFolderRequest } from '@usebruno/schema-types/collection/folder';
+import { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import { WebSocketRequest as BrunoWebSocketRequest } from '@usebruno/schema-types/requests/websocket';
+import { GrpcRequest as BrunoGrpcRequest } from '@usebruno/schema-types/requests/grpc';
+
+export const toOpenCollectionScripts = (request: BrunoFolderRequest | BrunoHttpRequest | BrunoWebSocketRequest | BrunoGrpcRequest | null | undefined): Scripts | undefined => {
+  const ocScripts: Scripts = {};
+
+  if (request?.script?.req?.trim().length) {
+    ocScripts.preRequest = request.script.req.trim();
+  }
+  if (request?.script?.res?.trim().length) {
+    ocScripts.postResponse = request.script.res.trim();
+  }
+  if (request?.tests?.trim().length) {
+    ocScripts.tests = request.tests.trim();
+  }
+
+  return Object.keys(ocScripts).length > 0 ? ocScripts : undefined;
+};
+
+export const toBrunoScripts = (scripts: Scripts | null | undefined): {
+  script?: { req?: string; res?: string };
+  tests?: string;
+} | undefined => {
+  if (!scripts) {
+    return undefined;
+  }
+
+  const brunoScripts: {
+    script?: { req?: string; res?: string };
+    tests?: string;
+  } = {};
+
+  if (scripts.preRequest || scripts.postResponse) {
+    brunoScripts.script = {};
+    if (scripts.preRequest) {
+      brunoScripts.script.req = scripts.preRequest;
+    }
+    if (scripts.postResponse) {
+      brunoScripts.script.res = scripts.postResponse;
+    }
+  }
+
+  if (scripts.tests) {
+    brunoScripts.tests = scripts.tests;
+  }
+
+  return Object.keys(brunoScripts).length > 0 ? brunoScripts : undefined;
+};
diff --git a/packages/bruno-filestore/src/formats/yml/common/variables.ts b/packages/bruno-filestore/src/formats/yml/common/variables.ts
new file mode 100644
index 000000000..e4e30ef8c
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/common/variables.ts
@@ -0,0 +1,80 @@
+import { Variable } from '@opencollection/types/common/variables';
+import { FolderRequest as BrunoFolderRequest } from '@usebruno/schema-types/collection/folder';
+import { Variable as BrunoVariable, Variables as BrunoVariables } from '@usebruno/schema-types/common/variables';
+import { uuid } from '../../../utils';
+
+export const toOpenCollectionVariables = (variables: BrunoFolderRequest['vars'] | BrunoVariables | null | undefined): Variable[] | undefined => {
+  // Handle folder variables (has req/res structure)
+  const hasReqRes = variables && 'req' in variables;
+  const reqVars = hasReqRes ? variables.req : variables as BrunoVariables;
+  const resVars = hasReqRes && 'res' in variables ? variables.res : [];
+
+  const allVars = [...(reqVars || []), ...(resVars || [])];
+
+  if (!allVars.length) {
+    return undefined;
+  }
+
+  const ocVariables: Variable[] = allVars.map((v: BrunoVariable, index: number): Variable => {
+    const isResVar = reqVars && index >= (reqVars?.length || 0);
+    const variable: Variable = {
+      name: v.name || '',
+      value: v.value || ''
+    };
+
+    if (isResVar) {
+      const scopeMarker = '[post-response]';
+      if (v?.description?.trim().length) {
+        variable.description = `${scopeMarker} ${v.description}`;
+      } else {
+        variable.description = scopeMarker;
+      }
+    } else if (v?.description?.trim().length) {
+      variable.description = v.description;
+    }
+
+    if (v.enabled === false) {
+      variable.disabled = true;
+    }
+    return variable;
+  });
+
+  return ocVariables.length > 0 ? ocVariables : undefined;
+};
+
+export const toBrunoVariables = (variables: Variable[] | null | undefined): { req: BrunoVariables; res: BrunoVariables } => {
+  if (!variables?.length) {
+    return { req: [], res: [] };
+  }
+
+  const scopeMarker = '[post-response]';
+  const reqVars: BrunoVariables = [];
+  const resVars: BrunoVariables = [];
+
+  variables.forEach((v: Variable) => {
+    const isPostResponse = typeof v.description === 'string' && v.description.startsWith(scopeMarker);
+
+    const variable: BrunoVariable = {
+      uid: uuid(),
+      name: v.name || '',
+      value: v.value as string || '',
+      enabled: v.disabled !== true,
+      local: false
+    };
+
+    if (isPostResponse) {
+      const cleanDesc = (v.description as string).substring(scopeMarker.length).trim();
+      if (cleanDesc) {
+        variable.description = cleanDesc;
+      }
+      resVars.push(variable);
+    } else {
+      if (v.description) {
+        variable.description = typeof v.description === 'string' ? v.description : (v.description as any)?.content || '';
+      }
+      reqVars.push(variable);
+    }
+  });
+
+  return { req: reqVars, res: resVars };
+};
diff --git a/packages/bruno-filestore/src/formats/yml/index.ts b/packages/bruno-filestore/src/formats/yml/index.ts
new file mode 100644
index 000000000..c66bab854
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/index.ts
@@ -0,0 +1,20 @@
+import parseYmlItem from './parseItem';
+import parseYmlFolder from './parseFolder';
+import parseYmlCollection from './parseCollection';
+import parseYmlEnvironment from './parseEnvironment';
+
+import stringifyYmlItem from './stringifyItem';
+import stringifyYmlFolder from './stringifyFolder';
+import stringifyYmlCollection from './stringifyCollection';
+import stringifyYmlEnvironment from './stringifyEnvironment';
+
+export {
+  parseYmlItem,
+  parseYmlFolder,
+  parseYmlCollection,
+  parseYmlEnvironment,
+  stringifyYmlItem,
+  stringifyYmlFolder,
+  stringifyYmlCollection,
+  stringifyYmlEnvironment
+};
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts
new file mode 100644
index 000000000..87529a686
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts
@@ -0,0 +1,128 @@
+import type { Item as BrunoItem, HttpItemSettings as BrunoHttpItemSettings } from '@usebruno/schema-types/collection/item';
+import type { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import type { GraphQLRequest, GraphQLRequestSettings, GraphQLBody } from '@opencollection/types/requests/graphql';
+import { toBrunoAuth } from '../common/auth';
+import { toBrunoHttpHeaders } from '../common/headers';
+import { toBrunoParams } from '../common/params';
+import { toBrunoVariables } from '../common/variables';
+import { toBrunoScripts } from '../common/scripts';
+import { toBrunoAssertions } from '../common/assertions';
+import { uuid } from '../../../utils';
+
+const parseGraphQLRequest = (ocRequest: GraphQLRequest): BrunoItem => {
+  const brunoRequest: BrunoHttpRequest = {
+    url: ocRequest.url || '',
+    method: ocRequest.method || 'POST',
+    headers: toBrunoHttpHeaders(ocRequest.headers) || [],
+    params: toBrunoParams(ocRequest.params) || [],
+    auth: toBrunoAuth(ocRequest.auth),
+    body: {
+      mode: 'graphql',
+      json: null,
+      text: null,
+      xml: null,
+      sparql: null,
+      formUrlEncoded: [],
+      multipartForm: [],
+      graphql: {
+        query: (ocRequest.body as GraphQLBody)?.query || null,
+        variables: (ocRequest.body as GraphQLBody)?.variables || null
+      },
+      file: []
+    },
+    script: {
+      req: null,
+      res: null
+    },
+    vars: {
+      req: [],
+      res: []
+    },
+    assertions: [],
+    tests: null,
+    docs: null
+  };
+
+  // scripts
+  const scripts = toBrunoScripts(ocRequest.scripts);
+  if (scripts?.script && brunoRequest.script) {
+    if (scripts.script.req) {
+      brunoRequest.script.req = scripts.script.req;
+    }
+    if (scripts.script.res) {
+      brunoRequest.script.res = scripts.script.res;
+    }
+  }
+  if (scripts?.tests) {
+    brunoRequest.tests = scripts.tests;
+  }
+
+  // variables
+  const variables = toBrunoVariables(ocRequest.variables);
+  brunoRequest.vars = variables;
+
+  // assertions
+  const assertions = toBrunoAssertions(ocRequest.assertions);
+  if (assertions) {
+    brunoRequest.assertions = assertions;
+  }
+
+  // docs
+  if (ocRequest.docs) {
+    brunoRequest.docs = ocRequest.docs;
+  }
+
+  // bruno item
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'graphql-request',
+    seq: ocRequest.seq || 1,
+    name: ocRequest.name || 'Untitled Request',
+    tags: ocRequest.tags || [],
+    request: brunoRequest,
+    settings: null,
+    fileContent: null,
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  // settings
+  if (ocRequest.settings) {
+    const settings: BrunoHttpItemSettings = {};
+
+    if (typeof ocRequest.settings.encodeUrl === 'boolean') {
+      settings.encodeUrl = ocRequest.settings.encodeUrl;
+    } else {
+      settings.encodeUrl = true;
+    }
+
+    if (typeof ocRequest.settings.timeout === 'number') {
+      settings.timeout = ocRequest.settings.timeout;
+    } else if (ocRequest.settings.timeout === 'inherit') {
+      settings.timeout = 'inherit';
+    } else {
+      settings.timeout = 0;
+    }
+
+    if (typeof ocRequest.settings.followRedirects === 'boolean') {
+      settings.followRedirects = ocRequest.settings.followRedirects;
+    } else {
+      settings.followRedirects = true;
+    }
+
+    if (typeof ocRequest.settings.maxRedirects === 'number') {
+      settings.maxRedirects = ocRequest.settings.maxRedirects;
+    } else {
+      settings.maxRedirects = 5;
+    }
+
+    brunoItem.settings = settings;
+  }
+
+  return brunoItem;
+};
+
+export default parseGraphQLRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseGrpcRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseGrpcRequest.ts
new file mode 100644
index 000000000..bbd97d116
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseGrpcRequest.ts
@@ -0,0 +1,112 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { GrpcRequest as BrunoGrpcRequest } from '@usebruno/schema-types/requests/grpc';
+import type { GrpcRequest, GrpcMetadata } from '@opencollection/types/requests/grpc';
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import { toBrunoAuth } from '../common/auth';
+import { toBrunoVariables } from '../common/variables';
+import { toBrunoScripts } from '../common/scripts';
+import { toBrunoAssertions } from '../common/assertions';
+import { isNonEmptyString, uuid } from '../../../utils';
+
+const toBrunoGrpcMetadata = (metadata: GrpcMetadata[] | null | undefined): BrunoKeyValue[] | undefined => {
+  if (!metadata?.length) {
+    return undefined;
+  }
+
+  const brunoMetadata = metadata.map((meta: GrpcMetadata): BrunoKeyValue => {
+    const brunoMeta: BrunoKeyValue = {
+      uid: uuid(),
+      name: meta.name || '',
+      value: meta.value || '',
+      enabled: meta.disabled !== true
+    };
+
+    return brunoMeta;
+  });
+
+  return brunoMetadata.length ? brunoMetadata : undefined;
+};
+
+const parseGrpcRequest = (ocRequest: GrpcRequest): BrunoItem => {
+  const brunoRequest: BrunoGrpcRequest = {
+    url: ocRequest.url || '',
+    method: ocRequest.method || '',
+    methodType: ocRequest.methodType || null,
+    protoPath: ocRequest.protoFilePath || null,
+    headers: toBrunoGrpcMetadata(ocRequest.metadata) || [],
+    auth: toBrunoAuth(ocRequest.auth),
+    body: {
+      mode: 'grpc',
+      grpc: []
+    },
+    script: {
+      req: null,
+      res: null
+    },
+    vars: {
+      req: [],
+      res: []
+    },
+    assertions: [],
+    tests: null,
+    docs: null
+  };
+
+  // message
+  if (isNonEmptyString(ocRequest.message)) {
+    brunoRequest.body.grpc = [{
+      name: '',
+      content: ocRequest.message
+    }];
+  }
+
+  // scripts
+  const scripts = toBrunoScripts(ocRequest.scripts);
+  if (scripts?.script && brunoRequest.script) {
+    if (scripts.script.req) {
+      brunoRequest.script.req = scripts.script.req;
+    }
+    if (scripts.script.res) {
+      brunoRequest.script.res = scripts.script.res;
+    }
+  }
+  if (scripts?.tests) {
+    brunoRequest.tests = scripts.tests;
+  }
+
+  // variables
+  const variables = toBrunoVariables(ocRequest.variables);
+  brunoRequest.vars = variables;
+
+  // assertions
+  const assertions = toBrunoAssertions(ocRequest.assertions);
+  if (assertions) {
+    brunoRequest.assertions = assertions;
+  }
+
+  // docs
+  if (ocRequest.docs) {
+    brunoRequest.docs = ocRequest.docs;
+  }
+
+  // bruno item
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'grpc-request',
+    seq: ocRequest.seq || 1,
+    name: ocRequest.name || 'Untitled Request',
+    tags: ocRequest.tags || [],
+    request: brunoRequest,
+    settings: null,
+    fileContent: null,
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  return brunoItem;
+};
+
+export default parseGrpcRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseHttpRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseHttpRequest.ts
new file mode 100644
index 000000000..c902162d3
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseHttpRequest.ts
@@ -0,0 +1,186 @@
+import type { Item as BrunoItem, HttpItemSettings as BrunoHttpItemSettings } from '@usebruno/schema-types/collection/item';
+import type { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import type { HttpRequest, HttpRequestBody } from '@opencollection/types/requests/http';
+import { toBrunoAuth } from '../common/auth';
+import { toBrunoHttpHeaders } from '../common/headers';
+import { toBrunoParams } from '../common/params';
+import { toBrunoBody } from '../common/body';
+import { toBrunoVariables } from '../common/variables';
+import { toBrunoScripts } from '../common/scripts';
+import { toBrunoAssertions } from '../common/assertions';
+import { uuid } from '../../../utils';
+
+const parseHttpRequest = (ocRequest: HttpRequest): BrunoItem => {
+  const brunoRequest: BrunoHttpRequest = {
+    url: ocRequest.url || '',
+    method: ocRequest.method || 'GET',
+    headers: toBrunoHttpHeaders(ocRequest.headers) || [],
+    params: toBrunoParams(ocRequest.params) || [],
+    auth: toBrunoAuth(ocRequest.auth),
+    body: toBrunoBody(ocRequest.body as HttpRequestBody) || {
+      mode: 'none',
+      json: null,
+      text: null,
+      xml: null,
+      sparql: null,
+      formUrlEncoded: [],
+      multipartForm: [],
+      graphql: null,
+      file: []
+    },
+    script: {
+      req: null,
+      res: null
+    },
+    vars: {
+      req: [],
+      res: []
+    },
+    assertions: [],
+    tests: null,
+    docs: null
+  };
+
+  // scripts
+  const scripts = toBrunoScripts(ocRequest.scripts);
+  if (scripts?.script && brunoRequest.script) {
+    if (scripts.script.req) {
+      brunoRequest.script.req = scripts.script.req;
+    }
+    if (scripts.script.res) {
+      brunoRequest.script.res = scripts.script.res;
+    }
+  }
+  if (scripts?.tests) {
+    brunoRequest.tests = scripts.tests;
+  }
+
+  // variables
+  const variables = toBrunoVariables(ocRequest.variables);
+  brunoRequest.vars = variables;
+
+  // assertions
+  const assertions = toBrunoAssertions(ocRequest.assertions);
+  if (assertions) {
+    brunoRequest.assertions = assertions;
+  }
+
+  // docs
+  if (ocRequest.docs) {
+    brunoRequest.docs = ocRequest.docs;
+  }
+
+  // bruno item
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'http-request',
+    seq: ocRequest.seq || 1,
+    name: ocRequest.name || 'Untitled Request',
+    tags: ocRequest.tags || [],
+    request: brunoRequest,
+    settings: null,
+    fileContent: null,
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  // settings
+  if (ocRequest.settings) {
+    const settings: BrunoHttpItemSettings = {};
+
+    if (typeof ocRequest.settings.encodeUrl === 'boolean') {
+      settings.encodeUrl = ocRequest.settings.encodeUrl;
+    } else {
+      settings.encodeUrl = true;
+    }
+
+    if (typeof ocRequest.settings.timeout === 'number') {
+      settings.timeout = ocRequest.settings.timeout;
+    } else if (ocRequest.settings.timeout === 'inherit') {
+      settings.timeout = 'inherit';
+    } else {
+      settings.timeout = 0;
+    }
+
+    if (typeof ocRequest.settings.followRedirects === 'boolean') {
+      settings.followRedirects = ocRequest.settings.followRedirects;
+    } else {
+      settings.followRedirects = true;
+    }
+
+    if (typeof ocRequest.settings.maxRedirects === 'number') {
+      settings.maxRedirects = ocRequest.settings.maxRedirects;
+    } else {
+      settings.maxRedirects = 5;
+    }
+
+    brunoItem.settings = settings;
+  }
+
+  // examples
+  if (ocRequest.examples?.length) {
+    brunoItem.examples = ocRequest.examples.map((example) => {
+      const brunoExample: any = {
+        uid: uuid(),
+        itemUid: uuid(),
+        name: example.name || 'Untitled Example',
+        type: 'http-request',
+        request: null,
+        response: null
+      };
+
+      if (example.description) {
+        if (typeof example.description === 'string' && example.description.trim().length) {
+          brunoExample.description = example.description;
+        } else if (typeof example.description === 'object' && example.description.content?.trim().length) {
+          brunoExample.description = example.description.content;
+        }
+      }
+
+      if (example.request) {
+        brunoExample.request = {
+          url: example.request.url || '',
+          method: example.request.method || 'GET',
+          headers: toBrunoHttpHeaders(example.request.headers) || [],
+          params: toBrunoParams(example.request.params) || [],
+          body: toBrunoBody(example.request.body) || {
+            mode: 'none',
+            json: null,
+            text: null,
+            xml: null,
+            sparql: null,
+            formUrlEncoded: null,
+            multipartForm: null,
+            graphql: null,
+            file: null
+          }
+        };
+      }
+
+      if (example.response) {
+        brunoExample.response = {
+          status: example.response.status !== undefined ? String(example.response.status) : null,
+          statusText: example.response.statusText || null,
+          headers: toBrunoHttpHeaders(example.response.headers) || [],
+          body: null
+        };
+
+        if (example.response.body) {
+          brunoExample.response.body = {
+            type: example.response.body.type || 'text',
+            content: example.response.body.data || ''
+          };
+        }
+      }
+
+      return brunoExample;
+    });
+  }
+
+  return brunoItem;
+};
+
+export default parseHttpRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseScript.ts b/packages/bruno-filestore/src/formats/yml/items/parseScript.ts
new file mode 100644
index 000000000..f6fe8b1e7
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseScript.ts
@@ -0,0 +1,25 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { Script } from '@opencollection/types/collection/item';
+import { uuid } from '../../../utils';
+
+const parseScript = (ocScript: Script): BrunoItem => {
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'js',
+    seq: 1,
+    name: 'Script',
+    tags: [],
+    request: null,
+    settings: null,
+    fileContent: ocScript.script || '',
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  return brunoItem;
+};
+
+export default parseScript;
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseWebsocketRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseWebsocketRequest.ts
new file mode 100644
index 000000000..3238b3fe1
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/parseWebsocketRequest.ts
@@ -0,0 +1,87 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { WebSocketRequest as BrunoWebSocketRequest } from '@usebruno/schema-types/requests/websocket';
+import type { WebSocketRequest, WebSocketMessage } from '@opencollection/types/requests/websocket';
+import { toBrunoAuth } from '../common/auth';
+import { toBrunoHttpHeaders } from '../common/headers';
+import { toBrunoVariables } from '../common/variables';
+import { toBrunoScripts } from '../common/scripts';
+import { uuid } from '../../../utils';
+
+const parseWebsocketRequest = (ocRequest: WebSocketRequest): BrunoItem => {
+  const brunoRequest: BrunoWebSocketRequest = {
+    url: ocRequest.url || '',
+    headers: toBrunoHttpHeaders(ocRequest.headers) || [],
+    auth: toBrunoAuth(ocRequest.auth),
+    body: {
+      mode: 'ws',
+      ws: []
+    },
+    script: {
+      req: null,
+      res: null
+    },
+    vars: {
+      req: [],
+      res: []
+    },
+    assertions: [],
+    tests: null,
+    docs: null
+  };
+
+  // message
+  if (ocRequest.message) {
+    const message = ocRequest.message as WebSocketMessage;
+    if (message.data?.trim().length) {
+      brunoRequest.body.ws = [{
+        name: '',
+        type: message.type || 'text',
+        content: message.data
+      }];
+    }
+  }
+
+  // scripts
+  const scripts = toBrunoScripts(ocRequest.scripts);
+  if (scripts?.script && brunoRequest.script) {
+    if (scripts.script.req) {
+      brunoRequest.script.req = scripts.script.req;
+    }
+    if (scripts.script.res) {
+      brunoRequest.script.res = scripts.script.res;
+    }
+  }
+  if (scripts?.tests) {
+    brunoRequest.tests = scripts.tests;
+  }
+
+  // variables
+  const variables = toBrunoVariables(ocRequest.variables);
+  brunoRequest.vars = variables;
+
+  // docs
+  if (ocRequest.docs) {
+    brunoRequest.docs = ocRequest.docs;
+  }
+
+  // bruno item
+  const brunoItem: BrunoItem = {
+    uid: uuid(),
+    type: 'ws-request',
+    seq: ocRequest.seq || 1,
+    name: ocRequest.name || 'Untitled Request',
+    tags: ocRequest.tags || [],
+    request: brunoRequest,
+    settings: null,
+    fileContent: null,
+    root: null,
+    items: [],
+    examples: [],
+    filename: null,
+    pathname: null
+  };
+
+  return brunoItem;
+};
+
+export default parseWebsocketRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyGraphQLRequest.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyGraphQLRequest.ts
new file mode 100644
index 000000000..6f367237c
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyGraphQLRequest.ts
@@ -0,0 +1,150 @@
+import type { Item as BrunoItem, HttpItemSettings as BrunoHttpItemSettings } from '@usebruno/schema-types/collection/item';
+import type { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import type { GraphQLRequest, GraphQLRequestSettings, GraphQLBody } from '@opencollection/types/requests/graphql';
+import type { Auth } from '@opencollection/types/common/auth';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Assertion } from '@opencollection/types/common/assertions';
+import type { HttpRequestParam, HttpHeader } from '@opencollection/types/requests/http';
+import { stringifyYml } from '../utils';
+import { isNonEmptyString, isNumber } from '../../../utils';
+import { toOpenCollectionAuth } from '../common/auth';
+import { toOpenCollectionHttpHeaders } from '../common/headers';
+import { toOpenCollectionParams } from '../common/params';
+import { toOpenCollectionVariables } from '../common/variables';
+import { toOpenCollectionScripts } from '../common/scripts';
+import { toOpenCollectionAssertions } from '../common/assertions';
+
+const stringifyGraphQLRequest = (item: BrunoItem): string => {
+  try {
+    const ocRequest: GraphQLRequest = {
+      type: 'graphql'
+    };
+
+    ocRequest.name = isNonEmptyString(item.name) ? item.name : 'Untitled Request';
+
+    // sequence
+    if (item.seq) {
+      ocRequest.seq = item.seq;
+    }
+
+    const brunoRequest = item.request as BrunoHttpRequest;
+    // url and method
+    ocRequest.url = isNonEmptyString(brunoRequest.url) ? brunoRequest.url : '';
+    ocRequest.method = isNonEmptyString(brunoRequest.method) ? brunoRequest.method : 'POST';
+
+    // headers
+    const headers: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(brunoRequest.headers);
+    if (headers) {
+      ocRequest.headers = headers;
+    }
+
+    // params
+    const params: HttpRequestParam[] | undefined = toOpenCollectionParams(brunoRequest.params);
+    if (params) {
+      ocRequest.params = params;
+    }
+
+    // body
+    if (brunoRequest.body?.mode === 'graphql' && brunoRequest.body.graphql) {
+      const graphqlBody: GraphQLBody = {};
+      let hasBody = false;
+
+      if (isNonEmptyString(brunoRequest.body.graphql.query)) {
+        graphqlBody.query = brunoRequest.body.graphql.query;
+        hasBody = true;
+      }
+
+      if (isNonEmptyString(brunoRequest.body.graphql.variables)) {
+        graphqlBody.variables = brunoRequest.body.graphql.variables;
+        hasBody = true;
+      }
+
+      if (hasBody) {
+        ocRequest.body = graphqlBody;
+      }
+    }
+
+    // auth
+    const auth: Auth | undefined = toOpenCollectionAuth(brunoRequest.auth);
+    if (auth) {
+      ocRequest.auth = auth;
+    }
+
+    // scripts
+    const scripts: Scripts | undefined = toOpenCollectionScripts(brunoRequest);
+    if (scripts) {
+      ocRequest.scripts = scripts;
+    }
+
+    // variables
+    const variables: Variable[] | undefined = toOpenCollectionVariables(brunoRequest.vars);
+    if (variables) {
+      ocRequest.variables = variables;
+    }
+
+    // assertions
+    const assertions: Assertion[] | undefined = toOpenCollectionAssertions(brunoRequest.assertions);
+    if (assertions) {
+      ocRequest.assertions = assertions;
+    }
+
+    // docs
+    if (isNonEmptyString(brunoRequest.docs)) {
+      ocRequest.docs = brunoRequest.docs;
+    }
+
+    // settings
+    const httpSettings = item.settings as BrunoHttpItemSettings | undefined;
+    ocRequest.settings = {} as GraphQLRequestSettings;
+    if (httpSettings?.encodeUrl === true) {
+      ocRequest.settings.encodeUrl = true;
+    } else if (httpSettings?.encodeUrl === false) {
+      ocRequest.settings.encodeUrl = false;
+    } else {
+      // todo: we are defaulting to true for now as bruno config does not yet support inherit for encodeUrl
+      // update this when bruno config supports inherit for encodeUrl
+      ocRequest.settings.encodeUrl = true;
+    }
+
+    const timeout = httpSettings?.timeout;
+    if (isNumber(timeout)) {
+      ocRequest.settings.timeout = timeout;
+    } else {
+      // todo: we are defaulting to 0 for now as bruno config does not yet support inherit for timeout
+      // update this when bruno config supports inherit for timeout
+      ocRequest.settings.timeout = 0;
+    }
+
+    if (httpSettings?.followRedirects === true) {
+      ocRequest.settings.followRedirects = true;
+    } else if (httpSettings?.followRedirects === false) {
+      ocRequest.settings.followRedirects = false;
+    } else {
+      // todo: we are defaulting to true for now as bruno config does not yet support inherit for followRedirects
+      // update this when bruno config supports inherit for followRedirects
+      ocRequest.settings.followRedirects = true;
+    }
+
+    const maxRedirects = httpSettings?.maxRedirects;
+    if (isNumber(maxRedirects)) {
+      ocRequest.settings.maxRedirects = maxRedirects;
+    } else {
+      // todo: we are defaulting to 5 for now as bruno config does not yet support inherit for maxRedirects
+      // update this when bruno config supports inherit for maxRedirects
+      ocRequest.settings.maxRedirects = 5;
+    }
+
+    // tags
+    if (item.tags?.length) {
+      ocRequest.tags = item.tags;
+    }
+
+    return stringifyYml(ocRequest);
+  } catch (error) {
+    console.error('Error stringifying GraphQL request:', error);
+    throw error;
+  }
+};
+
+export default stringifyGraphQLRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyGrpcRequest.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyGrpcRequest.ts
new file mode 100644
index 000000000..a0557eba7
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyGrpcRequest.ts
@@ -0,0 +1,123 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { KeyValue as BrunoKeyValue } from '@usebruno/schema-types/common/key-value';
+import type { GrpcRequest as BrunoGrpcRequest } from '@usebruno/schema-types/requests/grpc';
+import type { GrpcRequest, GrpcMetadata, GrpcMessage, GrpcMessageVariant } from '@opencollection/types/requests/grpc';
+import type { Auth } from '@opencollection/types/common/auth';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Assertion } from '@opencollection/types/common/assertions';
+import { stringifyYml } from '../utils';
+import { isNonEmptyString } from '../../../utils';
+import { toOpenCollectionAuth } from '../common/auth';
+import { toOpenCollectionVariables } from '../common/variables';
+import { toOpenCollectionScripts } from '../common/scripts';
+import { toOpenCollectionAssertions } from '../common/assertions';
+
+const stringifyGrpcRequest = (item: BrunoItem): string => {
+  try {
+    const ocRequest: GrpcRequest = {
+      type: 'grpc'
+    };
+
+    ocRequest.name = isNonEmptyString(item.name) ? item.name : 'Untitled Request';
+
+    // sequence
+    if (item.seq) {
+      ocRequest.seq = item.seq;
+    }
+
+    const brunoRequest = item.request as BrunoGrpcRequest;
+    // url and method
+    ocRequest.url = isNonEmptyString(brunoRequest.url) ? brunoRequest.url : '';
+    ocRequest.method = isNonEmptyString(brunoRequest.method) ? brunoRequest.method : '';
+
+    // method type
+    if (brunoRequest.methodType) {
+      ocRequest.methodType = brunoRequest.methodType;
+    }
+
+    // proto file path
+    if (isNonEmptyString(brunoRequest.protoPath)) {
+      ocRequest.protoFilePath = brunoRequest.protoPath;
+    }
+
+    // metadata
+    if (brunoRequest.headers?.length) {
+      const metadata: GrpcMetadata[] = brunoRequest.headers.map((header: BrunoKeyValue) => {
+        const metadataItem: GrpcMetadata = {
+          name: header.name || '',
+          value: header.value || ''
+        };
+
+        if (header?.description?.trim().length) {
+          metadataItem.description = header.description;
+        }
+
+        if (header.enabled === false) {
+          metadataItem.disabled = true;
+        }
+
+        return metadataItem;
+      });
+
+      if (metadata.length) {
+        ocRequest.metadata = metadata;
+      }
+    }
+
+    // message
+    if (brunoRequest.body?.mode === 'grpc' && brunoRequest.body.grpc?.length) {
+      const messages = brunoRequest.body.grpc;
+
+      // todo: bruno app supports only one message for now
+      // update this when bruno app supports multiple messages
+      if (messages.length) {
+        const message: GrpcMessage = messages[0].content || '';
+        if (message.trim().length) {
+          ocRequest.message = message;
+        }
+      }
+    }
+
+    // auth
+    const auth: Auth | undefined = toOpenCollectionAuth(brunoRequest.auth);
+    if (auth) {
+      ocRequest.auth = auth;
+    }
+
+    // scripts
+    const scripts: Scripts | undefined = toOpenCollectionScripts(brunoRequest);
+    if (scripts) {
+      ocRequest.scripts = scripts;
+    }
+
+    // variables
+    const variables: Variable[] | undefined = toOpenCollectionVariables(brunoRequest.vars);
+    if (variables) {
+      ocRequest.variables = variables;
+    }
+
+    // assertions
+    const assertions: Assertion[] | undefined = toOpenCollectionAssertions(brunoRequest.assertions);
+    if (assertions) {
+      ocRequest.assertions = assertions;
+    }
+
+    // docs
+    if (isNonEmptyString(brunoRequest.docs)) {
+      ocRequest.docs = brunoRequest.docs;
+    }
+
+    // tags
+    if (item.tags?.length) {
+      ocRequest.tags = item.tags;
+    }
+
+    return stringifyYml(ocRequest);
+  } catch (error) {
+    console.error('Error stringifying gRPC request:', error);
+    throw error;
+  }
+};
+
+export default stringifyGrpcRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyHttpRequest.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyHttpRequest.ts
new file mode 100644
index 000000000..c743f3527
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyHttpRequest.ts
@@ -0,0 +1,201 @@
+import type { Item as BrunoItem, HttpItemSettings as BrunoHttpItemSettings } from '@usebruno/schema-types/collection/item';
+import type { HttpRequest as BrunoHttpRequest } from '@usebruno/schema-types/requests/http';
+import type { HttpRequest, HttpRequestSettings, HttpRequestExample } from '@opencollection/types/requests/http';
+import type { Auth } from '@opencollection/types/common/auth';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Assertion } from '@opencollection/types/common/assertions';
+import type { HttpRequestParam, HttpHeader, HttpRequestBody } from '@opencollection/types/requests/http';
+import { stringifyYml } from '../utils';
+import { toOpenCollectionAuth } from '../common/auth';
+import { toOpenCollectionHttpHeaders } from '../common/headers';
+import { toOpenCollectionParams } from '../common/params';
+import { toOpenCollectionBody } from '../common/body';
+import { toOpenCollectionVariables } from '../common/variables';
+import { toOpenCollectionScripts } from '../common/scripts';
+import { toOpenCollectionAssertions } from '../common/assertions';
+import { isNumber, isNonEmptyString } from '../../../utils';
+
+const stringifyHttpRequest = (item: BrunoItem): string => {
+  try {
+    const ocRequest: HttpRequest = {
+      type: 'http'
+    };
+
+    ocRequest.name = isNonEmptyString(item.name) ? item.name : 'Untitled Request';
+
+    // sequence
+    if (item.seq) {
+      ocRequest.seq = item.seq;
+    }
+
+    const brunoRequest = item.request as BrunoHttpRequest;
+    // url and method
+    ocRequest.url = isNonEmptyString(brunoRequest.url) ? brunoRequest.url : '';
+    ocRequest.method = isNonEmptyString(brunoRequest.method) ? brunoRequest.method : 'GET';
+
+    // headers
+    const headers: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(brunoRequest.headers);
+    if (headers) {
+      ocRequest.headers = headers;
+    }
+
+    // params
+    const params: HttpRequestParam[] | undefined = toOpenCollectionParams(brunoRequest.params);
+    if (params) {
+      ocRequest.params = params;
+    }
+
+    // body
+    const body: HttpRequestBody | undefined = toOpenCollectionBody(brunoRequest.body);
+    if (body) {
+      ocRequest.body = body;
+    }
+
+    // auth
+    const auth: Auth | undefined = toOpenCollectionAuth(brunoRequest.auth);
+    if (auth) {
+      ocRequest.auth = auth;
+    }
+
+    // scripts
+    const scripts: Scripts | undefined = toOpenCollectionScripts(brunoRequest);
+    if (scripts) {
+      ocRequest.scripts = scripts;
+    }
+
+    // variables
+    const variables: Variable[] | undefined = toOpenCollectionVariables(brunoRequest.vars);
+    if (variables) {
+      ocRequest.variables = variables;
+    }
+
+    // assertions
+    const assertions: Assertion[] | undefined = toOpenCollectionAssertions(brunoRequest.assertions);
+    if (assertions) {
+      ocRequest.assertions = assertions;
+    }
+
+    // docs
+    if (isNonEmptyString(brunoRequest.docs)) {
+      ocRequest.docs = brunoRequest.docs;
+    }
+
+    // settings
+    const httpSettings = item.settings as BrunoHttpItemSettings | undefined;
+    ocRequest.settings = {} as HttpRequestSettings;
+    if (httpSettings?.encodeUrl === true) {
+      ocRequest.settings.encodeUrl = true;
+    } else if (httpSettings?.encodeUrl === false) {
+      ocRequest.settings.encodeUrl = false;
+    } else {
+      // todo: we are defaulting to true for now as bruno config does not yet support inherit for encodeUrl
+      // update this when bruno config supports inherit for encodeUrl
+      ocRequest.settings.encodeUrl = true;
+    }
+
+    const timeout = httpSettings?.timeout;
+    if (isNumber(timeout)) {
+      ocRequest.settings.timeout = timeout;
+    } else {
+      // todo: we are defaulting to 0 for now as bruno config does not yet support inherit for timeout
+      // update this when bruno config supports inherit for timeout
+      ocRequest.settings.timeout = 0;
+    }
+
+    if (httpSettings?.followRedirects === true) {
+      ocRequest.settings.followRedirects = true;
+    } else if (httpSettings?.followRedirects === false) {
+      ocRequest.settings.followRedirects = false;
+    } else {
+      // todo: we are defaulting to true for now as bruno config does not yet support inherit for followRedirects
+      // update this when bruno config supports inherit for followRedirects
+      ocRequest.settings.followRedirects = true;
+    }
+
+    const maxRedirects = httpSettings?.maxRedirects;
+    if (isNumber(maxRedirects)) {
+      ocRequest.settings.maxRedirects = maxRedirects;
+    } else {
+      // todo: we are defaulting to 5 for now as bruno config does not yet support inherit for maxRedirects
+      // update this when bruno config supports inherit for maxRedirects
+      ocRequest.settings.maxRedirects = 5;
+    }
+
+    // tags
+    if (item.tags?.length) {
+      ocRequest.tags = item.tags;
+    }
+
+    // examples
+    if (item.examples?.length) {
+      const examples: HttpRequestExample[] = item.examples.map((example) => {
+        const ocExample: HttpRequestExample = {};
+        ocExample.name = example?.name || 'Untitled Example';
+
+        if (isNonEmptyString(example.description)) {
+          ocExample.description = example.description;
+        }
+
+        if (example.request) {
+          ocExample.request = {};
+          ocExample.request.url = example.request.url || '';
+          ocExample.request.method = example.request.method || 'GET';
+
+          const exampleHeaders = toOpenCollectionHttpHeaders(example.request.headers);
+          if (exampleHeaders) {
+            ocExample.request.headers = exampleHeaders;
+          }
+
+          const exampleParams = toOpenCollectionParams(example.request.params);
+          if (exampleParams) {
+            ocExample.request.params = exampleParams;
+          }
+
+          const exampleBody = toOpenCollectionBody(example.request.body);
+          if (exampleBody !== undefined) {
+            ocExample.request.body = exampleBody;
+          }
+        }
+
+        if (example.response) {
+          ocExample.response = {};
+
+          if (example.response.status !== undefined && example.response.status !== null && isNumber(example.response.status)) {
+            ocExample.response.status = Number(example.response.status);
+          }
+
+          if (isNonEmptyString(example.response.statusText)) {
+            ocExample.response.statusText = example.response.statusText;
+          }
+
+          const responseHeaders = toOpenCollectionHttpHeaders(example.response.headers);
+          if (responseHeaders) {
+            ocExample.response.headers = responseHeaders;
+          }
+
+          if (example.response.body && example.response.body.type && example.response.body.content !== undefined) {
+            ocExample.response.body = {
+              type: example.response.body.type as 'json' | 'text' | 'xml' | 'html' | 'binary',
+              data: String(example.response.body.content || '')
+            };
+          }
+        }
+
+        return ocExample;
+      });
+
+      // examples
+      if (examples?.length) {
+        ocRequest.examples = examples;
+      }
+    }
+
+    return stringifyYml(ocRequest);
+  } catch (error) {
+    console.error('Error stringifying HTTP request:', error);
+    throw error;
+  }
+};
+
+export default stringifyHttpRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyScript.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyScript.ts
new file mode 100644
index 000000000..c56e838d7
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyScript.ts
@@ -0,0 +1,22 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { Script } from '@opencollection/types/collection/item';
+import { stringifyYml } from '../utils';
+
+const stringifyScript = (item: BrunoItem): string => {
+  try {
+    const ocScript: Script = {
+      type: 'script'
+    };
+
+    if (item.fileContent?.trim().length) {
+      ocScript.script = item.fileContent;
+    }
+
+    return stringifyYml(ocScript);
+  } catch (error) {
+    console.error('Error stringifying script:', error);
+    throw error;
+  }
+};
+
+export default stringifyScript;
diff --git a/packages/bruno-filestore/src/formats/yml/items/stringifyWebsocketRequest.ts b/packages/bruno-filestore/src/formats/yml/items/stringifyWebsocketRequest.ts
new file mode 100644
index 000000000..d0a090c44
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/items/stringifyWebsocketRequest.ts
@@ -0,0 +1,91 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { WebSocketRequest as BrunoWebSocketRequest } from '@usebruno/schema-types/requests/websocket';
+import type { WebSocketRequest, WebSocketMessage, WebSocketMessageVariant } from '@opencollection/types/requests/websocket';
+import type { Auth } from '@opencollection/types/common/auth';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { HttpHeader } from '@opencollection/types/requests/http';
+import { stringifyYml } from '../utils';
+import { isNonEmptyString } from '../../../utils';
+import { toOpenCollectionAuth } from '../common/auth';
+import { toOpenCollectionHttpHeaders } from '../common/headers';
+import { toOpenCollectionVariables } from '../common/variables';
+import { toOpenCollectionScripts } from '../common/scripts';
+
+const stringifyWebsocketRequest = (item: BrunoItem): string => {
+  try {
+    const ocRequest: WebSocketRequest = {
+      type: 'websocket'
+    };
+
+    ocRequest.name = isNonEmptyString(item.name) ? item.name : 'Untitled Request';
+
+    // sequence
+    if (item.seq) {
+      ocRequest.seq = item.seq;
+    }
+
+    const brunoRequest = item.request as BrunoWebSocketRequest;
+    // url
+    ocRequest.url = isNonEmptyString(brunoRequest.url) ? brunoRequest.url : '';
+
+    // headers
+    const headers: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(brunoRequest.headers);
+    if (headers) {
+      ocRequest.headers = headers;
+    }
+
+    // message
+    if (brunoRequest.body?.mode === 'ws' && brunoRequest.body.ws?.length) {
+      const messages = brunoRequest.body.ws;
+
+      // todo: bruno app supports only one message for now
+      // update this when bruno app supports multiple messages
+      if (messages.length) {
+        const msg = messages[0];
+        const message: WebSocketMessage = {
+          type: (msg.type as 'text' | 'json' | 'xml' | 'binary') || 'text',
+          data: msg.content || ''
+        };
+        if (message.data.trim().length) {
+          ocRequest.message = message;
+        }
+      }
+    }
+
+    // auth
+    const auth: Auth | undefined = toOpenCollectionAuth(brunoRequest.auth);
+    if (auth) {
+      ocRequest.auth = auth;
+    }
+
+    // scripts
+    const scripts: Scripts | undefined = toOpenCollectionScripts(brunoRequest);
+    if (scripts) {
+      ocRequest.scripts = scripts;
+    }
+
+    // variables
+    const variables: Variable[] | undefined = toOpenCollectionVariables(brunoRequest.vars);
+    if (variables) {
+      ocRequest.variables = variables;
+    }
+
+    // docs
+    if (isNonEmptyString(brunoRequest.docs)) {
+      ocRequest.docs = brunoRequest.docs;
+    }
+
+    // tags
+    if (item.tags?.length) {
+      ocRequest.tags = item.tags;
+    }
+
+    return stringifyYml(ocRequest);
+  } catch (error) {
+    console.error('Error stringifying WebSocket request:', error);
+    throw error;
+  }
+};
+
+export default stringifyWebsocketRequest;
diff --git a/packages/bruno-filestore/src/formats/yml/parseCollection.ts b/packages/bruno-filestore/src/formats/yml/parseCollection.ts
new file mode 100644
index 000000000..6c411fb6c
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/parseCollection.ts
@@ -0,0 +1,177 @@
+import type { OpenCollection } from '@opencollection/types';
+import type { FolderRoot } from '@usebruno/schema-types/collection/folder';
+import { parseYml } from './utils';
+import { toBrunoAuth } from './common/auth';
+import { toBrunoHttpHeaders } from './common/headers';
+import { toBrunoVariables } from './common/variables';
+import { toBrunoScripts } from './common/scripts';
+
+interface ParsedCollection {
+  collectionRoot: FolderRoot;
+  brunoConfig: Record<string, any>;
+}
+
+const parseCollection = (ymlString: string): ParsedCollection => {
+  try {
+    const oc: OpenCollection = parseYml(ymlString);
+
+    // bruno config
+    const brunoConfig: Record<string, any> = {
+      opencollection: oc.opencollection || '1.0.0',
+      name: oc.info?.name || 'Untitled Collection',
+      type: 'collection',
+      ignore: []
+    };
+    if (oc.extensions?.ignore && Array.isArray(oc.extensions.ignore)) {
+      brunoConfig.ignore = oc.extensions.ignore;
+    }
+
+    // protobuf
+    if (oc.config?.protobuf) {
+      brunoConfig.protobuf = {
+        protofFiles: oc.config.protobuf.protoFiles?.map((protoFile: any) => ({
+          path: protoFile.path
+        })) || [],
+        importPaths: oc.config.protobuf.importPaths?.map((importPath: any) => ({
+          path: importPath.path,
+          disabled: importPath.disabled || false
+        })) || []
+      };
+    }
+
+    // proxy
+    brunoConfig.proxy = {
+      enabled: false,
+      protocol: '',
+      hostname: '',
+      port: '',
+      auth: {
+        enabled: false,
+        username: '',
+        password: ''
+      }
+    };
+
+    if (oc.config?.proxy) {
+      if (oc.config.proxy === 'inherit') {
+        brunoConfig.proxy.enabled = 'global';
+      } else if (typeof oc.config.proxy === 'object') {
+        brunoConfig.proxy = {
+          enabled: true,
+          protocol: oc.config.proxy.protocol || '',
+          hostname: oc.config.proxy.hostname || '',
+          port: oc.config.proxy.port || '',
+          auth: {
+            enabled: false,
+            username: '',
+            password: ''
+          }
+        };
+
+        if (oc.config.proxy.auth && typeof oc.config.proxy.auth === 'object') {
+          brunoConfig.proxy.auth = {
+            enabled: true,
+            username: oc.config.proxy.auth.username || '',
+            password: oc.config.proxy.auth.password || ''
+          };
+        }
+      }
+    }
+
+    // client certificates
+    if (oc.config?.clientCertificates?.length) {
+      brunoConfig.clientCertificates = {
+        certs: oc.config.clientCertificates.map((cert: any) => {
+          if (cert.type === 'pem') {
+            return {
+              domain: cert.domain,
+              type: 'cert',
+              certFilePath: cert.certificateFilePath,
+              keyFilePath: cert.privateKeyFilePath,
+              passphrase: cert.passphrase || ''
+            };
+          } else if (cert.type === 'pkcs12') {
+            return {
+              domain: cert.domain,
+              type: 'pfx',
+              pfxFilePath: cert.pkcs12FilePath,
+              passphrase: cert.passphrase || ''
+            };
+          }
+          return null;
+        }).filter((cert: any) => cert !== null)
+      };
+    }
+
+    // collection root
+    const collectionRoot: FolderRoot = {
+      meta: null,
+      request: null,
+      docs: null
+    };
+
+    // request defaults
+    if (oc.request) {
+      collectionRoot.request = {
+        headers: null,
+        auth: null,
+        script: {
+          req: null,
+          res: null
+        },
+        vars: {
+          req: [],
+          res: []
+        },
+        tests: null
+      };
+
+      // headers
+      const headers = toBrunoHttpHeaders(oc.request.headers);
+      collectionRoot.request.headers = headers || [];
+
+      // auth
+      const auth = toBrunoAuth(oc.request.auth);
+      if (auth) {
+        collectionRoot.request.auth = auth;
+      }
+
+      // variables
+      const variables = toBrunoVariables(oc.request.variables);
+      collectionRoot.request.vars = variables;
+
+      // scripts
+      const scripts = toBrunoScripts(oc.request.scripts);
+      if (scripts?.script && collectionRoot.request.script) {
+        if (scripts.script.req) {
+          collectionRoot.request.script.req = scripts.script.req;
+        }
+        if (scripts.script.res) {
+          collectionRoot.request.script.res = scripts.script.res;
+        }
+      }
+      if (scripts?.tests) {
+        collectionRoot.request.tests = scripts.tests;
+      }
+    }
+
+    // docs
+    if (oc.docs) {
+      if (typeof oc.docs === 'string') {
+        collectionRoot.docs = oc.docs;
+      } else if (typeof oc.docs === 'object' && oc.docs.content) {
+        collectionRoot.docs = oc.docs.content;
+      }
+    }
+
+    return {
+      collectionRoot,
+      brunoConfig
+    };
+  } catch (error) {
+    console.error('Error parsing collection:', error);
+    throw error;
+  }
+};
+
+export default parseCollection;
diff --git a/packages/bruno-filestore/src/formats/yml/parseEnvironment.ts b/packages/bruno-filestore/src/formats/yml/parseEnvironment.ts
new file mode 100644
index 000000000..412a0bc2f
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/parseEnvironment.ts
@@ -0,0 +1,42 @@
+import type { Environment as BrunoEnvironment, EnvironmentVariable as BrunoEnvironmentVariable } from '@usebruno/schema-types/collection/environment';
+import type { Environment } from '@opencollection/types/config/environments';
+import type { Variable } from '@opencollection/types/common/variables';
+import { parseYml } from './utils';
+import { uuid } from '../../utils';
+
+const toBrunoEnvironmentVariables = (variables: Variable[] | null | undefined): BrunoEnvironmentVariable[] => {
+  if (!variables?.length) {
+    return [];
+  }
+
+  return variables.map((v: Variable): BrunoEnvironmentVariable => {
+    const variable: BrunoEnvironmentVariable = {
+      uid: uuid(),
+      name: v.name || '',
+      value: v.value as string || '',
+      type: 'text',
+      enabled: v.disabled !== true,
+      secret: v.transient === true
+    };
+    return variable;
+  });
+};
+
+const parseEnvironment = (ymlString: string): BrunoEnvironment => {
+  try {
+    const ocEnvironment: Environment = parseYml(ymlString);
+
+    const brunoEnvironment: BrunoEnvironment = {
+      uid: uuid(),
+      name: ocEnvironment.name || 'Untitled Environment',
+      variables: toBrunoEnvironmentVariables(ocEnvironment.variables)
+    };
+
+    return brunoEnvironment;
+  } catch (error) {
+    console.error('Error parsing environment:', error);
+    throw error;
+  }
+};
+
+export default parseEnvironment;
diff --git a/packages/bruno-filestore/src/formats/yml/parseFolder.ts b/packages/bruno-filestore/src/formats/yml/parseFolder.ts
new file mode 100644
index 000000000..40858c5cc
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/parseFolder.ts
@@ -0,0 +1,82 @@
+import type { FolderRoot } from '@usebruno/schema-types/collection/folder';
+import type { Folder } from '@opencollection/types/collection/item';
+import { parseYml } from './utils';
+import { toBrunoAuth } from './common/auth';
+import { toBrunoHttpHeaders } from './common/headers';
+import { toBrunoVariables } from './common/variables';
+import { toBrunoScripts } from './common/scripts';
+import { isNonEmptyString } from '../../utils';
+
+const parseFolder = (ymlString: string): FolderRoot => {
+  try {
+    const ocFolder: Folder = parseYml(ymlString);
+
+    const folderRoot: FolderRoot = {
+      meta: {
+        name: ocFolder.name || 'Untitled Folder',
+        seq: ocFolder.seq || 1
+      },
+      request: null,
+      docs: null
+    };
+
+    // request defaults
+    if (ocFolder.request) {
+      folderRoot.request = {
+        headers: [],
+        auth: null,
+        script: {
+          req: null,
+          res: null
+        },
+        vars: {
+          req: [],
+          res: []
+        },
+        tests: null
+      };
+
+      // headers
+      const headers = toBrunoHttpHeaders(ocFolder.request.headers);
+      if (headers) {
+        folderRoot.request.headers = headers;
+      }
+
+      // auth
+      const auth = toBrunoAuth(ocFolder.request.auth);
+      if (auth) {
+        folderRoot.request.auth = auth;
+      }
+
+      // variables
+      const variables = toBrunoVariables(ocFolder.request.variables);
+      folderRoot.request.vars = variables;
+
+      // scripts
+      const scripts = toBrunoScripts(ocFolder.request.scripts);
+      if (scripts?.script && folderRoot.request.script) {
+        if (scripts.script.req) {
+          folderRoot.request.script.req = scripts.script.req;
+        }
+        if (scripts.script.res) {
+          folderRoot.request.script.res = scripts.script.res;
+        }
+      }
+      if (scripts?.tests) {
+        folderRoot.request.tests = scripts.tests;
+      }
+    }
+
+    // docs
+    if (isNonEmptyString(ocFolder.docs)) {
+      folderRoot.docs = ocFolder.docs;
+    }
+
+    return folderRoot;
+  } catch (error) {
+    console.error('Error parsing folder:', error);
+    throw error;
+  }
+};
+
+export default parseFolder;
diff --git a/packages/bruno-filestore/src/formats/yml/parseItem.ts b/packages/bruno-filestore/src/formats/yml/parseItem.ts
new file mode 100644
index 000000000..db70a6a92
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/parseItem.ts
@@ -0,0 +1,46 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import type { Item } from '@opencollection/types/collection/item';
+import { parseYml } from './utils';
+import parseHttpRequest from './items/parseHttpRequest';
+import parseGraphQLRequest from './items/parseGraphQLRequest';
+import parseGrpcRequest from './items/parseGrpcRequest';
+import parseWebsocketRequest from './items/parseWebsocketRequest';
+import parseScript from './items/parseScript';
+
+const parseItem = (ymlString: string): BrunoItem => {
+  try {
+    const ocItem: Item = parseYml(ymlString);
+
+    if (!ocItem || !ocItem.type) {
+      throw new Error('Invalid item: missing type');
+    }
+
+    switch (ocItem.type) {
+      case 'http':
+        return parseHttpRequest(ocItem);
+
+      case 'graphql':
+        return parseGraphQLRequest(ocItem);
+
+      case 'grpc':
+        return parseGrpcRequest(ocItem);
+
+      case 'websocket':
+        return parseWebsocketRequest(ocItem);
+
+      case 'script':
+        return parseScript(ocItem);
+
+      case 'folder':
+        throw new Error('Folder items should be handled separately using parseFolder');
+
+      default:
+        throw new Error(`Unsupported item type: ${(ocItem as any).type}`);
+    }
+  } catch (error) {
+    console.error('Error parsing item:', error);
+    throw error;
+  }
+};
+
+export default parseItem;
diff --git a/packages/bruno-filestore/src/formats/yml/stringifyCollection.ts b/packages/bruno-filestore/src/formats/yml/stringifyCollection.ts
new file mode 100644
index 000000000..2c08446e9
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/stringifyCollection.ts
@@ -0,0 +1,190 @@
+import type { OpenCollection } from '@opencollection/types';
+import type { ProtoFileItem, ProtoFileImportPath } from '@opencollection/types/config/protobuf';
+import type { HttpHeader } from '@opencollection/types/requests/http';
+import type { ClientCertificate, PemCertificate, Pkcs12Certificate } from '@opencollection/types/config/certificates';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import { stringifyYml } from './utils';
+import { toOpenCollectionAuth } from './common/auth';
+import { toOpenCollectionHttpHeaders } from './common/headers';
+import { toOpenCollectionVariables } from './common/variables';
+import { toOpenCollectionScripts } from './common/scripts';
+import type { Auth } from '@opencollection/types/common/auth';
+
+const hasCollectionConfig = (brunoConfig: any): boolean => {
+  // protobuf
+  const hasProtobuf = (
+    brunoConfig.protobuf?.protofFiles?.length > 0
+    || brunoConfig.protobuf?.importPaths?.length > 0
+  );
+
+  // proxy
+  const hasProxy = !!brunoConfig.proxy?.enabled;
+
+  // client certificates
+  const hasClientCertificates = brunoConfig.clientCertificates?.certs?.length > 0;
+
+  return hasProtobuf || hasProxy || hasClientCertificates;
+};
+
+const hasRequestDefaults = (collectionRoot: any): boolean => {
+  const requestRoot = collectionRoot?.request;
+
+  return Boolean((requestRoot?.headers?.length)
+    || (requestRoot?.vars?.req?.length)
+    || hasRequestScripts(collectionRoot)
+    || hasRequestAuth(collectionRoot));
+};
+
+const hasRequestAuth = (collectionRoot: any): boolean => {
+  return Boolean((collectionRoot.request?.auth?.mode !== 'none'));
+};
+
+const hasRequestScripts = (collectionRoot: any): boolean => {
+  return (collectionRoot.request?.script?.req)
+    || (collectionRoot.request?.script?.res)
+    || (collectionRoot.request?.tests);
+};
+
+const stringifyCollection = (collectionRoot: any, brunoConfig: any): string => {
+  try {
+    const oc: OpenCollection = {};
+
+    oc.info = {
+      name: brunoConfig.name || 'Untitled Collection'
+    };
+    oc.opencollection = '1.0.0';
+
+    // collection config
+    if (hasCollectionConfig(brunoConfig)) {
+      oc.config = {};
+
+      if (brunoConfig.protobuf?.protofFiles?.length) {
+        oc.config.protobuf = {
+          protoFiles: brunoConfig.protobuf.protofFiles.map((protoFile: any): ProtoFileItem => ({
+            type: 'file' as const,
+            path: protoFile.path
+          })),
+          importPaths: brunoConfig.protobuf.importPaths.map((importPath: any): ProtoFileImportPath => ({
+            path: importPath.path,
+            disabled: importPath.disabled
+          }))
+        };
+      }
+
+      // proxy
+      if (brunoConfig.proxy?.enabled) {
+        if (brunoConfig.proxy.enabled === 'global') {
+          oc.config.proxy = 'inherit';
+        } else {
+          oc.config.proxy = {
+            protocol: brunoConfig.proxy.protocol,
+            hostname: brunoConfig.proxy.hostname,
+            port: brunoConfig.proxy.port
+          };
+
+          if (brunoConfig.proxy.auth?.enabled) {
+            oc.config.proxy.auth = {
+              username: brunoConfig.proxy.auth.username,
+              password: brunoConfig.proxy.auth.password
+            };
+          }
+        }
+      }
+
+      // client certificates
+      if (brunoConfig.clientCertificates?.certs?.length) {
+        oc.config.clientCertificates = brunoConfig.clientCertificates.certs
+          .map((cert: any): ClientCertificate | null => {
+            if (cert.type === 'pem') {
+              const pemCert: PemCertificate = {
+                domain: cert.domain,
+                type: 'pem',
+                certificateFilePath: cert.certFilePath,
+                privateKeyFilePath: cert.keyFilePath,
+                ...(cert.passphrase && { passphrase: cert.passphrase })
+              };
+              return pemCert;
+            } else if (cert.type === 'pkcs12') {
+              const pkcs12Cert: Pkcs12Certificate = {
+                domain: cert.domain,
+                type: 'pkcs12',
+                pkcs12FilePath: cert.pfxFilePath,
+                ...(cert.passphrase && { passphrase: cert.passphrase })
+              };
+              return pkcs12Cert;
+            } else {
+              // Unsupported certificate type - ignore silently
+              return null;
+            }
+          })
+          .filter((cert: ClientCertificate | null): cert is ClientCertificate => cert !== null);
+      }
+    }
+
+    // request defaults
+    if (hasRequestDefaults(collectionRoot)) {
+      oc.request = {};
+
+      // headers
+      if (collectionRoot.request?.headers?.length) {
+        const ocHeaders: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(collectionRoot.request?.headers);
+        if (ocHeaders) {
+          oc.request.headers = ocHeaders;
+        }
+      }
+
+      // auth
+      if (hasRequestAuth(collectionRoot)) {
+        const ocAuth: Auth | undefined = toOpenCollectionAuth(collectionRoot.request?.auth);
+        if (ocAuth) {
+          oc.request.auth = ocAuth;
+        }
+      }
+
+      // variables
+      if (collectionRoot.request?.vars?.req?.length) {
+        const ocVariables: Variable[] | undefined = toOpenCollectionVariables(collectionRoot.request?.vars);
+        if (ocVariables) {
+          oc.request.variables = ocVariables;
+        }
+      }
+
+      // scripts
+      if (hasRequestScripts(collectionRoot)) {
+        const ocScripts: Scripts | undefined = toOpenCollectionScripts(collectionRoot.request);
+        if (ocScripts) {
+          oc.request.scripts = ocScripts;
+        }
+      }
+    }
+
+    // docs
+    if (collectionRoot.docs?.trim().length) {
+      oc.docs = {
+        content: collectionRoot.docs,
+        type: 'text/markdown'
+      };
+    }
+
+    // bundled
+    oc.bundled = false;
+
+    // extensions
+    oc.extensions = {};
+    if (brunoConfig.ignore?.length) {
+      const ignoreList: string[] = [];
+      brunoConfig.ignore.forEach((ignore: string) => {
+        ignoreList.push(ignore);
+      });
+      oc.extensions.ignore = ignoreList;
+    }
+
+    return stringifyYml(oc);
+  } catch (error) {
+    console.error('Error stringifying opencollection.yml:', error);
+    throw error;
+  }
+};
+
+export default stringifyCollection;
diff --git a/packages/bruno-filestore/src/formats/yml/stringifyEnvironment.ts b/packages/bruno-filestore/src/formats/yml/stringifyEnvironment.ts
new file mode 100644
index 000000000..9486656ec
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/stringifyEnvironment.ts
@@ -0,0 +1,57 @@
+import type { Environment as BrunoEnvironment, EnvironmentVariable as BrunoEnvironmentVariable } from '@usebruno/schema-types/collection/environment';
+import type { Environment } from '@opencollection/types/config/environments';
+import type { Variable } from '@opencollection/types/common/variables';
+import { stringifyYml } from './utils';
+
+const toOpenCollectionEnvironmentVariables = (variables: BrunoEnvironmentVariable[]): Variable[] | undefined => {
+  if (!variables?.length) {
+    return undefined;
+  }
+
+  const ocVariables: Variable[] = variables
+    .filter((v: BrunoEnvironmentVariable) => {
+      // todo: currently neithwe bru lang nor bruno app supports non-string values
+      // update this when bruno app supports non-string values
+      return typeof v.value === 'string';
+    })
+    .map((v: BrunoEnvironmentVariable): Variable => {
+      const variable: Variable = {
+        name: v.name || '',
+        value: v.value as string
+      };
+
+      if (v.enabled === false) {
+        variable.disabled = true;
+      }
+
+      if (v.secret === true) {
+        variable.transient = true;
+      }
+
+      return variable;
+    });
+
+  return ocVariables.length > 0 ? ocVariables : undefined;
+};
+
+const stringifyEnvironment = (environment: BrunoEnvironment): string => {
+  try {
+    const ocEnvironment: Environment = {
+      name: environment.name
+    };
+
+    // Convert variables if they exist
+    if (environment.variables?.length) {
+      const ocVariables = toOpenCollectionEnvironmentVariables(environment.variables);
+      if (ocVariables) {
+        ocEnvironment.variables = ocVariables;
+      }
+    }
+
+    return stringifyYml(ocEnvironment);
+  } catch (error) {
+    console.error('Error stringifying environment:', error);
+    throw error;
+  }
+};
+export default stringifyEnvironment;
diff --git a/packages/bruno-filestore/src/formats/yml/stringifyFolder.ts b/packages/bruno-filestore/src/formats/yml/stringifyFolder.ts
new file mode 100644
index 000000000..2210551e1
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/stringifyFolder.ts
@@ -0,0 +1,92 @@
+import type { FolderRoot } from '@usebruno/schema-types/collection/folder';
+import type { Folder } from '@opencollection/types/collection/item';
+import type { Variable } from '@opencollection/types/common/variables';
+import type { Scripts } from '@opencollection/types/common/scripts';
+import type { Auth, HttpHeader } from '@opencollection/types/requests/http';
+import type { RequestDefaults } from '@opencollection/types/common/request-defaults';
+import { toOpenCollectionAuth } from './common/auth';
+import { toOpenCollectionHttpHeaders } from './common/headers';
+import { toOpenCollectionVariables } from './common/variables';
+import { toOpenCollectionScripts } from './common/scripts';
+import { stringifyYml } from './utils';
+
+const hasRequestDefaults = (folderRoot: FolderRoot): boolean => {
+  const requestDefaults = folderRoot?.request;
+
+  return Boolean((requestDefaults?.headers?.length)
+    || (requestDefaults?.vars?.req?.length)
+    || hasRequestScripts(folderRoot)
+    || hasRequestAuth(folderRoot));
+};
+
+const hasRequestAuth = (folderRoot: FolderRoot): boolean => {
+  return Boolean((folderRoot.request?.auth?.mode !== 'none'));
+};
+
+const hasRequestScripts = (folderRoot: FolderRoot): boolean => {
+  return Boolean((folderRoot.request?.script?.req)
+    || (folderRoot.request?.script?.res)
+    || (folderRoot.request?.tests));
+};
+
+const stringifyFolder = (folderRoot: FolderRoot): string => {
+  try {
+    const ocFolder: Folder = {
+      type: 'folder'
+    };
+
+    ocFolder.name = folderRoot.meta?.name || 'Untitled Folder';
+    ocFolder.seq = folderRoot.meta?.seq || 1;
+
+    // request defaults
+    if (hasRequestDefaults(folderRoot)) {
+      ocFolder.request = {} as RequestDefaults;
+
+      // headers
+      if (folderRoot.request?.headers?.length) {
+        const ocHeaders: HttpHeader[] | undefined = toOpenCollectionHttpHeaders(folderRoot.request?.headers);
+        if (ocHeaders) {
+          ocFolder.request.headers = ocHeaders;
+        }
+      }
+
+      // auth
+      if (hasRequestAuth(folderRoot)) {
+        const ocAuth: Auth | undefined = toOpenCollectionAuth(folderRoot.request?.auth);
+        if (ocAuth) {
+          ocFolder.request.auth = ocAuth;
+        }
+      }
+
+      // variables
+      if (folderRoot.request?.vars?.req?.length) {
+        const ocVariables: Variable[] | undefined = toOpenCollectionVariables(folderRoot.request?.vars);
+        if (ocVariables) {
+          ocFolder.request.variables = ocVariables;
+        }
+      }
+
+      // scripts
+      if (hasRequestScripts(folderRoot)) {
+        const ocScripts: Scripts | undefined = toOpenCollectionScripts(folderRoot?.request);
+        if (ocScripts) {
+          ocFolder.request.scripts = ocScripts;
+        }
+      }
+    }
+
+    // docs
+    if (folderRoot.docs?.trim().length) {
+      ocFolder.docs = {
+        content: folderRoot.docs,
+        type: 'text/markdown'
+      };
+    }
+
+    return stringifyYml(ocFolder);
+  } catch (error) {
+    console.error('Error stringifying folder.yml:', error);
+    throw error;
+  }
+};
+export default stringifyFolder;
diff --git a/packages/bruno-filestore/src/formats/yml/stringifyItem.ts b/packages/bruno-filestore/src/formats/yml/stringifyItem.ts
new file mode 100644
index 000000000..8d8bfec17
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/stringifyItem.ts
@@ -0,0 +1,37 @@
+import type { Item as BrunoItem } from '@usebruno/schema-types/collection/item';
+import stringifyHttpRequest from './items/stringifyHttpRequest';
+import stringifyGraphqlRequest from './items/stringifyGraphQLRequest';
+import stringifyGrpcRequest from './items/stringifyGrpcRequest';
+import stringifyWebsocketRequest from './items/stringifyWebsocketRequest';
+import stringifyScript from './items/stringifyScript';
+
+const stringifyItem = (item: BrunoItem): string => {
+  try {
+    switch (item.type) {
+      case 'http-request':
+        return stringifyHttpRequest(item);
+
+      case 'graphql-request':
+        return stringifyGraphqlRequest(item);
+
+      case 'grpc-request':
+        return stringifyGrpcRequest(item);
+
+      case 'ws-request':
+        return stringifyWebsocketRequest(item);
+
+      case 'js':
+        return stringifyScript(item);
+
+      case 'folder':
+        throw new Error('Folder items should be handled separately using stringifyFolder');
+
+      default:
+        throw new Error(`Unsupported item type: ${item.type}`);
+    }
+  } catch (error) {
+    console.error('Error stringifying item:', error);
+    throw error;
+  }
+};
+export default stringifyItem;
diff --git a/packages/bruno-filestore/src/formats/yml/utils.ts b/packages/bruno-filestore/src/formats/yml/utils.ts
new file mode 100644
index 000000000..71011a283
--- /dev/null
+++ b/packages/bruno-filestore/src/formats/yml/utils.ts
@@ -0,0 +1,14 @@
+import * as YAML from 'yaml';
+
+export const stringifyYml = (obj: any): string => {
+  return YAML.stringify(obj, {
+    lineWidth: 0,
+    indent: 2,
+    minContentWidth: 0,
+    defaultStringType: 'PLAIN'
+  });
+};
+
+export const parseYml = (ymlString: string): any => {
+  return YAML.parse(ymlString);
+};
diff --git a/packages/bruno-filestore/src/index.ts b/packages/bruno-filestore/src/index.ts
index 2e1ec26d5..cb10c357a 100644
--- a/packages/bruno-filestore/src/index.ts
+++ b/packages/bruno-filestore/src/index.ts
@@ -1,25 +1,38 @@
+import type { BrunoCollection, BrunoItem, BrunoEnvironment } from '@usebruno/schema-types';
+
 import {
-  bruRequestToJson,
-  jsonRequestToBru,
-  bruCollectionToJson,
-  jsonCollectionToBru,
-  bruEnvironmentToJson,
-  jsonEnvironmentToBru
+  parseBruRequest,
+  parseBruCollection,
+  parseBruEnvironment,
+  stringifyBruRequest,
+  stringifyBruCollection,
+  stringifyBruEnvironment
 } from './formats/bru';
+import {
+  parseYmlItem,
+  parseYmlCollection,
+  parseYmlFolder,
+  parseYmlEnvironment,
+  stringifyYmlItem,
+  stringifyYmlFolder,
+  stringifyYmlCollection,
+  stringifyYmlEnvironment
+} from './formats/yml';
 import { dotenvToJson } from '@usebruno/lang';
 import BruParserWorker from './workers';
 import {
   ParseOptions,
   StringifyOptions,
-  ParsedRequest,
-  ParsedCollection,
-  ParsedEnvironment
+  CollectionFormat
 } from './types';
 import { bruRequestParseAndRedactBodyData } from './formats/bru/utils/request-parse-and-redact-body-data';
 
+// request
 export const parseRequest = (content: string, options: ParseOptions = { format: 'bru' }): any => {
   if (options.format === 'bru') {
-    return bruRequestToJson(content);
+    return parseBruRequest(content);
+  } else if (options.format === 'yml') {
+    return parseYmlItem(content);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
@@ -31,15 +44,17 @@ export const parseRequestAndRedactBody = (content: string, options: ParseOptions
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
-export const stringifyRequest = (requestObj: ParsedRequest, options: StringifyOptions = { format: 'bru' }): string => {
+export const stringifyRequest = (requestObj: BrunoItem, options: StringifyOptions = { format: 'bru' }): string => {
   if (options.format === 'bru') {
-    return jsonRequestToBru(requestObj);
+    return stringifyBruRequest(requestObj);
+  } else if (options.format === 'yml') {
+    return stringifyYmlItem(requestObj);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
+// request via worker
 let globalWorkerInstance: BruParserWorker | null = null;
-
 const getWorkerInstance = (): BruParserWorker => {
   if (!globalWorkerInstance) {
     globalWorkerInstance = new BruParserWorker();
@@ -47,54 +62,70 @@ const getWorkerInstance = (): BruParserWorker => {
   return globalWorkerInstance;
 };
 
-export const parseRequestViaWorker = async (content: string): Promise<any> => {
+export const parseRequestViaWorker = async (content: string, options: { format: CollectionFormat; filename?: string }): Promise<any> => {
   const fileParserWorker = getWorkerInstance();
-  return await fileParserWorker.parseRequest(content);
+
+  return await fileParserWorker.parseRequest(content, options.format);
 };
 
-export const stringifyRequestViaWorker = async (requestObj: any): Promise<string> => {
+export const stringifyRequestViaWorker = async (requestObj: any, options: { format: CollectionFormat }): Promise<string> => {
   const fileParserWorker = getWorkerInstance();
-  return await fileParserWorker.stringifyRequest(requestObj);
+  return await fileParserWorker.stringifyRequest(requestObj, options.format);
 };
 
+// collection
 export const parseCollection = (content: string, options: ParseOptions = { format: 'bru' }): any => {
   if (options.format === 'bru') {
-    return bruCollectionToJson(content);
+    return parseBruCollection(content);
+  } else if (options.format === 'yml') {
+    return parseYmlCollection(content);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
-export const stringifyCollection = (collectionObj: ParsedCollection, options: StringifyOptions = { format: 'bru' }): string => {
+export const stringifyCollection = (collectionObj: BrunoCollection, brunoConfig: any, options: StringifyOptions = { format: 'bru' }): string => {
   if (options.format === 'bru') {
-    return jsonCollectionToBru(collectionObj, false);
+    return stringifyBruCollection(collectionObj, false);
+  } else if (options.format === 'yml') {
+    return stringifyYmlCollection(collectionObj, brunoConfig);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
+// folder
 export const parseFolder = (content: string, options: ParseOptions = { format: 'bru' }): any => {
   if (options.format === 'bru') {
-    return bruCollectionToJson(content);
+    return parseBruCollection(content);
+  } else if (options.format === 'yml') {
+    return parseYmlFolder(content);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
 export const stringifyFolder = (folderObj: any, options: StringifyOptions = { format: 'bru' }): string => {
   if (options.format === 'bru') {
-    return jsonCollectionToBru(folderObj, true);
+    return stringifyBruCollection(folderObj, true);
+  } else if (options.format === 'yml') {
+    return stringifyYmlFolder(folderObj);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
+// environment
 export const parseEnvironment = (content: string, options: ParseOptions = { format: 'bru' }): any => {
   if (options.format === 'bru') {
-    return bruEnvironmentToJson(content);
+    return parseBruEnvironment(content);
+  } else if (options.format === 'yml') {
+    return parseYmlEnvironment(content);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
 
-export const stringifyEnvironment = (envObj: ParsedEnvironment, options: StringifyOptions = { format: 'bru' }): string => {
+export const stringifyEnvironment = (envObj: BrunoEnvironment, options: StringifyOptions = { format: 'bru' }): string => {
   if (options.format === 'bru') {
-    return jsonEnvironmentToBru(envObj);
+    return stringifyBruEnvironment(envObj);
+  } else if (options.format === 'yml') {
+    return stringifyYmlEnvironment(envObj);
   }
   throw new Error(`Unsupported format: ${options.format}`);
 };
diff --git a/packages/bruno-filestore/src/types.ts b/packages/bruno-filestore/src/types.ts
index 6c0564b4e..42162b819 100644
--- a/packages/bruno-filestore/src/types.ts
+++ b/packages/bruno-filestore/src/types.ts
@@ -1,130 +1,11 @@
+export type CollectionFormat = 'bru' | 'yml';
+
 export interface ParseOptions {
-  format?: 'bru' | 'yaml';
+  format?: CollectionFormat;
 }
 
 export interface StringifyOptions {
-  format?: 'bru' | 'yaml';
-}
-
-export interface RequestBody {
-  mode?: string;
-  raw?: string;
-  formUrlEncoded?: Array<{ name: string; value: string; enabled: boolean }>;
-  multipartForm?: Array<{ name: string; value: string; type: string; enabled: boolean }>;
-  json?: string;
-  xml?: string;
-  sparql?: string;
-  graphql?: {
-    query?: string;
-    variables?: string;
-  };
-}
-
-export interface AuthConfig {
-  mode?: string;
-  basic?: {
-    username?: string;
-    password?: string;
-  };
-  bearer?: {
-    token?: string;
-  };
-  apikey?: {
-    key?: string;
-    value?: string;
-    placement?: string;
-  };
-  awsv4?: {
-    accessKeyId?: string;
-    secretAccessKey?: string;
-    sessionToken?: string;
-    service?: string;
-    region?: string;
-    profileName?: string;
-  };
-  oauth2?: {
-    grantType?: string;
-    callbackUrl?: string;
-    authorizationUrl?: string;
-    accessTokenUrl?: string;
-    clientId?: string;
-    clientSecret?: string;
-    scope?: string;
-    state?: string;
-    pkce?: boolean;
-  };
-}
-
-export interface RequestParam {
-  name: string;
-  value: string;
-  enabled: boolean;
-}
-
-export interface RequestHeader {
-  name: string;
-  value: string;
-  enabled: boolean;
-}
-
-export interface RequestAssertion {
-  name: string;
-  value: string;
-  enabled: boolean;
-}
-
-export interface RequestVars {
-  req?: Array<{ name: string; value: string; enabled: boolean }>;
-  res?: Array<{ name: string; value: string; enabled: boolean }>;
-}
-
-export interface RequestScript {
-  req?: string;
-  res?: string;
-}
-
-export interface RequestSettings {
-  [key: string]: any;
-}
-
-export interface RequestData {
-  method: string;
-  url: string;
-  params: RequestParam[];
-  headers: RequestHeader[];
-  auth: AuthConfig;
-  body: RequestBody;
-  script: RequestScript;
-  vars: RequestVars;
-  assertions: RequestAssertion[];
-  tests: string;
-  docs: string;
-}
-
-export interface ParsedRequest {
-  type: 'http-request' | 'graphql-request';
-  name: string;
-  seq: number;
-  settings: RequestSettings;
-  tags: string[];
-  request: RequestData;
-}
-
-export interface ParsedCollection {
-  name: string;
-  type?: string;
-  version?: string;
-  [key: string]: any;
-}
-
-export interface EnvironmentVariable {
-  name: string;
-  value: string;
-  enabled: boolean;
-}
-
-export interface ParsedEnvironment {
-  variables: EnvironmentVariable[];
+  format?: CollectionFormat;
 }
 
 export interface WorkerTask {
diff --git a/packages/bruno-filestore/src/utils/index.ts b/packages/bruno-filestore/src/utils/index.ts
new file mode 100644
index 000000000..590bd3140
--- /dev/null
+++ b/packages/bruno-filestore/src/utils/index.ts
@@ -0,0 +1,15 @@
+const { customAlphabet } = require('nanoid');
+
+export const isString = (value: unknown): value is string => typeof value === 'string';
+
+export const isNumber = (value: unknown): value is number => typeof value === 'number';
+
+export const isNonEmptyString = (value: unknown): value is string => isString(value) && value.trim().length > 0;
+
+export const uuid = () => {
+  // https://github.com/ai/nanoid/blob/main/url-alphabet/index.js
+  const urlAlphabet = 'useandom26T198340PX75pxJACKVERYMINDBUSHWOLFGQZbfghjklqvwyzrict';
+  const customNanoId = customAlphabet(urlAlphabet, 21);
+
+  return customNanoId();
+};
diff --git a/packages/bruno-filestore/src/workers/index.ts b/packages/bruno-filestore/src/workers/index.ts
index af66ea107..f080f08a8 100644
--- a/packages/bruno-filestore/src/workers/index.ts
+++ b/packages/bruno-filestore/src/workers/index.ts
@@ -1,5 +1,5 @@
 import WorkerQueue from './WorkerQueue';
-import { Lane } from '../types';
+import { Lane, CollectionFormat } from '../types';
 import path from 'node:path';
 
 const sizeInMB = (size: number): number => {
@@ -54,25 +54,25 @@ class BruParserWorker {
     return queueForSize?.workerQueue ?? this.workerQueues[this.workerQueues.length - 1].workerQueue;
   }
 
-  private async enqueueTask({ data, taskType }: { data: any; taskType: 'parse' | 'stringify' }): Promise<any> {
+  private async enqueueTask({ data, taskType, format = 'bru' }: { data: any; taskType: 'parse' | 'stringify'; format?: CollectionFormat }): Promise<any> {
     const size = getSize(data);
     const workerQueue = this.getWorkerQueue(size);
     const workerScriptPath = path.join(__dirname, './workers/worker-script.js');
     
     return workerQueue.enqueue({
-      data,
+      data: { data, format },
       priority: size,
       scriptPath: workerScriptPath,
       taskType,
     });
   }
 
-  async parseRequest(data: any): Promise<any> {
-    return this.enqueueTask({ data, taskType: 'parse' });
+  async parseRequest(data: any, format: CollectionFormat = 'bru'): Promise<any> {
+    return this.enqueueTask({ data, taskType: 'parse', format });
   }
 
-  async stringifyRequest(data: any): Promise<any> {
-    return this.enqueueTask({ data, taskType: 'stringify' });
+  async stringifyRequest(data: any, format: CollectionFormat = 'bru'): Promise<any> {
+    return this.enqueueTask({ data, taskType: 'stringify', format });
   }
 
   async cleanup(): Promise<void> {
diff --git a/packages/bruno-filestore/src/workers/worker-script.ts b/packages/bruno-filestore/src/workers/worker-script.ts
index 7a6529aab..8fee2861c 100644
--- a/packages/bruno-filestore/src/workers/worker-script.ts
+++ b/packages/bruno-filestore/src/workers/worker-script.ts
@@ -1,20 +1,34 @@
 import { parentPort } from 'node:worker_threads';
-import { bruRequestToJson, jsonRequestToBru } from '../formats/bru';
+import { parseBruRequest, stringifyBruRequest } from '../formats/bru';
+import { parseYmlItem, stringifyYmlItem } from '../formats/yml';
+import { CollectionFormat } from '../types';
 
 interface WorkerMessage {
   taskType: 'parse' | 'stringify';
-  data: any;
+  data: {
+    data: any;
+    format?: CollectionFormat;
+  };
 }
 
 parentPort?.on('message', async (message: WorkerMessage) => {
   try {
-    const { taskType, data } = message;
+    const { taskType, data: messageData } = message;
+    const { data, format = 'bru' } = messageData;
     let result: any;
 
     if (taskType === 'parse') {
-      result = bruRequestToJson(data);
+      if (format === 'yml') {
+        result = parseYmlItem(data);
+      } else {
+        result = parseBruRequest(data);
+      }
     } else if (taskType === 'stringify') {
-      result = jsonRequestToBru(data);
+      if (format === 'yml') {
+        result = stringifyYmlItem(data);
+      } else {
+        result = stringifyBruRequest(data);
+      }
     } else {
       throw new Error(`Unknown task type: ${taskType}`);
     }
diff --git a/packages/bruno-filestore/tsconfig.json b/packages/bruno-filestore/tsconfig.json
index 22385164b..53a360ba2 100644
--- a/packages/bruno-filestore/tsconfig.json
+++ b/packages/bruno-filestore/tsconfig.json
@@ -12,12 +12,19 @@
     "allowSyntheticDefaultImports": true,
     "moduleResolution": "node",
     "declaration": true,
-    "declarationDir": "./dist/types",
+    "declarationMap": true,
     "allowJs": true,
     "checkJs": false,
     "types": ["node"],
     "lib": ["ES2020"],
-    "typeRoots": ["./node_modules/@types", "./src/types"]
+    "typeRoots": ["../../node_modules/@types", "./node_modules/@types", "./src/types"],
+    "baseUrl": "../..",
+    "paths": {
+      "@usebruno/schema-types": ["packages/bruno-schema-types/dist/index.d.ts"],
+      "@usebruno/schema-types/*": ["packages/bruno-schema-types/dist/*"],
+      "@opencollection/types": ["node_modules/@opencollection/types/dist/opencollection.d.ts"],
+      "@opencollection/types/*": ["node_modules/@opencollection/types/dist/*"]
+    }
   },
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.js", "src/**/*.d.ts"],
   "exclude": ["node_modules", "dist"]
diff --git a/packages/bruno-js/src/sandbox/node-vm/index.js b/packages/bruno-js/src/sandbox/node-vm/index.js
index 990474ac6..8673c2cf9 100644
--- a/packages/bruno-js/src/sandbox/node-vm/index.js
+++ b/packages/bruno-js/src/sandbox/node-vm/index.js
@@ -58,7 +58,12 @@ async function runScriptInNodeVm({
       clearTimeout: global.clearTimeout,
       clearInterval: global.clearInterval,
       setImmediate: global.setImmediate,
-      clearImmediate: global.clearImmediate
+      clearImmediate: global.clearImmediate,
+      Error: global.Error,
+      TypeError: global.TypeError,
+      ReferenceError: global.ReferenceError,
+      SyntaxError: global.SyntaxError,
+      RangeError: global.RangeError
     };
 
     mixinTypedArrays(scriptContext);
diff --git a/packages/bruno-lang/v2/src/bruToJson.js b/packages/bruno-lang/v2/src/bruToJson.js
index b97d9068c..35018a910 100644
--- a/packages/bruno-lang/v2/src/bruToJson.js
+++ b/packages/bruno-lang/v2/src/bruToJson.js
@@ -1043,22 +1043,6 @@ const sem = grammar.createSemantics().addAttribute('ast', {
     const messageName = namePair ? namePair.value : '';
     const messageContent = contentPair ? contentPair.value : '';
     
-    try {
-      // Validate JSON by parsing (but don't modify the original string)
-      JSON.parse(messageContent);
-    } catch (error) {
-      console.error("Error validating gRPC message JSON:", error);
-      return {
-        body: {
-          mode: 'grpc',
-          grpc: [{
-            name: messageName,
-            content: '{}'
-          }]
-        }
-      };
-    }
-    
     return {
       body: {
         mode: 'grpc',
diff --git a/packages/bruno-lang/v2/tests/bruToJson.spec.js b/packages/bruno-lang/v2/tests/bruToJson.spec.js
index 6ad965771..718ce6e1b 100644
--- a/packages/bruno-lang/v2/tests/bruToJson.spec.js
+++ b/packages/bruno-lang/v2/tests/bruToJson.spec.js
@@ -39,6 +39,60 @@ settings {
     });
   });
 
+  describe('body:grpc', () => {
+    it('parses message content with name and content', () => {
+      const input = `
+body:grpc {
+    name: message 1
+    content: '''
+      {"foo":"bar"}
+    ''' 
+}
+`;
+
+      const expected = {
+        body: {
+          mode: 'grpc',
+          grpc: [
+            {
+              content: '{"foo":"bar"}',
+              name: 'message 1'
+            }
+          ]
+        }
+      };
+
+      const output = parser(input);
+      expect(output).toEqual(expected);
+    });
+
+    it('parses message with variables in content', () => {
+      const input = `
+body:grpc {
+    name: message 1
+    content: '''
+      {"id":{{userId}},"name":"{{userName}}"}
+    ''' 
+}
+`;
+
+      const expected = {
+        body: {
+          mode: 'grpc',
+          grpc: [
+            {
+              content: '{"id":{{userId}},"name":"{{userName}}"}',
+              name: 'message 1'
+            }
+          ]
+        }
+      };
+
+      const output = parser(input);
+      expect(output).toEqual(expected);
+    });
+  });
+
   describe('multi-line values', () => {
     it('parses multi-line values in URL, headers, params, and vars', () => {
       const input = `
diff --git a/packages/bruno-schema-types/.gitignore b/packages/bruno-schema-types/.gitignore
new file mode 100644
index 000000000..e505c2f5c
--- /dev/null
+++ b/packages/bruno-schema-types/.gitignore
@@ -0,0 +1,18 @@
+# Dependencies
+node_modules/
+
+# Build outputs
+dist/
+*.tsbuildinfo
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+
diff --git a/packages/bruno-schema-types/package.json b/packages/bruno-schema-types/package.json
new file mode 100644
index 000000000..7270655f7
--- /dev/null
+++ b/packages/bruno-schema-types/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "@usebruno/schema-types",
+  "version": "0.0.1",
+  "description": "TypeScript types for Bruno schema",
+  "author": "Bruno Software Inc.",
+  "main": "dist/schema-types.js",
+  "types": "dist/schema-types.d.ts",
+  "files": [
+    "dist",
+    "src",
+    "package.json"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "clean": "rm -rf dist",
+    "prepublishOnly": "npm run build"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./common/*": {
+      "types": "./dist/common/*.d.ts",
+      "default": "./dist/common/*.js"
+    },
+    "./config/*": {
+      "types": "./dist/config/*.d.ts",
+      "default": "./dist/config/*.js"
+    },
+    "./collection/*": {
+      "types": "./dist/collection/*.d.ts",
+      "default": "./dist/collection/*.js"
+    },
+    "./requests/*": {
+      "types": "./dist/requests/*.d.ts",
+      "default": "./dist/requests/*.js"
+    }
+  },
+  "devDependencies": {
+    "typescript": "^5.0.0"
+  },
+  "license": "MIT",
+  "keywords": [
+    "bruno",
+    "types",
+    "typescript",
+    "api",
+    "http"
+  ]
+}
+
diff --git a/packages/bruno-schema-types/src/collection/collection.ts b/packages/bruno-schema-types/src/collection/collection.ts
new file mode 100644
index 000000000..389133b67
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/collection.ts
@@ -0,0 +1,23 @@
+import type { UID } from '../common';
+import type { Item } from './item';
+import type { Environments } from './environment';
+import type { FolderRoot } from './folder';
+
+export interface RunnerResult {
+  items?: unknown[] | null;
+}
+
+export interface Collection {
+  version: '1';
+  uid: UID;
+  name: string;
+  items: Item[];
+  activeEnvironmentUid?: string | null;
+  environments?: Environments | null;
+  pathname?: string | null;
+  runnerResult?: RunnerResult | null;
+  runtimeVariables?: Record<string, unknown> | null;
+  brunoConfig?: Record<string, unknown> | null;
+  root?: FolderRoot | null;
+}
+
diff --git a/packages/bruno-schema-types/src/collection/environment.ts b/packages/bruno-schema-types/src/collection/environment.ts
new file mode 100644
index 000000000..ebd46ecf6
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/environment.ts
@@ -0,0 +1,19 @@
+import type { UID } from '../common';
+
+export interface EnvironmentVariable {
+  uid: UID;
+  name?: string | null;
+  value?: string | number | boolean | Record<string, unknown> | null;
+  type: 'text';
+  enabled?: boolean;
+  secret?: boolean;
+}
+
+export interface Environment {
+  uid: UID;
+  name: string;
+  variables: EnvironmentVariable[];
+}
+
+export type Environments = Environment[];
+
diff --git a/packages/bruno-schema-types/src/collection/examples.ts b/packages/bruno-schema-types/src/collection/examples.ts
new file mode 100644
index 000000000..b5077e876
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/examples.ts
@@ -0,0 +1,35 @@
+import type { UID, KeyValue } from '../common';
+import type { HttpRequestBody, HttpRequestParam } from '../requests';
+
+export type ExampleType = 'http-request' | 'graphql-request' | 'grpc-request';
+
+export interface ExampleRequest {
+  url: string;
+  method: string;
+  headers: KeyValue[];
+  params: HttpRequestParam[];
+  body: HttpRequestBody;
+}
+
+export interface ExampleResponseBody {
+  type?: 'json' | 'text' | 'xml' | 'html' | 'binary' | null;
+  content?: unknown;
+}
+
+export interface ExampleResponse {
+  status?: string | null;
+  statusText?: string | null;
+  headers?: KeyValue[] | null;
+  body?: ExampleResponseBody | null;
+}
+
+export interface Example {
+  uid: UID;
+  itemUid: UID;
+  name: string;
+  description?: string | null;
+  type: ExampleType;
+  request?: ExampleRequest | null;
+  response?: ExampleResponse | null;
+}
+
diff --git a/packages/bruno-schema-types/src/collection/folder.ts b/packages/bruno-schema-types/src/collection/folder.ts
new file mode 100644
index 000000000..c3725d670
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/folder.ts
@@ -0,0 +1,24 @@
+import type { KeyValue, Auth, Script, Variables } from '../common';
+
+export interface FolderRequest {
+  headers?: KeyValue[] | null;
+  auth?: Auth | null;
+  script?: Script | null;
+  vars?: {
+    req?: Variables | null;
+    res?: Variables | null;
+  } | null;
+  tests?: string | null;
+}
+
+export interface FolderMeta {
+  name?: string | null;
+  seq?: number | null;
+}
+
+export interface FolderRoot {
+  request?: FolderRequest | null;
+  docs?: string | null;
+  meta?: FolderMeta | null;
+}
+
diff --git a/packages/bruno-schema-types/src/collection/index.ts b/packages/bruno-schema-types/src/collection/index.ts
new file mode 100644
index 000000000..50fc245cb
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/index.ts
@@ -0,0 +1,22 @@
+export type {
+  EnvironmentVariable,
+  Environment,
+  Environments
+} from './environment';
+export type { FolderRequest, FolderMeta, FolderRoot } from './folder';
+export type {
+  Example,
+  ExampleType,
+  ExampleRequest,
+  ExampleResponse,
+  ExampleResponseBody
+} from './examples';
+export type {
+  Item,
+  ItemType,
+  ItemSettings,
+  HttpItemSettings,
+  WebSocketItemSettings
+} from './item';
+export type { Collection, RunnerResult } from './collection';
+
diff --git a/packages/bruno-schema-types/src/collection/item.ts b/packages/bruno-schema-types/src/collection/item.ts
new file mode 100644
index 000000000..603832ade
--- /dev/null
+++ b/packages/bruno-schema-types/src/collection/item.ts
@@ -0,0 +1,45 @@
+import type { UID } from '../common';
+import type { Request } from '../requests';
+import type { Example } from './examples';
+import type { FolderRoot } from './folder';
+
+export type ItemType =
+  | 'http-request'
+  | 'graphql-request'
+  | 'folder'
+  | 'js'
+  | 'grpc-request'
+  | 'ws-request';
+
+export interface HttpItemSettings {
+  encodeUrl?: boolean | null;
+  followRedirects?: boolean | null;
+  maxRedirects?: number | null;
+  timeout?: number | 'inherit' | null;
+}
+
+export interface WebSocketItemSettings {
+  settings?: {
+    timeout?: number | null;
+    keepAliveInterval?: number | null;
+  } | null;
+}
+
+export type ItemSettings = HttpItemSettings | WebSocketItemSettings | null;
+
+export interface Item {
+  uid: UID;
+  type: ItemType;
+  seq?: number | null;
+  name: string;
+  tags?: string[] | null;
+  request?: Request | null;
+  settings?: ItemSettings;
+  fileContent?: string | null;
+  root?: FolderRoot | null;
+  items?: Item[] | null;
+  examples?: Example[] | null;
+  filename?: string | null;
+  pathname?: string | null;
+}
+
diff --git a/packages/bruno-schema-types/src/common/auth.ts b/packages/bruno-schema-types/src/common/auth.ts
new file mode 100644
index 000000000..db6833f47
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/auth.ts
@@ -0,0 +1,106 @@
+export interface AuthAwsV4 {
+  accessKeyId?: string | null;
+  secretAccessKey?: string | null;
+  sessionToken?: string | null;
+  service?: string | null;
+  region?: string | null;
+  profileName?: string | null;
+}
+
+export interface AuthBasic {
+  username?: string | null;
+  password?: string | null;
+}
+
+export interface AuthWsse {
+  username?: string | null;
+  password?: string | null;
+}
+
+export interface AuthBearer {
+  token?: string | null;
+}
+
+export interface AuthDigest {
+  username?: string | null;
+  password?: string | null;
+}
+
+export interface AuthNTLM {
+  username?: string | null;
+  password?: string | null;
+  domain?: string | null;
+}
+
+export interface AuthApiKey {
+  key?: string | null;
+  value?: string | null;
+  placement?: 'header' | 'queryparams' | null;
+}
+
+export type OAuthGrantType =
+  | 'client_credentials'
+  | 'password'
+  | 'authorization_code'
+  | 'implicit';
+
+export interface OAuthAdditionalParameter {
+  name?: string | null;
+  value?: string | null;
+  sendIn: 'headers' | 'queryparams' | 'body';
+  enabled?: boolean;
+}
+
+export interface OAuthAdditionalParameters {
+  authorization?: OAuthAdditionalParameter[] | null;
+  token?: OAuthAdditionalParameter[] | null;
+  refresh?: OAuthAdditionalParameter[] | null;
+}
+
+export interface OAuth2 {
+  grantType: OAuthGrantType;
+  username?: string | null;
+  password?: string | null;
+  callbackUrl?: string | null;
+  authorizationUrl?: string | null;
+  accessTokenUrl?: string | null;
+  clientId?: string | null;
+  clientSecret?: string | null;
+  scope?: string | null;
+  state?: string | null;
+  pkce?: boolean | null;
+  credentialsPlacement?: 'body' | 'basic_auth_header' | null;
+  credentialsId?: string | null;
+  tokenPlacement?: string | null;
+  tokenHeaderPrefix?: string | null;
+  tokenQueryKey?: string | null;
+  refreshTokenUrl?: string | null;
+  autoRefreshToken?: boolean | null;
+  autoFetchToken?: boolean | null;
+  additionalParameters?: OAuthAdditionalParameters | null;
+}
+
+export type AuthMode =
+  | 'inherit'
+  | 'none'
+  | 'awsv4'
+  | 'basic'
+  | 'bearer'
+  | 'digest'
+  | 'ntlm'
+  | 'oauth2'
+  | 'wsse'
+  | 'apikey';
+
+export interface Auth {
+  mode: AuthMode;
+  awsv4?: AuthAwsV4 | null;
+  basic?: AuthBasic | null;
+  bearer?: AuthBearer | null;
+  digest?: AuthDigest | null;
+  ntlm?: AuthNTLM | null;
+  oauth2?: OAuth2 | null;
+  wsse?: AuthWsse | null;
+  apikey?: AuthApiKey | null;
+}
+
diff --git a/packages/bruno-schema-types/src/common/file.ts b/packages/bruno-schema-types/src/common/file.ts
new file mode 100644
index 000000000..49460c2b2
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/file.ts
@@ -0,0 +1,11 @@
+import type { UID } from './uid';
+
+export interface FileEntry {
+  uid: UID;
+  filePath?: string | null;
+  contentType?: string | null;
+  selected: boolean;
+}
+
+export type FileList = FileEntry[];
+
diff --git a/packages/bruno-schema-types/src/common/graphql.ts b/packages/bruno-schema-types/src/common/graphql.ts
new file mode 100644
index 000000000..ee732d454
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/graphql.ts
@@ -0,0 +1,5 @@
+export interface GraphqlBody {
+  query?: string | null;
+  variables?: string | null;
+}
+
diff --git a/packages/bruno-schema-types/src/common/index.ts b/packages/bruno-schema-types/src/common/index.ts
new file mode 100644
index 000000000..f6ee39f81
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/index.ts
@@ -0,0 +1,23 @@
+export type { UID } from './uid';
+export type { KeyValue } from './key-value';
+export type { Variable, Variables } from './variables';
+export type { MultipartFormEntry, MultipartForm } from './multipart-form';
+export type { FileEntry, FileList } from './file';
+export type { GraphqlBody } from './graphql';
+export type { Script } from './scripts';
+export type {
+  Auth,
+  AuthMode,
+  AuthAwsV4,
+  AuthBasic,
+  AuthBearer,
+  AuthDigest,
+  AuthNTLM,
+  AuthWsse,
+  AuthApiKey,
+  OAuth2,
+  OAuthGrantType,
+  OAuthAdditionalParameter,
+  OAuthAdditionalParameters
+} from './auth';
+
diff --git a/packages/bruno-schema-types/src/common/key-value.ts b/packages/bruno-schema-types/src/common/key-value.ts
new file mode 100644
index 000000000..af11a703e
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/key-value.ts
@@ -0,0 +1,13 @@
+import type { UID } from './uid';
+
+/**
+ * Generic key/value structure used for headers, params, assertions, etc.
+ */
+export interface KeyValue {
+  uid: UID;
+  name?: string | null;
+  value?: string | null;
+  description?: string | null;
+  enabled?: boolean;
+}
+
diff --git a/packages/bruno-schema-types/src/common/multipart-form.ts b/packages/bruno-schema-types/src/common/multipart-form.ts
new file mode 100644
index 000000000..8b01f68c8
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/multipart-form.ts
@@ -0,0 +1,14 @@
+import type { UID } from './uid';
+
+export interface MultipartFormEntry {
+  uid: UID;
+  type: 'file' | 'text';
+  name?: string | null;
+  value?: string | string[] | null;
+  description?: string | null;
+  contentType?: string | null;
+  enabled?: boolean;
+}
+
+export type MultipartForm = MultipartFormEntry[];
+
diff --git a/packages/bruno-schema-types/src/common/scripts.ts b/packages/bruno-schema-types/src/common/scripts.ts
new file mode 100644
index 000000000..2cde97b38
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/scripts.ts
@@ -0,0 +1,5 @@
+export interface Script {
+  req?: string | null;
+  res?: string | null;
+}
+
diff --git a/packages/bruno-schema-types/src/common/uid.ts b/packages/bruno-schema-types/src/common/uid.ts
new file mode 100644
index 000000000..a0e46a3e9
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/uid.ts
@@ -0,0 +1,5 @@
+/**
+ * Unique identifier used across Bruno collections.
+ */
+export type UID = string;
+
diff --git a/packages/bruno-schema-types/src/common/variables.ts b/packages/bruno-schema-types/src/common/variables.ts
new file mode 100644
index 000000000..976aefcc0
--- /dev/null
+++ b/packages/bruno-schema-types/src/common/variables.ts
@@ -0,0 +1,16 @@
+import type { UID } from './uid';
+
+/**
+ * Request-scoped variable entry.
+ */
+export interface Variable {
+  uid: UID;
+  name?: string | null;
+  value?: string | null;
+  description?: string | null;
+  enabled?: boolean;
+  local?: boolean;
+}
+
+export type Variables = Variable[] | null;
+
diff --git a/packages/bruno-schema-types/src/index.ts b/packages/bruno-schema-types/src/index.ts
new file mode 100644
index 000000000..aa1492588
--- /dev/null
+++ b/packages/bruno-schema-types/src/index.ts
@@ -0,0 +1,11 @@
+export * as Common from './common';
+export * as Requests from './requests';
+export * as Collection from './collection';
+
+export type {
+  Collection as BrunoCollection,
+  Item as BrunoItem,
+  Environment as BrunoEnvironment,
+  Environments as BrunoEnvironments
+} from './collection';
+export type { Request as BrunoRequest } from './requests';
\ No newline at end of file
diff --git a/packages/bruno-schema-types/src/requests/grpc.ts b/packages/bruno-schema-types/src/requests/grpc.ts
new file mode 100644
index 000000000..95501a0e5
--- /dev/null
+++ b/packages/bruno-schema-types/src/requests/grpc.ts
@@ -0,0 +1,37 @@
+import type { KeyValue, Script, Variables, Auth } from '../common';
+
+export type GrpcMethodType =
+  | 'unary'
+  | 'client-streaming'
+  | 'server-streaming'
+  | 'bidi-streaming'
+  | '';
+
+export interface GrpcMessage {
+  name?: string | null;
+  content?: string | null;
+}
+
+export interface GrpcRequestBody {
+  mode: 'grpc';
+  grpc?: GrpcMessage[] | null;
+}
+
+export interface GrpcRequest {
+  url: string;
+  method?: string | null;
+  methodType?: GrpcMethodType | null;
+  protoPath?: string | null;
+  headers: KeyValue[];
+  auth?: Auth | null;
+  body: GrpcRequestBody;
+  script?: Script | null;
+  vars?: {
+    req: Variables;
+    res: Variables;
+  } | null;
+  assertions?: KeyValue[] | null;
+  tests?: string | null;
+  docs?: string | null;
+}
+
diff --git a/packages/bruno-schema-types/src/requests/http.ts b/packages/bruno-schema-types/src/requests/http.ts
new file mode 100644
index 000000000..2cd34efd3
--- /dev/null
+++ b/packages/bruno-schema-types/src/requests/http.ts
@@ -0,0 +1,56 @@
+import type {
+  KeyValue,
+  Script,
+  Variables,
+  Auth,
+  MultipartForm,
+  FileList,
+  GraphqlBody
+} from '../common';
+
+export type HttpRequestParamType = 'query' | 'path';
+
+export interface HttpRequestParam extends KeyValue {
+  type: HttpRequestParamType;
+}
+
+export type HttpRequestBodyMode =
+  | 'none'
+  | 'json'
+  | 'text'
+  | 'xml'
+  | 'formUrlEncoded'
+  | 'multipartForm'
+  | 'graphql'
+  | 'sparql'
+  | 'file';
+
+export interface HttpRequestBody {
+  mode: HttpRequestBodyMode;
+  json?: string | null;
+  text?: string | null;
+  xml?: string | null;
+  sparql?: string | null;
+  formUrlEncoded?: KeyValue[] | null;
+  multipartForm?: MultipartForm | null;
+  graphql?: GraphqlBody | null;
+  file?: FileList | null;
+}
+
+export interface HttpRequest {
+  url: string;
+  method: string;
+  headers: KeyValue[];
+  params: HttpRequestParam[];
+  auth?: Auth | null;
+  body?: HttpRequestBody | null;
+  script?: Script | null;
+  vars?: {
+    req: Variables;
+    res: Variables;
+  } | null;
+  assertions?: KeyValue[] | null;
+  tests?: string | null;
+  docs?: string | null;
+}
+
diff --git a/packages/bruno-schema-types/src/requests/index.ts b/packages/bruno-schema-types/src/requests/index.ts
new file mode 100644
index 000000000..a5233a5ef
--- /dev/null
+++ b/packages/bruno-schema-types/src/requests/index.ts
@@ -0,0 +1,27 @@
+import type { HttpRequest } from './http';
+import type { GrpcRequest } from './grpc';
+import type { WebSocketRequest } from './websocket';
+
+export type {
+  HttpRequest,
+  HttpRequestBody,
+  HttpRequestBodyMode,
+  HttpRequestParam,
+  HttpRequestParamType
+} from './http';
+
+export type {
+  GrpcRequest,
+  GrpcRequestBody,
+  GrpcMessage,
+  GrpcMethodType
+} from './grpc';
+
+export type {
+  WebSocketRequest,
+  WebSocketRequestBody,
+  WebSocketMessage
+} from './websocket';
+
+export type Request = HttpRequest | GrpcRequest | WebSocketRequest;
+
diff --git a/packages/bruno-schema-types/src/requests/websocket.ts b/packages/bruno-schema-types/src/requests/websocket.ts
new file mode 100644
index 000000000..f0a998104
--- /dev/null
+++ b/packages/bruno-schema-types/src/requests/websocket.ts
@@ -0,0 +1,28 @@
+import type { KeyValue, Script, Variables, Auth } from '../common';
+
+export interface WebSocketMessage {
+  name?: string | null;
+  type?: string | null;
+  content?: string | null;
+}
+
+export interface WebSocketRequestBody {
+  mode: 'ws';
+  ws?: WebSocketMessage[] | null;
+}
+
+export interface WebSocketRequest {
+  url: string;
+  headers: KeyValue[];
+  auth?: Auth | null;
+  body: WebSocketRequestBody;
+  script?: Script | null;
+  vars?: {
+    req: Variables;
+    res: Variables;
+  } | null;
+  assertions?: KeyValue[] | null;
+  tests?: string | null;
+  docs?: string | null;
+}
+
diff --git a/packages/bruno-schema-types/tsconfig.json b/packages/bruno-schema-types/tsconfig.json
new file mode 100644
index 000000000..453972338
--- /dev/null
+++ b/packages/bruno-schema-types/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ESNext",
+    "lib": ["ES2020"],
+    "declaration": true,
+    "declarationMap": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}
+
diff --git a/scripts/setup.js b/scripts/setup.js
index e0a15bdc1..47d25d657 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -76,8 +76,9 @@ async function setup() {
     execCommand('npm run build:bruno-common', 'Building bruno-common');
     execCommand('npm run build:bruno-converters', 'Building bruno-converters');
     execCommand('npm run build:bruno-requests', 'Building bruno-requests');
+    execCommand('npm run build:schema-types', 'Building schema-types');
     execCommand('npm run build:bruno-filestore', 'Building bruno-filestore');
-
+    
     // Bundle JS sandbox libraries
     execCommand(
       'npm run sandbox:bundle-libraries --workspace=packages/bruno-js',
diff --git a/tests/collection/draft/draft-values-in-requests.spec.ts b/tests/collection/draft/draft-values-in-requests.spec.ts
index 6cff4c811..5fd7c0950 100644
--- a/tests/collection/draft/draft-values-in-requests.spec.ts
+++ b/tests/collection/draft/draft-values-in-requests.spec.ts
@@ -121,6 +121,7 @@ test.describe('Draft values are used in requests', () => {
   });
 
   test('Verify draft for proxy settings are used in HTTP requests', async ({ page, createTmpDir }) => {
+    test.skip(true, 'Temporarily skipping this test because of proxy-related problems');
     const collectionName = 'test-draft-proxy-settings';
 
     // Create a new collection
diff --git a/tests/collection/open/open-multiple-collections.spec.ts b/tests/collection/open/open-multiple-collections.spec.ts
index 6865986ac..3d12b3b81 100644
--- a/tests/collection/open/open-multiple-collections.spec.ts
+++ b/tests/collection/open/open-multiple-collections.spec.ts
@@ -98,7 +98,7 @@ test.describe('Open Multiple Collections', () => {
     await expect(page.locator('#sidebar-collection-name')).toHaveCount(0);
 
     // Verify invalid collection error
-    const invalidCollectionError = page.getByText('The collection is not valid (bruno.json not found)').first();
+    const invalidCollectionError = page.getByText('The collection is not valid').first();
     await expect(invalidCollectionError).toBeVisible();
 
     // Verify invalid path error
diff --git a/tests/preferences/autosave/autosave.spec.ts b/tests/preferences/autosave/autosave.spec.ts
new file mode 100644
index 000000000..7be6572bb
--- /dev/null
+++ b/tests/preferences/autosave/autosave.spec.ts
@@ -0,0 +1,198 @@
+import { test, expect } from '../../../playwright';
+import { createCollection, closeAllCollections, createRequest } from '../../utils/page';
+
+test.describe('Autosave', () => {
+  test.afterEach(async ({ page }) => {
+    await closeAllCollections(page);
+  });
+
+  test('should automatically save request changes when autosave is enabled', async ({ page, createTmpDir }) => {
+    const collectionName = 'autosave-test';
+
+    await test.step('Create collection and request', async () => {
+      await createCollection(page, collectionName, await createTmpDir('autosave-collection'), {
+        openWithSandboxMode: 'safe'
+      });
+      await expect(page.locator('#sidebar-collection-name').filter({ hasText: collectionName })).toBeVisible();
+
+      await createRequest(page, 'Test Request', collectionName);
+      await page.locator('.collection-item-name').filter({ hasText: 'Test Request' }).click();
+
+      // Set initial URL and save
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('https://api.example.com');
+      await page.keyboard.press('Control+s');
+
+      // Verify no draft indicator
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Test Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+
+    await test.step('Enable autosave in preferences', async () => {
+      // Open preferences
+      await page.locator('.status-bar button[data-trigger="preferences"]').click();
+
+      const preferencesModal = page.locator('.bruno-modal-card').filter({ hasText: 'Preferences' });
+      await expect(preferencesModal).toBeVisible();
+
+      // Enable autosave checkbox
+      const autoSaveCheckbox = preferencesModal.locator('#autoSaveEnabled');
+      await autoSaveCheckbox.check();
+
+      // Save preferences
+      await preferencesModal.locator('button[type="submit"]').click();
+
+      // Wait for preferences to close
+      await expect(preferencesModal).not.toBeVisible();
+    });
+
+    await test.step('Make changes and verify autosave', async () => {
+      // Make a change to the URL
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.press('End');
+      await page.keyboard.type('/users');
+
+      // Verify draft indicator appears
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Test Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+
+      // Wait for autosave to trigger (interval + some buffer)
+      await page.waitForTimeout(1000);
+
+      // Verify draft indicator disappears after autosave
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+
+    await test.step('Verify changes persisted', async () => {
+      // Close and reopen the request tab to verify persistence
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Test Request' }) });
+      await requestTab.locator('.close-icon').click();
+
+      // Reopen request
+      await page.locator('.collection-item-name').filter({ hasText: 'Test Request' }).click();
+
+      // Verify URL contains our changes
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const urlContent = await urlEditor.locator('.CodeMirror-line').first().textContent();
+      expect(urlContent).toContain('api.example.com/users');
+    });
+
+    await test.step('Disable autosave in preferences', async () => {
+      // Open preferences from status bar
+      await page.locator('.status-bar button[data-trigger="preferences"]').click();
+
+      // Wait for preferences modal
+      const preferencesModal = page.locator('.bruno-modal-card').filter({ hasText: 'Preferences' });
+      await expect(preferencesModal).toBeVisible();
+
+      // Disable autosave checkbox
+      const autoSaveCheckbox = preferencesModal.locator('#autoSaveEnabled');
+      await autoSaveCheckbox.uncheck();
+
+      // Save preferences
+      await preferencesModal.locator('button[type="submit"]').click();
+
+      // Wait for preferences to close
+      await expect(preferencesModal).not.toBeVisible();
+    });
+
+    await test.step('Make changes and verify no autosave when disabled', async () => {
+      // Make a change to the URL
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.press('End');
+      await page.keyboard.type('/posts');
+
+      // Verify draft indicator appears
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Test Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+
+      // Wait a bit (longer than autosave interval would be)
+      await page.waitForTimeout(1500);
+
+      // Draft indicator should still be visible (autosave is disabled)
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+
+      // Save the request
+      await page.keyboard.press('Control+s');
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+  });
+
+  test('should autosave existing drafts when autosave is enabled', async ({ page, createTmpDir }) => {
+    const collectionName = 'autosave-existing-drafts-test';
+
+    await test.step('Create collection and request with initial URL', async () => {
+      await createCollection(page, collectionName, await createTmpDir('autosave-existing-drafts-collection'), {
+        openWithSandboxMode: 'safe'
+      });
+      await expect(page.locator('#sidebar-collection-name').filter({ hasText: collectionName })).toBeVisible();
+
+      await createRequest(page, 'Draft Request', collectionName);
+      await page.locator('.collection-item-name').filter({ hasText: 'Draft Request' }).click();
+
+      // Set initial URL and save
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.type('https://api.example.com');
+      await page.keyboard.press('Control+s');
+
+      // Verify no draft indicator
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Draft Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+
+    await test.step('Make changes to create a draft (without saving)', async () => {
+      // Make a change to the URL
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      await urlEditor.click();
+      await page.keyboard.press('End');
+      await page.keyboard.type('/existing-draft');
+
+      // Verify draft indicator appears
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Draft Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).toBeVisible();
+    });
+
+    await test.step('Enable autosave and verify existing draft is saved', async () => {
+      // Open preferences
+      await page.locator('.status-bar button[data-trigger="preferences"]').click();
+
+      const preferencesModal = page.locator('.bruno-modal-card').filter({ hasText: 'Preferences' });
+      await expect(preferencesModal).toBeVisible();
+
+      // Enable autosave checkbox
+      const autoSaveCheckbox = preferencesModal.locator('#autoSaveEnabled');
+      await autoSaveCheckbox.check();
+
+      // Save preferences
+      await preferencesModal.locator('button[type="submit"]').click();
+
+      // Wait for preferences to close
+      await expect(preferencesModal).not.toBeVisible();
+
+      // Wait for autosave to trigger for existing draft
+      await page.waitForTimeout(1000);
+
+      // Verify draft indicator disappears (existing draft was auto-saved)
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Draft Request' }) });
+      await expect(requestTab.locator('.has-changes-icon')).not.toBeVisible();
+    });
+
+    await test.step('Verify changes persisted', async () => {
+      // Close and reopen the request tab to verify persistence
+      const requestTab = page.locator('.request-tab').filter({ has: page.locator('.tab-label', { hasText: 'Draft Request' }) });
+      await requestTab.locator('.close-icon').click();
+
+      // Reopen request
+      await page.locator('.collection-item-name').filter({ hasText: 'Draft Request' }).click();
+
+      // Verify URL contains our changes
+      const urlEditor = page.locator('#request-url .CodeMirror');
+      const urlContent = await urlEditor.locator('.CodeMirror-line').first().textContent();
+      expect(urlContent).toContain('api.example.com/existing-draft');
+    });
+  });
+});

From af707de684a1181b25f60675354d9fe1a430ce27 Mon Sep 17 00:00:00 2001
From: Sid <siddharth@usebruno.com>
Date: Tue, 2 Dec 2025 13:59:12 +0530
Subject: [PATCH 3/3] fix(autoSave): minor bug fixes

---
 .../bruno-app/src/components/Preferences/General/index.js | 7 +++++--
 .../bruno-app/src/components/RequestPane/Vars/index.js    | 1 -
 .../ReduxStore/middlewares/autosave/middleware.js         | 8 ++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/bruno-app/src/components/Preferences/General/index.js b/packages/bruno-app/src/components/Preferences/General/index.js
index fa7bf0dea..8e603a091 100644
--- a/packages/bruno-app/src/components/Preferences/General/index.js
+++ b/packages/bruno-app/src/components/Preferences/General/index.js
@@ -46,8 +46,8 @@ const General = ({ close }) => {
         .test('isNumber', 'Save Delay must be a number', (value) => {
           return value === undefined || !isNaN(value);
         })
-        .test('isValidInterval', 'Save Delay must be at least 500ms', (value) => {
-          return value === undefined || Number(value) >= 500;
+        .test('isValidInterval', 'Save Delay must be at least 100ms', (value) => {
+          return value === undefined || Number(value) >= 100;
         })
     }).test('intervalRequired', 'Save Delay is required when Auto Save is enabled', (value) => {
       // If autosave is enabled, interval must be provided
@@ -308,6 +308,9 @@ const General = ({ close }) => {
             disabled={!formik.values.autoSave.enabled}
           />
         </div>
+        {formik.touched.autoSave && formik.errors.autoSave && typeof formik.errors.autoSave === 'string' && (
+          <div className="text-red-500">{formik.errors.autoSave}</div>
+        )}
         {formik.touched.autoSave?.interval && formik.errors.autoSave?.interval && (
           <div className="text-red-500">{formik.errors.autoSave.interval}</div>
         )}
diff --git a/packages/bruno-app/src/components/RequestPane/Vars/index.js b/packages/bruno-app/src/components/RequestPane/Vars/index.js
index 300576e8f..89b15beca 100644
--- a/packages/bruno-app/src/components/RequestPane/Vars/index.js
+++ b/packages/bruno-app/src/components/RequestPane/Vars/index.js
@@ -7,7 +7,6 @@ import DeprecationWarning from 'components/DeprecationWarning';
 const Vars = ({ item, collection }) => {
   const requestVars = item.draft ? get(item, 'draft.request.vars.req') : get(item, 'request.vars.req');
   const responseVars = item.draft ? get(item, 'draft.request.vars.res') : get(item, 'request.vars.res');
-  const deprecationWarningMessage = 'Post response vars is deprecated and will be removed in v3.0.0';
 
   return (
     <StyledWrapper className="w-full flex flex-col">
diff --git a/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js b/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js
index 8260b293d..ab939fee5 100644
--- a/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js
+++ b/packages/bruno-app/src/providers/ReduxStore/middlewares/autosave/middleware.js
@@ -130,6 +130,14 @@ export const autosaveMiddleware = ({ dispatch, getState }) => (next) => (action)
     return result;
   }
 
+  if (action.type === 'app/updatePreferences' && action.payload?.autoSave?.enabled === false) {
+    Object.keys(pendingTimers).forEach((key) => {
+      clearTimeout(pendingTimers[key]);
+      delete pendingTimers[key];
+    });
+    return result;
+  }
+
   // Only handle actions that create dirty state
   if (!actionsToIntercept.includes(action.type)) return result;