@codebend3r/che 1.2.1 → 1.2.3

package/bin/git/prune-worktrees.py

@@ -1,14 +1,18 @@
 #!/usr/bin/env python3
 """🌿 Remove every linked worktree in the current repository, then prune records.
 
-The main worktree (the one containing .git) is always left untouched.
+The main worktree (the one containing .git) is always left untouched. A locked
+worktree is unlocked first, since a lock only guards against an accidental
+removal and this command is the deliberate one. A worktree with uncommitted
+changes is kept, lock and all, unless --force is given; one failure never stops
+the rest.
 
 Usage:
   prune-worktrees.py [--dry-run] [--force]
 
 Options:
   --dry-run    Show what would be removed, change nothing
-  --force      Pass --force to 'git worktree remove' (drops dirty trees)
+  --force      Remove worktrees with uncommitted changes too
   --help       Show help
 
 Env:
@@ -22,7 +26,7 @@ from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
-from gitutils import park_main_worktree, skip_git_hooks, worktrees
+from gitutils import park_main_worktree, skip_git_hooks, worktree_is_clean, worktrees
 from utils import (
     add_bool_flag,
     build_parser,
@@ -37,7 +41,7 @@ from utils import (
     warning,
 )
 
-__version__ = "1.3.0"
+__version__ = "1.4.0"
 
 
 def main(argv: list[str] | None = None) -> int:
@@ -54,7 +58,7 @@ def main(argv: list[str] | None = None) -> int:
     add_bool_flag(
         parser,
         "--force",
-        help="Pass --force to 'git worktree remove' (drops dirty trees)",
+        help="Remove worktrees with uncommitted changes too",
     )
     args = parser.parse_args(argv)
 
@@ -69,7 +73,7 @@ def main(argv: list[str] | None = None) -> int:
     main_wt = park_main_worktree("prune", dry_run=args.dry_run)
 
     info("🔍 Listing worktrees...")
-    linked = [worktree.path for worktree in worktrees(main_wt)[1:]]
+    linked = worktrees(main_wt)[1:]
 
     if not linked:
         success("✨ No linked worktrees. Running prune anyway... 🎉")
@@ -83,20 +87,54 @@ def main(argv: list[str] | None = None) -> int:
 
     if args.dry_run:
         warning(f"🌵 {len(linked)} worktree(s) would be removed:")
-        for path in linked:
-            warning(f"  • 🪦 {path}")
+        for worktree in linked:
+            note = " (locked; would unlock first)" if worktree.locked else ""
+            warning(f"  • 🪦 {worktree.path}{note}")
         info("📜 Would also run: git worktree prune --verbose")
         dry_run_complete("removed")
         return 0
 
-    remove_args = ["--force"] if args.force else []
-    for path in linked:
-        warning(f"🗑️  Removing: {path}")
-        run(["git", "worktree", "remove", *remove_args, path], cwd=main_wt)
+    removed = 0
+    kept: list[str] = []
+    for worktree in linked:
+        warning(f"🗑️  Removing: {worktree.path}")
+        # DELIBERATE DIVERGENCE: a lock used to abort the whole run with git's
+        # "cannot remove a locked working tree". Unlock, but only once the
+        # removal is certain to be allowed, so a kept worktree keeps its lock.
+        # A checkout whose directory is gone has no work left to lose.
+        gone = not Path(worktree.path).is_dir()
+        if not (args.force or gone) and not worktree_is_clean(worktree.path):
+            warning("  ⏭️  Uncommitted changes; kept (use --force to remove)")
+            kept.append(worktree.path)
+            continue
+        if worktree.locked:
+            info("  🔓 Unlocking")
+            run(["git", "worktree", "unlock", worktree.path], cwd=main_wt, check=False)
+        removal = run(
+            [
+                "git",
+                "worktree",
+                "remove",
+                *(["--force"] if args.force or gone else []),
+                worktree.path,
+            ],
+            cwd=main_wt,
+            check=False,
+        )
+        if removal.returncode:
+            warning(f"  ❌ Could not remove: {worktree.path}")
+            kept.append(worktree.path)
+        else:
+            removed += 1
 
     info("🧹 Pruning stale worktree records...")
     run(["git", "worktree", "prune", "--verbose"], cwd=main_wt)
-    success(f"✨ Removed {len(linked)} worktree(s). 🎉")
+    success(f"✨ Removed {removed} worktree(s). 🎉")
+    if kept:
+        warning(f"⚠️  {len(kept)} worktree(s) kept:")
+        for path in kept:
+            warning(f"  • {path}")
+        return 1
     return 0
 
 

package/bin/git/sync-all-branches.py

@@ -1,10 +1,14 @@
 #!/usr/bin/env python3
-"""🔄 Update every branch and worktree, keeping checkouts, locks and local work.
+"""🔄 Update every branch and worktree, and prune what has been merged.
 
-Fetch once, rebase branches onto their upstream (or origin/<branch>), and track
-new origin branches authored by you. Dirty tracked/untracked work is saved in
-an exact recovery stash and restored with its index. Conflicts are reported;
-independent branches continue. Nothing is pushed, hard reset or deleted.
+Fetch once, delete branches (and their clean worktrees) that were merged into a
+main or dev branch and whose upstream is gone, rebase the rest onto their
+upstream (or origin/<branch>), and track new origin branches authored by you.
+Worktrees stay worktrees and are updated in place. A branch whose changes are
+all already upstream moves to its upstream instead of replaying them. Dirty
+tracked/untracked work is saved in an exact recovery stash and restored with
+its index. Conflicts are reported; independent branches continue. Nothing is
+pushed. No local change is ever discarded.
 
 Usage:
   sync-all-branches.py [--dry-run] [--author=EMAIL] [--limit=N]
@@ -45,7 +49,7 @@ from utils import (
     warning,
 )
 
-__version__ = "3.0.0"
+__version__ = "3.2.0"
 
 
 def track_new(sync: BranchSync, author: str, limit: int) -> list[str]:
@@ -79,7 +83,7 @@ def track_new(sync: BranchSync, author: str, limit: int) -> list[str]:
 def main(argv: list[str] | None = None) -> int:
     parser = build_parser(
         prog="sync-all-branches",
-        description="🔄 Update every branch and worktree, preserving locks and local work.",
+        description="🔄 Update every branch and worktree, and prune what has been merged.",
     )
     add_bool_flag(
         parser,
@@ -119,8 +123,9 @@ def main(argv: list[str] | None = None) -> int:
     original = current_branch(root) or run_output(["git", "rev-parse", "--short", "HEAD"], cwd=root)
     info(f"📍 Keeping caller checkout: {original}")
     # DELIBERATE DIVERGENCE: the old sync parked on main and delegated cleanup.
-    # Preserve active workspaces instead, and never discard a gone-upstream
-    # branch merely because its remote was deleted. Dry-run must not fetch.
+    # Preserve active workspaces instead, and never delete a gone-upstream
+    # branch merely because its remote was deleted: only once it is proven
+    # merged (BranchSync.drop_gone). Dry-run must not fetch.
     if args.dry_run:
         info("🌵 Cached remote refs only; no fetch. Results reflect the last fetch.")
     else:

package/bin/gitutils.py

@@ -142,6 +142,7 @@ def local_branches(*fields: str, sort: str = "", cwd: str | Path | None = None)
 class Worktree(NamedTuple):
     path: str
     branch: str  # "" when detached (or bare): it pins no branch
+    locked: bool = False  # `git worktree lock`: git refuses to remove or prune it
 
 
 def worktrees(cwd: str | Path | None = None) -> list[Worktree]:
@@ -162,6 +163,8 @@ def worktrees(cwd: str | Path | None = None) -> list[Worktree]:
             # Every record opens with its `worktree` line, so this belongs to
             # the last one appended.
             found[-1] = found[-1]._replace(branch=line.removeprefix("branch refs/heads/"))
+        elif line == "locked" or line.startswith("locked "):
+            found[-1] = found[-1]._replace(locked=True)
     return found
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebend3r/che",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Helper scripts shared across machines, called by name from your shell and browsable through one menu",
   "keywords": [
     "cli",

package/shell/che.bash

@@ -1,4 +1,4 @@
-# che 1.2.1 - generated file, do not edit.
+# che 1.2.3 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -59,7 +59,8 @@ _che_restore_aliases() {
 
 _che_stash_aliases che_notify che all-actions all-actions-watch \
   checkout-my-branches clean-stale-branches clean-stale-branches-dr \
-  prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr \
+  hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees \
+  prune-worktrees-dr sync-all-branches sync-all-branches-dr \
   update-from-origin update-local-branches show-codecs fix-codecs \
   fix-codecs-dr find-video-mkv-issues validate-video-files \
   scan-videos-audio-language remove-metadata rename-video-file \
@@ -126,6 +127,18 @@ clean-stale-branches-dr() {
   che_notify 7 $?
 }
 
+# Check out every local branch and hard reset it to origin/<branch>
+hard-reset-all-branches() {
+  DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" "$@"
+  che_notify 4 $?
+}
+
+# Check out every local branch and hard reset it to origin/<branch> (preview only)
+hard-reset-all-branches-dr() {
+  DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" "$@"
+  che_notify 7 $?
+}
+
 # Remove every linked worktree, then prune stale admin records
 prune-worktrees() {
   DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/prune-worktrees.py" "$@"
@@ -138,13 +151,13 @@ prune-worktrees-dr() {
   che_notify 7 $?
 }
 
-# Update every branch and worktree, preserving locks and local work
+# Update every branch and worktree, pruning what has been merged
 sync-all-branches() {
   DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" "$@"
   che_notify 7 $?
 }
 
-# Update every branch and worktree, preserving locks and local work (preview only)
+# Update every branch and worktree, pruning what has been merged (preview only)
 sync-all-branches-dr() {
   DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" "$@"
   che_notify 7 $?

package/shell/che.fish

@@ -1,4 +1,4 @@
-# che 1.2.1 - generated file, do not edit.
+# che 1.2.3 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -68,6 +68,16 @@ function clean-stale-branches-dr --description 'Delete local branches whose upst
     che_notify 7 $status
 end
 
+function hard-reset-all-branches --description 'Check out every local branch and hard reset it to origin/<branch>'
+    env DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" $argv
+    che_notify 4 $status
+end
+
+function hard-reset-all-branches-dr --description 'Check out every local branch and hard reset it to origin/<branch> (preview only)'
+    env DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" $argv
+    che_notify 7 $status
+end
+
 function prune-worktrees --description 'Remove every linked worktree, then prune stale admin records'
     env DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/prune-worktrees.py" $argv
     che_notify 4 $status
@@ -78,12 +88,12 @@ function prune-worktrees-dr --description 'Remove every linked worktree, then pr
     che_notify 7 $status
 end
 
-function sync-all-branches --description 'Update every branch and worktree, preserving locks and local work'
+function sync-all-branches --description 'Update every branch and worktree, pruning what has been merged'
     env DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" $argv
     che_notify 7 $status
 end
 
-function sync-all-branches-dr --description 'Update every branch and worktree, preserving locks and local work (preview only)'
+function sync-all-branches-dr --description 'Update every branch and worktree, pruning what has been merged (preview only)'
     env DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" $argv
     che_notify 7 $status
 end

package/shell/che.zsh

@@ -1,4 +1,4 @@
-# che 1.2.1 - generated file, do not edit.
+# che 1.2.3 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -65,7 +65,8 @@ _che_restore_aliases() {
 
 _che_stash_aliases che_notify che all-actions all-actions-watch \
   checkout-my-branches clean-stale-branches clean-stale-branches-dr \
-  prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr \
+  hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees \
+  prune-worktrees-dr sync-all-branches sync-all-branches-dr \
   update-from-origin update-local-branches show-codecs fix-codecs \
   fix-codecs-dr find-video-mkv-issues validate-video-files \
   scan-videos-audio-language remove-metadata rename-video-file \
@@ -132,6 +133,18 @@ clean-stale-branches-dr() {
   che_notify 7 $?
 }
 
+# Check out every local branch and hard reset it to origin/<branch>
+hard-reset-all-branches() {
+  DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" "$@"
+  che_notify 4 $?
+}
+
+# Check out every local branch and hard reset it to origin/<branch> (preview only)
+hard-reset-all-branches-dr() {
+  DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/hard-reset-all-branches.py" "$@"
+  che_notify 7 $?
+}
+
 # Remove every linked worktree, then prune stale admin records
 prune-worktrees() {
   DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/prune-worktrees.py" "$@"
@@ -144,13 +157,13 @@ prune-worktrees-dr() {
   che_notify 7 $?
 }
 
-# Update every branch and worktree, preserving locks and local work
+# Update every branch and worktree, pruning what has been merged
 sync-all-branches() {
   DRY_RUN=false "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" "$@"
   che_notify 7 $?
 }
 
-# Update every branch and worktree, preserving locks and local work (preview only)
+# Update every branch and worktree, pruning what has been merged (preview only)
 sync-all-branches-dr() {
   DRY_RUN=true "$CHE_PYTHON" "$CHE_BIN/git/sync-all-branches.py" "$@"
   che_notify 7 $?

package/shell/completions/_che

@@ -1,5 +1,5 @@
 #compdef che
-# che 1.2.1 - generated file, do not edit.
+# che 1.2.3 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -11,6 +11,8 @@ _che_flags_for() {
     checkout-my-branches) print -r -- '--author= --limit= --help' ;;
     clean-stale-branches) print -r -- '--dry-run --protect= --help' ;;
     clean-stale-branches-dr) print -r -- '--dry-run --protect= --help' ;;
+    hard-reset-all-branches) print -r -- '--dry-run --force --help' ;;
+    hard-reset-all-branches-dr) print -r -- '--dry-run --force --help' ;;
     prune-worktrees) print -r -- '--dry-run --force --help' ;;
     prune-worktrees-dr) print -r -- '--dry-run --force --help' ;;
     sync-all-branches) print -r -- '--dry-run --author= --limit= --help' ;;
@@ -83,10 +85,12 @@ _che() {
     'checkout-my-branches:Check out recent remote branches you authored that aren'"'"'t local yet'
     'clean-stale-branches:Delete local branches whose upstream is gone'
     'clean-stale-branches-dr:Delete local branches whose upstream is gone (preview)'
+    'hard-reset-all-branches:Check out every local branch and hard reset it to origin/<branch>'
+    'hard-reset-all-branches-dr:Check out every local branch and hard reset it to origin/<branch> (preview)'
     'prune-worktrees:Remove every linked worktree, then prune stale admin records'
     'prune-worktrees-dr:Remove every linked worktree, then prune stale admin records (preview)'
-    'sync-all-branches:Update every branch and worktree, preserving locks and local work'
-    'sync-all-branches-dr:Update every branch and worktree, preserving locks and local work (preview)'
+    'sync-all-branches:Update every branch and worktree, pruning what has been merged'
+    'sync-all-branches-dr:Update every branch and worktree, pruning what has been merged (preview)'
     'update-from-origin:Alias of sync-all-branches'
     'update-local-branches:Rebase every local branch that has an upstream onto origin'
     'show-codecs:Report media files outside the Direct Play codec/container set'
@@ -143,4 +147,4 @@ _che_wrapper() {
 }
 
 compdef _che che
-compdef _che_wrapper all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop
+compdef _che_wrapper all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop

package/shell/completions/che.bash

@@ -1,4 +1,4 @@
-# che 1.2.1 - generated file, do not edit.
+# che 1.2.3 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -11,6 +11,8 @@ _che_flags_for() {
     checkout-my-branches) echo "--author= --limit= --help" ;;
     clean-stale-branches) echo "--dry-run --protect= --help" ;;
     clean-stale-branches-dr) echo "--dry-run --protect= --help" ;;
+    hard-reset-all-branches) echo "--dry-run --force --help" ;;
+    hard-reset-all-branches-dr) echo "--dry-run --force --help" ;;
     prune-worktrees) echo "--dry-run --force --help" ;;
     prune-worktrees-dr) echo "--dry-run --force --help" ;;
     sync-all-branches) echo "--dry-run --author= --limit= --help" ;;
@@ -92,7 +94,7 @@ _che_complete() {
   local cur="${COMP_WORDS[COMP_CWORD]}"
 
   if [ "$COMP_CWORD" -eq 1 ]; then
-    _che_reply "" < <(compgen -W "all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop install update doctor uninstall list completions" -- "$cur")
+    _che_reply "" < <(compgen -W "all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop install update doctor uninstall list completions" -- "$cur")
     return
   fi
 
@@ -104,4 +106,4 @@ _che_complete_wrapper() {
 }
 
 complete -o nospace -F _che_complete che
-complete -o nospace -F _che_complete_wrapper all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop
+complete -o nospace -F _che_complete_wrapper all-actions all-actions-watch checkout-my-branches clean-stale-branches clean-stale-branches-dr hard-reset-all-branches hard-reset-all-branches-dr prune-worktrees prune-worktrees-dr sync-all-branches sync-all-branches-dr update-from-origin update-local-branches show-codecs fix-codecs fix-codecs-dr find-video-mkv-issues validate-video-files scan-videos-audio-language remove-metadata rename-video-file delete-duplicate-videos delete-duplicate-videos-dr video-list detect-green-magenta-videos find-movie-by-year largest-tv-shows delete-by-ext delete-by-ext-dr delete-empty-folders delete-empty-folders-dr delete-smb-files delete-smb-files-dr files-under-size files-under-size-dr find-largest-files make-alpha-dir compress-folders list-permission mount-all-drives eject-all-drives eject-all-drives-dr ping-nas update-brew update-brew-dr btop

package/shell/completions/che.fish

@@ -1,4 +1,4 @@
-# che 1.2.1 - generated file, do not edit.
+# che 1.2.3 - generated file, do not edit.
 #
 # Generated from bin/commands.py by `che install`.
 # To change a wrapper, edit that manifest and run `che install` again.
@@ -9,10 +9,12 @@ complete -c che -n __fish_use_subcommand -a all-actions-watch -d 'Same as all-ac
 complete -c che -n __fish_use_subcommand -a checkout-my-branches -d 'Check out recent remote branches you authored that aren\'t local yet'
 complete -c che -n __fish_use_subcommand -a clean-stale-branches -d 'Delete local branches whose upstream is gone'
 complete -c che -n __fish_use_subcommand -a clean-stale-branches-dr -d 'Delete local branches whose upstream is gone (preview)'
+complete -c che -n __fish_use_subcommand -a hard-reset-all-branches -d 'Check out every local branch and hard reset it to origin/<branch>'
+complete -c che -n __fish_use_subcommand -a hard-reset-all-branches-dr -d 'Check out every local branch and hard reset it to origin/<branch> (preview)'
 complete -c che -n __fish_use_subcommand -a prune-worktrees -d 'Remove every linked worktree, then prune stale admin records'
 complete -c che -n __fish_use_subcommand -a prune-worktrees-dr -d 'Remove every linked worktree, then prune stale admin records (preview)'
-complete -c che -n __fish_use_subcommand -a sync-all-branches -d 'Update every branch and worktree, preserving locks and local work'
-complete -c che -n __fish_use_subcommand -a sync-all-branches-dr -d 'Update every branch and worktree, preserving locks and local work (preview)'
+complete -c che -n __fish_use_subcommand -a sync-all-branches -d 'Update every branch and worktree, pruning what has been merged'
+complete -c che -n __fish_use_subcommand -a sync-all-branches-dr -d 'Update every branch and worktree, pruning what has been merged (preview)'
 complete -c che -n __fish_use_subcommand -a update-from-origin -d 'Alias of sync-all-branches'
 complete -c che -n __fish_use_subcommand -a update-local-branches -d 'Rebase every local branch that has an upstream onto origin'
 complete -c che -n __fish_use_subcommand -a show-codecs -d 'Report media files outside the Direct Play codec/container set'
@@ -74,6 +76,10 @@ complete -c che -n "__fish_seen_subcommand_from clean-stale-branches" -l dry-run
 complete -c che -n "__fish_seen_subcommand_from clean-stale-branches" -l protect -r
 complete -c che -n "__fish_seen_subcommand_from clean-stale-branches-dr" -l dry-run
 complete -c che -n "__fish_seen_subcommand_from clean-stale-branches-dr" -l protect -r
+complete -c che -n "__fish_seen_subcommand_from hard-reset-all-branches" -l dry-run
+complete -c che -n "__fish_seen_subcommand_from hard-reset-all-branches" -l force
+complete -c che -n "__fish_seen_subcommand_from hard-reset-all-branches-dr" -l dry-run
+complete -c che -n "__fish_seen_subcommand_from hard-reset-all-branches-dr" -l force
 complete -c che -n "__fish_seen_subcommand_from prune-worktrees" -l dry-run
 complete -c che -n "__fish_seen_subcommand_from prune-worktrees" -l force
 complete -c che -n "__fish_seen_subcommand_from prune-worktrees-dr" -l dry-run
@@ -233,6 +239,10 @@ complete -c clean-stale-branches -l dry-run
 complete -c clean-stale-branches -l protect -r
 complete -c clean-stale-branches-dr -l dry-run
 complete -c clean-stale-branches-dr -l protect -r
+complete -c hard-reset-all-branches -l dry-run
+complete -c hard-reset-all-branches -l force
+complete -c hard-reset-all-branches-dr -l dry-run
+complete -c hard-reset-all-branches-dr -l force
 complete -c prune-worktrees -l dry-run
 complete -c prune-worktrees -l force
 complete -c prune-worktrees-dr -l dry-run