diff --git a/.github/workflows/marvin.yml b/.github/workflows/marvin.yml
index 7557cb325..972c5cc24 100644
--- a/.github/workflows/marvin.yml
+++ b/.github/workflows/marvin.yml
@@ -31,6 +31,29 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # Set up Python environment
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      # Install UV package manager
+      - name: Install UV
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+
+      # Install project dependencies
+      - name: Install dependencies
+        run: uv sync --dev
+
+      # Install pre-commit hooks automatically
+      - name: Install pre-commit hooks
+        run: |
+          uv run pre-commit install
+          echo "✅ Pre-commit hooks installed"
+
       - name: Generate Marvin App token
         id: marvin-token
         uses: actions/create-github-app-token@v2
@@ -47,6 +70,6 @@ jobs:
           mode: tag
           trigger_phrase: "/marvin"
           allowed_bots: "*"
-          allowed_tools: "WebSearch,WebFetch,mcp__github__add_issue_comment,mcp__github__create_issue,mcp__github__get_issue,mcp__github__list_issues,mcp__github__search_issues,mcp__github__update_issue,mcp__github__update_issue_comment,mcp__github__create_pull_request,mcp__github__get_pull_request,mcp__github__get_pull_request_comments,mcp__github__get_pull_request_files,mcp__github__get_pull_request_reviews,mcp__github__get_pull_request_status,mcp__github__list_pull_requests,mcp__github__update_pull_request,mcp__github__update_pull_request_branch,mcp__github__update_pull_request_comment,mcp__github__merge_pull_request"
+          allowed_tools: "WebSearch,WebFetch,Bash(uv:*),Bash(pre-commit:*),Bash(pytest:*),Bash(ruff:*),Bash(pyright:*),Bash(git:*),Bash(gh:*),mcp__github__add_issue_comment,mcp__github__create_issue,mcp__github__get_issue,mcp__github__list_issues,mcp__github__search_issues,mcp__github__update_issue,mcp__github__update_issue_comment,mcp__github__create_pull_request,mcp__github__get_pull_request,mcp__github__get_pull_request_comments,mcp__github__get_pull_request_files,mcp__github__get_pull_request_reviews,mcp__github__get_pull_request_status,mcp__github__list_pull_requests,mcp__github__update_pull_request,mcp__github__update_pull_request_branch,mcp__github__update_pull_request_comment,mcp__github__merge_pull_request"
           additional_permissions: |
             actions: read