diff --git a/.cursor/rules/conventional_commits.mdc b/.cursor/rules/conventional_commits.mdc
new file mode 100644
index 0000000000..f17453a0c7
--- /dev/null
+++ b/.cursor/rules/conventional_commits.mdc
@@ -0,0 +1,32 @@
+## Conventional Commits (REQUIRED)
+
+All commit messages and PR titles MUST follow conventional commit format:
+
+### Format
+```
+<type>(<scope>): <description>
+```
+
+### Types
+- `feat:` - New features
+- `fix:` - Bug fixes  
+- `refactor:` - Code refactoring
+- `doc:` - Documentation
+- `style:` - Code style/formatting
+- `perf:` - Performance improvements
+- `test:` - Testing changes
+- `chore:` - Maintenance tasks
+- `chore(deps):` - Dependency updates
+
+### Examples
+```
+feat(cli): add new command for tool management
+fix(config): resolve parsing issue with nested tables
+refactor(backend): simplify plugin loading logic
+doc(api): update configuration examples
+test(e2e): add tests for tool installation
+chore(deps): update Rust dependencies
+```
+
+### Common Scopes
+`registry`, `aqua`, `cli`, `config`, `backend`, `tool`, `env`, `task`, `api`, `ui`, `core`, `deps`, `schema`, `doctor`, `shim`, `security`
\ No newline at end of file