herdr-worktreeinclude 0.1.0 → 0.2.1

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes are published in the [GitHub Releases](https://github.com/serhii-chernenko/herdr-worktreeinclude/releases) generated from version tags.
 
+## 0.2.1
+
+- Fixed the branch-cleanup popup's `[d] Delete branch` action never actually deleting the branch: it ran `git branch -d`, which refuses any branch that isn't fully merged — exactly the branches this popup exists for. It now uses `git branch -D` to honor the user's explicit confirmation.
+
+## 0.2.0
+
+- The branch-cleanup confirmation now opens as a small Herdr popup pane instead of a full overlay, using the `placement = "popup"` pane type added in Herdr 0.7.4. Raised `min_herdr_version` to `0.7.4` accordingly.
+
 ## 0.1.0
 
 - Initial Herdr plugin: project-local worktrees, `.worktreeinclude` copying, and UI-first branch cleanup.

package/README.md

@@ -1,5 +1,11 @@
 # herdr-worktreeinclude
 
+[![npm version](https://img.shields.io/npm/v/herdr-worktreeinclude?logo=npm)](https://www.npmjs.com/package/herdr-worktreeinclude)
+[![npm downloads](https://img.shields.io/npm/dm/herdr-worktreeinclude?logo=npm)](https://www.npmjs.com/package/herdr-worktreeinclude)
+[![CI](https://github.com/serhii-chernenko/herdr-worktreeinclude/actions/workflows/ci.yml/badge.svg)](https://github.com/serhii-chernenko/herdr-worktreeinclude/actions/workflows/ci.yml)
+[![GitHub stars](https://img.shields.io/github/stars/serhii-chernenko/herdr-worktreeinclude?style=flat)](https://github.com/serhii-chernenko/herdr-worktreeinclude/stargazers)
+[![Herdr Marketplace](https://img.shields.io/badge/Herdr-Marketplace-4f46e5)](https://herdr.dev/docs/marketplace/)
+
 A [Herdr](https://herdr.dev) plugin that keeps Herdr-created Git worktrees inside the project and restores selected ignored files into them.
 
 ## What it does
@@ -10,7 +16,7 @@ Use Herdr's normal **New worktree** UI. After creation, the plugin automatically
 - copies files selected by `.worktreeinclude` from the primary checkout;
 - opens the relocated worktree as the active Herdr workspace.
 
-When you remove a plugin-managed worktree through Herdr's normal UI, an unchanged branch (one already contained in the primary checkout's `HEAD`) is removed silently. For a branch with unique commits, Herdr shows an in-terminal overlay: press `d` to safely delete the local branch or Enter to keep it.
+When you remove a plugin-managed worktree through Herdr's normal UI, an unchanged branch (one already contained in the primary checkout's `HEAD`) is removed silently. For a branch with unique commits, Herdr shows a small popup pane: press `d` to safely delete the local branch or Enter to keep it.
 
 The plugin cannot change Herdr's built-in creation/removal dialogs. It uses lifecycle hooks immediately after those dialogs complete.
 
@@ -89,3 +95,10 @@ git push origin main v0.1.1
 ```
 
 The tag workflow verifies the version, publishes to npm through npm Trusted Publishing, and creates GitHub Release notes automatically. After claiming the package name with an initial manual publish, configure npm's Trusted Publisher for GitHub repository `serhii-chernenko/herdr-worktreeinclude` and workflow filename `publish.yml`. Subsequent matching version tags publish without a stored npm token.
+
+## Screenshots
+
+<img width="2262" height="1380" alt="shot-mrmikk98" src="https://github.com/user-attachments/assets/ac422fbb-0af1-4606-8081-2740220ea474" />
+<img width="2338" height="1240" alt="shot-mrmil9fr" src="https://github.com/user-attachments/assets/9cefdb30-1bd0-4b78-a265-ac55a7a87cad" />
+<img width="1234" height="436" alt="shot-mrmink67" src="https://github.com/user-attachments/assets/b7dec468-aa1e-434f-bc79-e334e90b5d22" />
+

package/herdr-plugin.toml

@@ -1,7 +1,7 @@
 id = "serhii-chernenko.worktreeinclude"
 name = "Project-local Worktrees"
-version = "0.1.0"
-min_herdr_version = "0.7.0"
+version = "0.2.1"
+min_herdr_version = "0.7.4"
 description = "Creates project-local Git worktrees and restores ignored files selected by .worktreeinclude."
 platforms = ["macos", "linux"]
 
@@ -22,5 +22,7 @@ command = ["bash", "scripts/create-worktree.sh"]
 [[panes]]
 id = "branch-cleanup"
 title = "Delete local branch?"
-placement = "overlay"
+placement = "popup"
+width = 76
+height = 12
 command = ["bash", "scripts/branch-cleanup-pane.sh"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-worktreeinclude",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Project-local Git worktrees and .worktreeinclude support for Herdr.",
   "keywords": [
     "herdr",

package/scripts/branch-cleanup-pane.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-# Herdr overlay pane shown after a worktree checkout has been removed.
+# Herdr popup pane shown after a worktree checkout has been removed.
+# Popups have no pane id and close automatically when this script exits.
 set -euo pipefail
 
 source_root=${HERDR_WORKTREEINCLUDE_SOURCE:?Missing source repository}
@@ -13,8 +14,5 @@ read -r -n 1 choice || true
 printf '\n'
 
 if [[ "$choice" == "d" || "$choice" == "D" ]]; then
-  git -C "$source_root" branch -d -- "$branch" >&2 || true
+  git -C "$source_root" branch -D -- "$branch" >&2 || true
 fi
-
-herdr_bin=${HERDR_BIN_PATH:-herdr}
-"$herdr_bin" plugin pane close "${HERDR_PANE_ID:?Missing Herdr pane id}" || true

package/scripts/on-worktree-removed.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Open an in-Herdr branch-cleanup overlay after a plugin-managed checkout is
+# Open an in-Herdr branch-cleanup popup after a plugin-managed checkout is
 # removed. This hook deliberately does not use macOS dialogs.
 set -euo pipefail
 
@@ -30,7 +30,6 @@ fi
 "$herdr_bin" plugin pane open \
   --plugin "${HERDR_PLUGIN_ID:-serhii-chernenko.worktreeinclude}" \
   --entrypoint branch-cleanup \
-  --placement overlay \
+  --placement popup \
   --env "HERDR_WORKTREEINCLUDE_SOURCE=$source" \
-  --env "HERDR_WORKTREEINCLUDE_BRANCH=$branch" \
-  --focus
+  --env "HERDR_WORKTREEINCLUDE_BRANCH=$branch"