Merge pull request #22 from netresearch/feature/evals-and-improvements

feat: expand evals to 20 and improve SKILL.md

Author: CybotTM

.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "git-workflow",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Git workflow best practices with commit validation hooks",
   "repository": "https://github.com/netresearch/git-workflow-skill",
   "license": "(MIT AND CC-BY-SA-4.0)",

evals/evals.json

@@ -5,13 +5,91 @@
       "id": 1,
       "name": "recommend-hooks-go",
       "prompt": "What git hooks should I set up for a Go project? Give me a ready-to-use config.",
-      "expected_output": "Should recommend lefthook with a template config covering pre-commit, commit-msg, pre-push"
+      "expected_output": "Should recommend lefthook with a template config covering pre-commit (gofmt, go vet), commit-msg, pre-push (golangci-lint)"
     },
     {
       "id": 2,
       "name": "recommend-hooks-php",
       "prompt": "What git hooks framework should I use for a TYPO3 PHP extension?",
-      "expected_output": "Should recommend captainhook with setup instructions"
+      "expected_output": "Should recommend captainhook with setup instructions including php-cs-fixer and phpstan"
+    },
+    {
+      "id": 3,
+      "name": "choose-branching-strategy",
+      "prompt": "We're a 4-person team shipping a SaaS product with continuous deployment. Which branching strategy fits best?",
+      "expected_output": "Should recommend GitHub Flow or trunk-based development, explain why Git Flow is overkill for small continuous-deploy teams"
+    },
+    {
+      "id": 4,
+      "name": "breaking-change-commit",
+      "prompt": "Write a conventional commit message for removing the deprecated /api/v1 endpoints.",
+      "expected_output": "Should use feat! or fix! prefix and include BREAKING CHANGE footer explaining migration path"
+    },
+    {
+      "id": 5,
+      "name": "resolve-review-threads",
+      "prompt": "How do I programmatically reply to and resolve PR review threads using the gh CLI?",
+      "expected_output": "Should show gh api graphql mutations for addPullRequestReviewThreadReply and resolveReviewThread"
+    },
+    {
+      "id": 6,
+      "name": "immutable-release-recovery",
+      "prompt": "I deleted a GitHub release v2.0.0 and now I can't recreate it. What happened?",
+      "expected_output": "Should explain GitHub immutable releases (GA Oct 2024), that deleted release tags are permanently blocked, and advise bumping to v2.0.1"
+    },
+    {
+      "id": 7,
+      "name": "signed-commits-rebase",
+      "prompt": "gh pr merge --rebase fails with 'Base branch requires signed commits'. How do I merge this PR?",
+      "expected_output": "Should explain GitHub can't sign rebased commits, recommend local fast-forward merge with --ff-only to preserve original signatures"
+    },
+    {
+      "id": 8,
+      "name": "multi-branch-latest-badge",
+      "prompt": "When I release v11.0.17 after v13.5.0, the Latest badge moves to v11. How to prevent?",
+      "expected_output": "Should recommend --latest=false for non-default branch releases, show gh release edit to reassign badge"
+    },
+    {
+      "id": 9,
+      "name": "git-bisect-automated",
+      "prompt": "Tests pass on v1.0 but fail on HEAD. How do I automate finding the breaking commit?",
+      "expected_output": "Should show git bisect start + git bisect run with test command for automated binary search"
+    },
+    {
+      "id": 10,
+      "name": "cherry-pick-backport",
+      "prompt": "How do I backport a security fix from main to the release/2.x branch?",
+      "expected_output": "Should show git cherry-pick workflow with -x flag, conflict resolution, and force-push if needed"
+    },
+    {
+      "id": 11,
+      "name": "pr-merge-full-lifecycle",
+      "prompt": "Walk me through the complete PR merge lifecycle from CI verification to post-merge cleanup.",
+      "expected_output": "Should cover: gh pr checks, annotation inspection, thread resolution, merge strategy selection, post-merge branch cleanup"
+    },
+    {
+      "id": 12,
+      "name": "setup-branch-protection",
+      "prompt": "Set up branch protection for main requiring 2 reviews, CI checks, and signed commits.",
+      "expected_output": "Should show GitHub branch protection configuration with required_approving_reviews, required_status_checks, and signed commits"
+    },
+    {
+      "id": 13,
+      "name": "semantic-release-setup",
+      "prompt": "Configure semantic release for automated versioning based on conventional commits.",
+      "expected_output": "Should show .releaserc config with commit-analyzer, release-notes-generator, and GitHub Actions integration"
+    },
+    {
+      "id": 14,
+      "name": "git-absorb-review-fixes",
+      "prompt": "I need to fix code in 3 different commits from review feedback. How do I avoid messy interactive rebase?",
+      "expected_output": "Should recommend git-absorb for automatic fixup commit creation, then autosquash rebase"
+    },
+    {
+      "id": 15,
+      "name": "worktree-review-workflow",
+      "prompt": "How do I review a PR without stashing my current work?",
+      "expected_output": "Should recommend git worktree to create separate working directory for the review branch"
     }
   ]
 }

skills/git-workflow/SKILL.md

@@ -5,7 +5,7 @@ license: "(MIT AND CC-BY-SA-4.0). See LICENSE-MIT and LICENSE-CC-BY-SA-4.0"
 compatibility: "Requires git, gh CLI."
 metadata:
   author: Netresearch DTT GmbH
-  version: "1.10.0"
+  version: "1.11.0"
   repository: https://github.com/netresearch/git-workflow-skill
 allowed-tools: Bash(git:*) Bash(gh:*) Read Write
 ---
@@ -14,35 +14,22 @@ allowed-tools: Bash(git:*) Bash(gh:*) Read Write
 
 Expert patterns for Git version control: branching, commits, collaboration, and CI/CD.
 
-## Expertise Areas
-
-- **Branching**: Git Flow, GitHub Flow, Trunk-based development
-- **Commits**: Conventional Commits, semantic versioning
-- **Collaboration**: PR workflows, code review, merge strategies, thread resolution
-- **CI/CD**: GitHub Actions, GitLab CI, branch protection
-
 ## Reference Files
 
-| Reference | When to Load |
-|-----------|--------------|
-| `references/branching-strategies.md` | Managing branches, choosing branching model |
-| `references/commit-conventions.md` | Writing commits, semantic versioning |
-| `references/pull-request-workflow.md` | Creating/reviewing PRs, thread resolution, merging |
-| `references/ci-cd-integration.md` | CI/CD automation, GitHub Actions |
-| `references/advanced-git.md` | Rebasing, cherry-picking, bisecting |
-| `references/github-releases.md` | Release management, immutable releases |
-| `references/git-hooks-setup.md` | Hook frameworks, detection, recommended hooks |
-| `references/code-quality-tools.md` | Shell linting, formatting, smart fixups, structural diffs |
-
-### Content Triggers
+Load references on demand based on the task at hand:
 
-- **PR operations** (create, review, merge, thread resolution, conflicts, CI checks): load `references/pull-request-workflow.md`
-- **Branching strategy**: load `references/branching-strategies.md`
-- **Commit messages**: load `references/commit-conventions.md`
-- **Releases**: load `references/github-releases.md`
-- **Git hooks**: detect with `ls lefthook.yml captainhook.json .pre-commit-config.yaml .husky/pre-commit 2>/dev/null`. Details in `references/git-hooks-setup.md`
+| Reference | Content Triggers |
+|-----------|-----------------|
+| `references/branching-strategies.md` | Branching model, Git Flow, GitHub Flow, trunk-based, branch protection |
+| `references/commit-conventions.md` | Commit messages, conventional commits, semantic versioning, commitlint |
+| `references/pull-request-workflow.md` | PR create/review/merge, thread resolution, merge strategies, CODEOWNERS, signed commits + rebase |
+| `references/ci-cd-integration.md` | GitHub Actions, GitLab CI, semantic release, deployment |
+| `references/advanced-git.md` | Rebase, cherry-pick, bisect, stash, worktrees, reflog, submodules, recovery |
+| `references/github-releases.md` | Release management, immutable releases, `--latest=false`, multi-branch |
+| `references/git-hooks-setup.md` | Hook frameworks, detection, recommended hooks per stage |
+| `references/code-quality-tools.md` | shellcheck, shfmt, git-absorb, difftastic |
 
-## Conventional Commits (Quick Reference)
+## Conventional Commits
 
 ```
 <type>[scope]: <description>
@@ -54,32 +41,32 @@ Expert patterns for Git version control: branching, commits, collaboration, and
 
 ## Branch Naming
 
-```bash
+```
 feature/TICKET-123-description
 fix/TICKET-456-bug-name
 release/1.2.0
 hotfix/1.2.1-security-patch
 ```
 
-## GitHub Flow (Default)
+## Hook Detection
+
+Before first commit, detect and install hooks:
 
 ```bash
-git checkout main && git pull
-git checkout -b feature/my-feature
-# ... work ...
-git push -u origin HEAD
-gh pr create && gh pr merge --squash
+ls lefthook.yml .lefthook.yml captainhook.json .pre-commit-config.yaml .husky/pre-commit 2>/dev/null || echo "No hooks"
 ```
 
-Before first commit, install git hooks — see `references/git-hooks-setup.md`.
+Install: lefthook.yml -> `lefthook install` | captainhook.json -> `composer install` | .husky/ -> `npm install` | .pre-commit-config.yaml -> `pre-commit install`
 
-For code quality tools (shellcheck, shfmt, git-absorb, difft), see `references/code-quality-tools.md`.
+## Critical Release Rules
 
-## GitHub Immutable Releases
+1. **Immutable releases**: Deleted GitHub releases block tag names PERMANENTLY. Never delete releases to "fix" issues -- bump version instead.
+2. **Multi-branch releases**: Always use `--latest=false` when releasing from non-default branches (LTS, maintenance, hotfix).
+3. **Pre-release checklist**: Version updated in source files, CI passes, CHANGELOG updated, `git pull` on main -- verify BEFORE `gh release create`.
 
-**CRITICAL**: Deleted releases block tag names PERMANENTLY. Get releases right first time.
+## PR Merge Requirements
 
-See `references/github-releases.md` for prevention and recovery patterns.
+Before merging: all threads resolved, CI checks green (including annotations), branch rebased, commits signed (if required). For signed commits + rebase-only repos, use local `git merge --ff-only`.
 
 ## Verification