diff --git a/.claude/commands/init-bootstrap.md b/.claude/commands/init-bootstrap.md
index 2f649b2..f88b092 100644
--- a/.claude/commands/init-bootstrap.md
+++ b/.claude/commands/init-bootstrap.md
@@ -32,7 +32,9 @@ Then generate a customized CLAUDE.md file tailored to their needs.
    - Verify core dependencies are installed
    - Check git status:
      - If no .git folder: Initialize git repository
-     - If has remote origin: Remove it to disconnect from claudesidian
+     - If has remote origin: Ask about development work
+       - Personal vault: Remove origin and .github folder
+       - Contributing: Keep origin and workflows intact
      - If clean local repo: Ready to go
    - Don't create folders yet - wait until after asking about organization method
 
@@ -330,9 +332,24 @@ Now setting up your environment...
 [Installs dependencies with pnpm/npm]
 *Why: These tools enable Claude Code to work with your vault effectively*
 
-🔓 **Disconnecting from Original Repository**
-[Removes git remote to disconnect from original]
-*Why: This ensures you won't accidentally push your personal notes to the public repo*
+🔓 **Repository Setup**
+
+**Will you be contributing to claudesidian development?**
+- **No** (Personal vault only) → I'll remove GitHub workflows and disconnect from the repo
+- **Yes** (I want to contribute) → I'll keep the development setup intact
+
+[Implementation:]
+```bash
+# If user says "No" (personal vault):
+rm -rf .github  # Remove GitHub workflows
+git remote remove origin  # Disconnect from claudesidian repo
+
+# If user says "Yes" (contributing):
+# Keep .github folder and origin remote
+echo "Development setup preserved for contributing"
+```
+
+*Why: Personal vaults don't need GitHub Actions, but contributors benefit from the automation*
 
 📂 **Creating Folder Structure**
 [Creates folders based on your chosen organization method]
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
new file mode 100644
index 0000000..b1483db
--- /dev/null
+++ b/.github/workflows/claude.yml
@@ -0,0 +1,81 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.actor == 'heyitsnoah' || github.actor == 'dependabot[bot]') &&
+      (
+        (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+        (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+        (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+        (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+      )
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write      # Allow Claude to push changes
+      pull-requests: write  # Allow Claude to create/modify PRs
+      issues: write        # Allow Claude to create/update issues
+      id-token: write
+      actions: read        # Required for Claude to read CI results on PRs
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
+
+          # Allow Claude to run specific tools and commands
+          allowed_tools: |
+            Bash(pnpm install)
+            Bash(pnpm setup)
+            Bash(pnpm attachments:*)
+            Bash(pnpm vault:stats)
+            Bash(pnpm check-updates)
+            Bash(npm run *)
+            Bash(git status)
+            Bash(git diff *)
+            Bash(git log *)
+            Bash(git add *)
+            Bash(git commit *)
+            Bash(git push)
+            Bash(gh pr *)
+            Bash(gh issue *)
+            Bash(ls *)
+            Bash(cat *)
+            Bash(grep *)
+            Bash(find *)
+            View
+            GlobTool
+            GrepTool
+            BatchTool
+            Read
+            Write
+            Edit
+
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
+
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://docs.anthropic.com/en/docs/claude-code/sdk#command-line for available options
+          # claude_args: '--model claude-opus-4-1-20250805'
+