From b1f9c77dd931f1d186b4f82ef6a96f8f46d62596 Mon Sep 17 00:00:00 2001
From: Jeremiah Lowin <153965+jlowin@users.noreply.github.com>
Date: Thu, 8 Jan 2026 20:43:22 -0500
Subject: [PATCH] Fix Claude Code installation lock contention in CI workflows
 (#2815)

---
 .github/workflows/martian-issue-triage.yml | 3 +++
 .github/workflows/martian-test-failure.yml | 3 +++
 .github/workflows/marvin-dedupe-issues.yml | 3 +++
 .github/workflows/marvin-label-triage.yml  | 3 +++
 .github/workflows/marvin.yml               | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/.github/workflows/martian-issue-triage.yml b/.github/workflows/martian-issue-triage.yml
index d9c58220c..40424e8bc 100644
--- a/.github/workflows/martian-issue-triage.yml
+++ b/.github/workflows/martian-issue-triage.yml
@@ -155,6 +155,9 @@ jobs:
           }
           EOF
 
+      - name: Clean up stale Claude locks
+        run: rm -rf ~/.claude/.locks ~/.local/state/claude/locks || true
+
       - name: Run Martian for Issue Triage
         uses: anthropics/claude-code-action@v1
         with:
diff --git a/.github/workflows/martian-test-failure.yml b/.github/workflows/martian-test-failure.yml
index 927816cf2..9f7724fbd 100644
--- a/.github/workflows/martian-test-failure.yml
+++ b/.github/workflows/martian-test-failure.yml
@@ -163,6 +163,9 @@ jobs:
           }
           EOF
 
+      - name: Clean up stale Claude locks
+        run: rm -rf ~/.claude/.locks ~/.local/state/claude/locks || true
+
       - name: Run Claude Code
         id: claude
         uses: anthropics/claude-code-action@v1
diff --git a/.github/workflows/marvin-dedupe-issues.yml b/.github/workflows/marvin-dedupe-issues.yml
index d95460ecd..69d1fca9c 100644
--- a/.github/workflows/marvin-dedupe-issues.yml
+++ b/.github/workflows/marvin-dedupe-issues.yml
@@ -73,6 +73,9 @@ jobs:
           PROMPT_END
           EOF
 
+      - name: Clean up stale Claude locks
+        run: rm -rf ~/.claude/.locks ~/.local/state/claude/locks || true
+
       - name: Run Marvin dedupe command
         uses: anthropics/claude-code-action@v1
         with:
diff --git a/.github/workflows/marvin-label-triage.yml b/.github/workflows/marvin-label-triage.yml
index e04cb8137..2847c0e2e 100644
--- a/.github/workflows/marvin-label-triage.yml
+++ b/.github/workflows/marvin-label-triage.yml
@@ -124,6 +124,9 @@ jobs:
           PROMPT_END
           EOF
 
+      - name: Clean up stale Claude locks
+        run: rm -rf ~/.claude/.locks ~/.local/state/claude/locks || true
+
       - name: Run Marvin for Issue Triage
         uses: anthropics/claude-code-action@v1
         with:
diff --git a/.github/workflows/marvin.yml b/.github/workflows/marvin.yml
index d63eb27fb..da4967e45 100644
--- a/.github/workflows/marvin.yml
+++ b/.github/workflows/marvin.yml
@@ -56,6 +56,9 @@ jobs:
           app-id: ${{ secrets.MARVIN_APP_ID }}
           private-key: ${{ secrets.MARVIN_APP_PRIVATE_KEY }}
 
+      - name: Clean up stale Claude locks
+        run: rm -rf ~/.claude/.locks ~/.local/state/claude/locks || true
+
       # Marvin Assistant
       - name: Run Marvin
         uses: anthropics/claude-code-action@v1