From ac55090543717605df8398effd5de8efd29b9edb Mon Sep 17 00:00:00 2001
From: JacobPEvans <20714140+JacobPEvans@users.noreply.github.com>
Date: Mon, 16 Mar 2026 23:02:05 -0400
Subject: [PATCH 1/2] chore(plugins): bump git-workflows and git-standards to
 1.0.1

Invalidates plugin cache so the safe stale worktree definition from
PR #133 takes effect. Also includes two minor worktree-conventions
improvements: consistent {branch} placeholder style and squash-merge
guidance for git branch -d failures.

(claude)
---
 .claude/rules/worktree-conventions.md    | 3 ++-
 git-standards/.claude-plugin/plugin.json | 2 +-
 git-workflows/.claude-plugin/plugin.json | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.claude/rules/worktree-conventions.md b/.claude/rules/worktree-conventions.md
index d372690..11575d4 100644
--- a/.claude/rules/worktree-conventions.md
+++ b/.claude/rules/worktree-conventions.md
@@ -24,9 +24,10 @@ Examples:
 
 1. Switch to main and sync: `cd ~/git/{repo-name}/main && git switch main && git pull`
 2. Clean stale worktrees (merged PRs or `[gone]` remote branches):
-   - `gh pr list --state merged --head <branch>` to confirm PR was merged
+   - `gh pr list --state merged --head {branch}` to confirm PR was merged
    - `git branch -vv | grep '\[gone\]'` to find deleted remote branches
    - `git worktree remove {path}` (never `--force`) + `git branch -d {branch}`
+   - If `git branch -d` fails (branch not merged locally, e.g. squash-merge), investigate before using `git branch -D`
    - `git worktree prune` to clean up
 
 ## After Creating
diff --git a/git-standards/.claude-plugin/plugin.json b/git-standards/.claude-plugin/plugin.json
index 5af111d..e407436 100644
--- a/git-standards/.claude-plugin/plugin.json
+++ b/git-standards/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "git-standards",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Git workflow standards, branch hygiene, PR creation guards, and issue linking",
   "author": {
     "name": "JacobPEvans"
diff --git a/git-workflows/.claude-plugin/plugin.json b/git-workflows/.claude-plugin/plugin.json
index efa7a22..929c06d 100644
--- a/git-workflows/.claude-plugin/plugin.json
+++ b/git-workflows/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "git-workflows",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Git main branch sync, repository refresh, and PR merge workflows",
   "author": {
     "name": "JacobPEvans"

From ed2fe9f4929c9e7695c5167ed3c900bf4d9175eb Mon Sep 17 00:00:00 2001
From: JacobPEvans <20714140+JacobPEvans@users.noreply.github.com>
Date: Mon, 16 Mar 2026 23:08:29 -0400
Subject: [PATCH 2/2] fix: sync marketplace.json versions with plugin.json
 bumps

(claude)
---
 .claude-plugin/marketplace.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index a127bb6..884d427 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -31,7 +31,7 @@
       "name": "git-workflows",
       "source": "./git-workflows",
       "description": "Git worktree initialization, main branch sync, repository refresh, and troubleshooting workflows",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "author": {
         "name": "JacobPEvans"
       }
@@ -94,7 +94,7 @@
       "name": "git-standards",
       "source": "./git-standards",
       "description": "Git workflow standards, branch hygiene, PR creation guards, and issue linking",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "author": {
         "name": "JacobPEvans"
       }