diff --git a/.cursor/README.md b/.cursor/README.md
new file mode 100644
index 0000000000..4cedaba667
--- /dev/null
+++ b/.cursor/README.md
@@ -0,0 +1,27 @@
+# Cursor Rules
+
+This directory contains configuration for cursor-specific rules and behaviors.
+
+## Commit Message Rules
+
+- Messages must be concise and single-line
+- Must start with a verb (e.g., adds, removes, updates)
+- For significant changes:
+
+  ```
+  Heading
+
+  Detailed description
+  ```
+
+## Workspace Rules
+
+### Derived Files
+
+- Use `/*** */` for comments instead of `//`
+
+### Cypress Tests
+
+- Run command: `yarn cypress run --browser chrome --headless --spec {fileName}`
+- Execute from: `app/client` directory
+- File paths should be relative to `app/client`
diff --git a/.cursor/rules.json b/.cursor/rules.json
new file mode 100644
index 0000000000..85ce6771d3
--- /dev/null
+++ b/.cursor/rules.json
@@ -0,0 +1,42 @@
+{
+  "commitRules": {
+    "style": {
+      "concise": true,
+      "singleLine": true,
+      "format": {
+        "prefix": "verb",
+        "allowedPrefixes": [
+          "adds",
+          "removes",
+          "updates",
+          "fixes",
+          "refactors",
+          "implements",
+          "improves"
+        ],
+        "bigChanges": {
+          "format": "heading + description",
+          "separator": "\n\n"
+        }
+      }
+    }
+  },
+  "workspaceRules": {
+    "derivedFiles": {
+      "commentStyle": {
+        "forbidden": "//",
+        "required": "/*** */"
+      }
+    },
+    "cypressTests": {
+      "runCommand": {
+        "directory": "app/client",
+        "command": "yarn cypress run --browser chrome --headless --spec {fileName}",
+        "filePathFormat": {
+          "input": "app/client/cypress/e2e/...",
+          "usage": "cypress/e2e/..."
+        }
+      }
+    }
+  }
+}