From 265abd13ec8315be0f71db4523db7cec4d1bfcdf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2026 13:41:21 +0900
Subject: [PATCH] fix: enable all Claude Code plugins and resolve claude.yml
 merge conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

プロジェクトの enabledPlugins に全プラグインを追加し、他リポジトリでもデフォルトで有効化されるようにする。
また claude.yml に残っていたマージコンフリクトマーカーを解消（sender.type による Bot 判定と詳細な concurrency group を採用）。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .claude/settings.json        | 18 +++++++++++++++++-
 .github/workflows/claude.yml | 10 ----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.claude/settings.json b/.claude/settings.json
index 174edadc..67de9409 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -278,6 +278,22 @@
     ]
   },
   "enabledPlugins": {
-    "typescript-lsp@claude-plugins-official": true
+    "typescript-lsp@claude-plugins-official": true,
+    "swift-lsp@claude-plugins-official": true,
+    "devops-automation@claude-code-templates": true,
+    "documentation-generator@claude-code-templates": true,
+    "backend-development@claude-code-workflows": true,
+    "code-refactoring@claude-code-workflows": true,
+    "database-design@claude-code-workflows": true,
+    "database-migrations@claude-code-workflows": true,
+    "full-stack-orchestration@claude-code-workflows": true,
+    "javascript-typescript@claude-code-workflows": true,
+    "kubernetes-operations@claude-code-workflows": true,
+    "feature-dev@claude-code-plugins": true,
+    "frontend-design@claude-code-plugins": true,
+    "hookify@claude-code-plugins": true,
+    "security-guidance@claude-code-plugins": true,
+    "nextjs-vercel-pro@claude-code-templates": true,
+    "supabase-toolkit@claude-code-templates": true
   }
 }
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 09677a04..91569b19 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -13,9 +13,6 @@ on:
 permissions: {}
 
 concurrency:
-<<<<<<< Updated upstream
-  group: claude-${{ github.repository }}-${{ github.event.issue.number || github.event.pull_request.number || github.run_id }}
-=======
   # イベント種別 + トリガーのコメント/レビューIDを含めることで、
   # 同一 PR/Issue 内でも異なるメンションが互いをキャンセルしない
   group: >-
@@ -28,20 +25,13 @@ concurrency:
       || github.event.review.id
       || github.run_id
     }}
->>>>>>> Stashed changes
   cancel-in-progress: false
 
 jobs:
   claude:
     # Bot 全般を除外（sender.type で判定するため、Bot 名のハードコードが不要）
     if: |
-<<<<<<< Updated upstream
-      github.actor != 'github-actions[bot]' &&
-      github.actor != 'dependabot[bot]' &&
-      github.actor != 'claude[bot]' &&
-=======
       github.event.sender.type != 'Bot' &&
->>>>>>> Stashed changes
       (
         (github.event_name == 'issue_comment' && contains(github.event.comment.body || '', '@claude') &&
           !(github.event.issue.pull_request && github.event.issue.pull_request.url && github.event.issue.draft == true)) ||