diff --git a/.github/workflows/bunaider-review-response.yml b/.github/workflows/bunaider-review-response.yml
new file mode 100644
index 0000000..3884dc3
--- /dev/null
+++ b/.github/workflows/bunaider-review-response.yml
@@ -0,0 +1,27 @@
+name: Bunaider PR Review Response
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  respond-to-review:
+    if: github.event.review.state == 'changes_requested' && contains(github.event.review.body, 'aider:')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+
+      - name: Install bunaider
+        run: bun install -g bunaider
+
+      - run: bunaider init
+
+      - name: Run bunaider fix on PR
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+          AIDER_SONNET: 1
+        run: bunaider fix ${{ github.event.pull_request.number }}
diff --git a/.github/workflows/bunaider.yml b/.github/workflows/bunaider.yml
new file mode 100644
index 0000000..7e3ddaa
--- /dev/null
+++ b/.github/workflows/bunaider.yml
@@ -0,0 +1,27 @@
+name: Bunaider Auto-Fix
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  auto-fix:
+    if: github.event.label.name == 'aider'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+
+      - name: Install bunaider
+        run: bun install -g bunaider
+
+      - run: bunaider init
+
+      - name: Run bunaider fix
+        env:
+          GITHUB_TOKEN: ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}
+          ANTHROPIC_API_KEY: ${{ secrets.TSCIRCUIT_BOT_ANTHROPIC_API_KEY }}
+          AIDER_SONNET: 1
+        run: bunaider fix ${{ github.event.issue.number }}