worktree-aid 1.2__tar.gz → 1.4__tar.gz

{worktree_aid-1.2/worktree_aid.egg-info → worktree_aid-1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worktree-aid
-Version: 1.2
+Version: 1.4
 Summary: Linux command line tool to aid creating, switching, and removing git worktrees
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -34,7 +34,7 @@ use to manage git worktrees. There are 3 commands typically used:
 - `wt rm` (or `wt r`) to remove a worktree + branch. If you don't specify a
   worktree name, then a [fuzzy finder][fzf] will prompt you with a list of
   worktrees to select from. The current worktree is first in the list and is the
-  default selection to remove. If you delete the current worktree then you will
+  default selection to remove. If you remove the current worktree then you will
   be automatically cd'd to the toplevel repository directory.
 
 There are some other options and commands available, as described in later
@@ -49,7 +49,7 @@ https://github.com/bulletmark/worktree-aid.
 Type `wt` or `wt -h` to view the usage summary:
 
 ```
-usage: wt [-B BASEDIR] [-R] [-U] [-F FUZZY] [-h] [-v]
+usage: wt [-B BASEDIR] [-R] [-r] [-U] [-u] [-F FUZZY] [-h] [-v]
                        {add,a,rm,r,cd,c,ls,l,init} ...
 
 Linux command line tool to conveniently add, remove, and change directories
@@ -61,7 +61,9 @@ options:
                         base directory for newly added worktrees,
                         default="../worktrees/{repo}".
   -R, --relative        display worktree paths relative instead of absolute
+  -r                    toggle -R/--relative option for one-off command only
   -U, --no-user         do not substitute "~" for home directory
+  -u                    toggle -U/--no-user option for one-off command only
   -F, --fuzzy FUZZY     fuzzy finder program, default="fzf"
   -h, --help            show help message and exit
   -v, --version         show program version and exit
@@ -81,7 +83,7 @@ individual command:
 ### Command `add`
 
 ```
-usage: wt add [-h] [-d] [-c] [worktree]
+usage: wt add [-h] [-d] [-c] [worktree ...]
 
 Add new worktree + branch.
 
@@ -100,7 +102,7 @@ aliases: a
 ### Command `rm`
 
 ```
-usage: wt rm [-h] [-k] [-f] [worktree]
+usage: wt rm [-h] [-k] [-f] [-a] [worktree ...]
 
 Remove worktree + branch.
 
@@ -114,6 +116,7 @@ options:
   -k, --keep-branch  remove worktree but keep branch
   -f, --force        force removal of worktree + branch even if untracked or
                      unmerged changes exist.
+  -a, --all          remove all worktrees
 
 aliases: r
 ```
@@ -187,16 +190,17 @@ $ yay -S worktree-aid  # or your preferred AUR helper
 ```
 
 You also need to install a fuzzy finder program such as [`fzf`][fzf] which is
-the default used by `worktree-aid`. See [fuzzy finder installation
-instructions](#fuzzy-finder-integration) for possible alternatives.
+the default used by `worktree-aid`. See [fuzzy finder
+installation](#fuzzy-finder-integration) instructions for possible
+alternatives.
 
 ## Setup
 
 A user who wants to use `worktree-aid` must add the following line to their
 `~/.bashrc` (`bash` user) or `~/.zshrc` (`zsh` user). Ensure it is added
-after where your PATH is set up so that the command `worktree-aid` can be found. This
-creates the `wt` wrapper command in your interactive shell session as a tiny
-function.
+after where your PATH is set up so that the command `worktree-aid` can be
+found. This creates the `wt` wrapper command in your interactive shell session
+as a tiny function.
 
 ```sh
 source <(worktree-aid init)
@@ -229,15 +233,11 @@ initialization code, e.g:
 source <(worktree-aid init "wt -R")
 ```
 
-The above sets `-R` (for relative display of worktree directories) as default for your
-`wt` command.
+The above sets `-R` (for relative display of worktree directories) as default
+for your `wt` command.
 
 The following options are sensible candidates to set as default options:
-
-- `-B/--basedir`,
-- `-R/--relative`,
-- `-U/--no-user`,
-- `-F/--fuzzy`.
+`-B/--basedir`, `-R/--relative`, `-U/--no-user`, `-F/--fuzzy`.
 
 ## Worktree Base Directory
 
@@ -246,18 +246,25 @@ worktrees. It is set to a default as below but you can change this to any
 directory you like. It can be absolute or relative where relative paths are
 relative to base repository directory.
 
-- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor uses.
-- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses.
-- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory of your home   directory.
+- Default base directory is `-B ../worktrees/{repo}`.
+- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses by
+  default.
+- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees within a
+  subdirectory of your home directory.
 
 The following place-markers can be used in the definition of the base directory:
 
 - `{repo}`: Substituted with the base name of the repository.
 - `{user}`: Substituted with the name of the user.
-- `{home}`: Substituted with the home directory of the user (also can use `~` at start of a path).
+- `{home}`: Substituted with the home directory of the user (also can use `~`
+   at start of a path).
+
+Most likely if you want to set a custom base directory then you will set `-B`
+as a [default option](#default-options).
 
-Most likely if you want to set a custom basedir then you will set `-B` as a
-[default option](#default-options).
+Note that the `--B/--basedir` setting is only relevant when adding a new
+worktree using the `add` command. All other commands query your existing
+worktrees so will work regardless of how or where the worktrees were created.
 
 ## Display as Relative Worktree Directories
 
@@ -268,13 +275,15 @@ can enable it in `worktree-aid` by adding the `-R/--relative` option, e.g:
 
 ```sh
 $ wt l
-../development 9796714 [development]
-../milestone1  bc921b8 [milestone1]
-../test        e6d965a [test]
-.              f76b8e0 [main]
+../worktrees/worktree-aid/development 9796714 [development]
+../worktrees/worktree-aid/milestone1  bc921b8 [milestone1]
+../worktrees/worktree-aid/test        e6d965a [test]
+                                      f76b8e0 [main]
 ```
 
 Most likely you will want to set `-R` as a [default option](#default-options).
+Note you can use the `-r` option on a one-off command to temporarily toggle
+whatever your default `-R/--relative` option is set as.
 
 ## Fuzzy Finder Integration
 

{worktree_aid-1.2 → worktree_aid-1.4}/README.md

@@ -22,7 +22,7 @@ use to manage git worktrees. There are 3 commands typically used:
 - `wt rm` (or `wt r`) to remove a worktree + branch. If you don't specify a
   worktree name, then a [fuzzy finder][fzf] will prompt you with a list of
   worktrees to select from. The current worktree is first in the list and is the
-  default selection to remove. If you delete the current worktree then you will
+  default selection to remove. If you remove the current worktree then you will
   be automatically cd'd to the toplevel repository directory.
 
 There are some other options and commands available, as described in later
@@ -37,7 +37,7 @@ https://github.com/bulletmark/worktree-aid.
 Type `wt` or `wt -h` to view the usage summary:
 
 ```
-usage: wt [-B BASEDIR] [-R] [-U] [-F FUZZY] [-h] [-v]
+usage: wt [-B BASEDIR] [-R] [-r] [-U] [-u] [-F FUZZY] [-h] [-v]
                        {add,a,rm,r,cd,c,ls,l,init} ...
 
 Linux command line tool to conveniently add, remove, and change directories
@@ -49,7 +49,9 @@ options:
                         base directory for newly added worktrees,
                         default="../worktrees/{repo}".
   -R, --relative        display worktree paths relative instead of absolute
+  -r                    toggle -R/--relative option for one-off command only
   -U, --no-user         do not substitute "~" for home directory
+  -u                    toggle -U/--no-user option for one-off command only
   -F, --fuzzy FUZZY     fuzzy finder program, default="fzf"
   -h, --help            show help message and exit
   -v, --version         show program version and exit
@@ -69,7 +71,7 @@ individual command:
 ### Command `add`
 
 ```
-usage: wt add [-h] [-d] [-c] [worktree]
+usage: wt add [-h] [-d] [-c] [worktree ...]
 
 Add new worktree + branch.
 
@@ -88,7 +90,7 @@ aliases: a
 ### Command `rm`
 
 ```
-usage: wt rm [-h] [-k] [-f] [worktree]
+usage: wt rm [-h] [-k] [-f] [-a] [worktree ...]
 
 Remove worktree + branch.
 
@@ -102,6 +104,7 @@ options:
   -k, --keep-branch  remove worktree but keep branch
   -f, --force        force removal of worktree + branch even if untracked or
                      unmerged changes exist.
+  -a, --all          remove all worktrees
 
 aliases: r
 ```
@@ -175,16 +178,17 @@ $ yay -S worktree-aid  # or your preferred AUR helper
 ```
 
 You also need to install a fuzzy finder program such as [`fzf`][fzf] which is
-the default used by `worktree-aid`. See [fuzzy finder installation
-instructions](#fuzzy-finder-integration) for possible alternatives.
+the default used by `worktree-aid`. See [fuzzy finder
+installation](#fuzzy-finder-integration) instructions for possible
+alternatives.
 
 ## Setup
 
 A user who wants to use `worktree-aid` must add the following line to their
 `~/.bashrc` (`bash` user) or `~/.zshrc` (`zsh` user). Ensure it is added
-after where your PATH is set up so that the command `worktree-aid` can be found. This
-creates the `wt` wrapper command in your interactive shell session as a tiny
-function.
+after where your PATH is set up so that the command `worktree-aid` can be
+found. This creates the `wt` wrapper command in your interactive shell session
+as a tiny function.
 
 ```sh
 source <(worktree-aid init)
@@ -217,15 +221,11 @@ initialization code, e.g:
 source <(worktree-aid init "wt -R")
 ```
 
-The above sets `-R` (for relative display of worktree directories) as default for your
-`wt` command.
+The above sets `-R` (for relative display of worktree directories) as default
+for your `wt` command.
 
 The following options are sensible candidates to set as default options:
-
-- `-B/--basedir`,
-- `-R/--relative`,
-- `-U/--no-user`,
-- `-F/--fuzzy`.
+`-B/--basedir`, `-R/--relative`, `-U/--no-user`, `-F/--fuzzy`.
 
 ## Worktree Base Directory
 
@@ -234,18 +234,25 @@ worktrees. It is set to a default as below but you can change this to any
 directory you like. It can be absolute or relative where relative paths are
 relative to base repository directory.
 
-- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor uses.
-- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses.
-- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory of your home   directory.
+- Default base directory is `-B ../worktrees/{repo}`.
+- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses by
+  default.
+- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees within a
+  subdirectory of your home directory.
 
 The following place-markers can be used in the definition of the base directory:
 
 - `{repo}`: Substituted with the base name of the repository.
 - `{user}`: Substituted with the name of the user.
-- `{home}`: Substituted with the home directory of the user (also can use `~` at start of a path).
+- `{home}`: Substituted with the home directory of the user (also can use `~`
+   at start of a path).
+
+Most likely if you want to set a custom base directory then you will set `-B`
+as a [default option](#default-options).
 
-Most likely if you want to set a custom basedir then you will set `-B` as a
-[default option](#default-options).
+Note that the `--B/--basedir` setting is only relevant when adding a new
+worktree using the `add` command. All other commands query your existing
+worktrees so will work regardless of how or where the worktrees were created.
 
 ## Display as Relative Worktree Directories
 
@@ -256,13 +263,15 @@ can enable it in `worktree-aid` by adding the `-R/--relative` option, e.g:
 
 ```sh
 $ wt l
-../development 9796714 [development]
-../milestone1  bc921b8 [milestone1]
-../test        e6d965a [test]
-.              f76b8e0 [main]
+../worktrees/worktree-aid/development 9796714 [development]
+../worktrees/worktree-aid/milestone1  bc921b8 [milestone1]
+../worktrees/worktree-aid/test        e6d965a [test]
+                                      f76b8e0 [main]
 ```
 
 Most likely you will want to set `-R` as a [default option](#default-options).
+Note you can use the `-r` option on a one-off command to temporarily toggle
+whatever your default `-R/--relative` option is set as.
 
 ## Fuzzy Finder Integration
 

{worktree_aid-1.2 → worktree_aid-1.4/worktree_aid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worktree-aid
-Version: 1.2
+Version: 1.4
 Summary: Linux command line tool to aid creating, switching, and removing git worktrees
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -34,7 +34,7 @@ use to manage git worktrees. There are 3 commands typically used:
 - `wt rm` (or `wt r`) to remove a worktree + branch. If you don't specify a
   worktree name, then a [fuzzy finder][fzf] will prompt you with a list of
   worktrees to select from. The current worktree is first in the list and is the
-  default selection to remove. If you delete the current worktree then you will
+  default selection to remove. If you remove the current worktree then you will
   be automatically cd'd to the toplevel repository directory.
 
 There are some other options and commands available, as described in later
@@ -49,7 +49,7 @@ https://github.com/bulletmark/worktree-aid.
 Type `wt` or `wt -h` to view the usage summary:
 
 ```
-usage: wt [-B BASEDIR] [-R] [-U] [-F FUZZY] [-h] [-v]
+usage: wt [-B BASEDIR] [-R] [-r] [-U] [-u] [-F FUZZY] [-h] [-v]
                        {add,a,rm,r,cd,c,ls,l,init} ...
 
 Linux command line tool to conveniently add, remove, and change directories
@@ -61,7 +61,9 @@ options:
                         base directory for newly added worktrees,
                         default="../worktrees/{repo}".
   -R, --relative        display worktree paths relative instead of absolute
+  -r                    toggle -R/--relative option for one-off command only
   -U, --no-user         do not substitute "~" for home directory
+  -u                    toggle -U/--no-user option for one-off command only
   -F, --fuzzy FUZZY     fuzzy finder program, default="fzf"
   -h, --help            show help message and exit
   -v, --version         show program version and exit
@@ -81,7 +83,7 @@ individual command:
 ### Command `add`
 
 ```
-usage: wt add [-h] [-d] [-c] [worktree]
+usage: wt add [-h] [-d] [-c] [worktree ...]
 
 Add new worktree + branch.
 
@@ -100,7 +102,7 @@ aliases: a
 ### Command `rm`
 
 ```
-usage: wt rm [-h] [-k] [-f] [worktree]
+usage: wt rm [-h] [-k] [-f] [-a] [worktree ...]
 
 Remove worktree + branch.
 
@@ -114,6 +116,7 @@ options:
   -k, --keep-branch  remove worktree but keep branch
   -f, --force        force removal of worktree + branch even if untracked or
                      unmerged changes exist.
+  -a, --all          remove all worktrees
 
 aliases: r
 ```
@@ -187,16 +190,17 @@ $ yay -S worktree-aid  # or your preferred AUR helper
 ```
 
 You also need to install a fuzzy finder program such as [`fzf`][fzf] which is
-the default used by `worktree-aid`. See [fuzzy finder installation
-instructions](#fuzzy-finder-integration) for possible alternatives.
+the default used by `worktree-aid`. See [fuzzy finder
+installation](#fuzzy-finder-integration) instructions for possible
+alternatives.
 
 ## Setup
 
 A user who wants to use `worktree-aid` must add the following line to their
 `~/.bashrc` (`bash` user) or `~/.zshrc` (`zsh` user). Ensure it is added
-after where your PATH is set up so that the command `worktree-aid` can be found. This
-creates the `wt` wrapper command in your interactive shell session as a tiny
-function.
+after where your PATH is set up so that the command `worktree-aid` can be
+found. This creates the `wt` wrapper command in your interactive shell session
+as a tiny function.
 
 ```sh
 source <(worktree-aid init)
@@ -229,15 +233,11 @@ initialization code, e.g:
 source <(worktree-aid init "wt -R")
 ```
 
-The above sets `-R` (for relative display of worktree directories) as default for your
-`wt` command.
+The above sets `-R` (for relative display of worktree directories) as default
+for your `wt` command.
 
 The following options are sensible candidates to set as default options:
-
-- `-B/--basedir`,
-- `-R/--relative`,
-- `-U/--no-user`,
-- `-F/--fuzzy`.
+`-B/--basedir`, `-R/--relative`, `-U/--no-user`, `-F/--fuzzy`.
 
 ## Worktree Base Directory
 
@@ -246,18 +246,25 @@ worktrees. It is set to a default as below but you can change this to any
 directory you like. It can be absolute or relative where relative paths are
 relative to base repository directory.
 
-- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor uses.
-- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses.
-- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory of your home   directory.
+- Default base directory is `-B ../worktrees/{repo}`.
+- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses by
+  default.
+- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees within a
+  subdirectory of your home directory.
 
 The following place-markers can be used in the definition of the base directory:
 
 - `{repo}`: Substituted with the base name of the repository.
 - `{user}`: Substituted with the name of the user.
-- `{home}`: Substituted with the home directory of the user (also can use `~` at start of a path).
+- `{home}`: Substituted with the home directory of the user (also can use `~`
+   at start of a path).
+
+Most likely if you want to set a custom base directory then you will set `-B`
+as a [default option](#default-options).
 
-Most likely if you want to set a custom basedir then you will set `-B` as a
-[default option](#default-options).
+Note that the `--B/--basedir` setting is only relevant when adding a new
+worktree using the `add` command. All other commands query your existing
+worktrees so will work regardless of how or where the worktrees were created.
 
 ## Display as Relative Worktree Directories
 
@@ -268,13 +275,15 @@ can enable it in `worktree-aid` by adding the `-R/--relative` option, e.g:
 
 ```sh
 $ wt l
-../development 9796714 [development]
-../milestone1  bc921b8 [milestone1]
-../test        e6d965a [test]
-.              f76b8e0 [main]
+../worktrees/worktree-aid/development 9796714 [development]
+../worktrees/worktree-aid/milestone1  bc921b8 [milestone1]
+../worktrees/worktree-aid/test        e6d965a [test]
+                                      f76b8e0 [main]
 ```
 
 Most likely you will want to set `-R` as a [default option](#default-options).
+Note you can use the `-r` option on a one-off command to temporarily toggle
+whatever your default `-R/--relative` option is set as.
 
 ## Fuzzy Finder Integration
 

worktree_aid-1.4/worktree_aid.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.4",
+  "distance": 0,
+  "node": "ga5a7f880491682fdb2eb9c3ee49154b0a37b2e29",
+  "dirty": false,
+  "branch": "main",
+  "node_date": "2026-08-04"
+}

{worktree_aid-1.2 → worktree_aid-1.4}/worktree_aid.py

@@ -145,6 +145,15 @@ def print_help(args: Namespace) -> None:
         args._opt.print_help(sys.stderr)
 
 
+def validate_name(name: str) -> None:
+    "Ensure worktree name is valid"
+    if ' ' in name:
+        sys.exit(f'error: worktree name "{name}" can not contain spaces.')
+
+    if '/' in name or '\\' in name:
+        sys.exit(f'error: worktree name "{name}" can not contain "/" or "\\".')
+
+
 @dataclass
 class Tree:
     "Data for an individual worktree"
@@ -158,16 +167,9 @@ class Tree:
 class Trees:
     "Class to manage the collection of worktrees"
 
-    trees: list[Tree]
-    names: dict[str, Tree]
-    toplevel: Tree
-    current: Tree
-
-    @classmethod
-    def fetch(cls, args: Namespace) -> None:
+    def __init__(self, args: Namespace) -> None:
         "Get worktrees"
         trees = []
-        names = {}
         tree = None
         cwdparts = Path.cwd().parts
         phere = pindex = -1
@@ -196,9 +198,6 @@ class Trees:
                     pindex = len(trees)
 
                 trees.append(tree := Tree(path, path_display))
-
-                if (name := path.name) not in names or name == tree.branch:
-                    names[name] = tree
             elif tree:
                 if field == 'HEAD':
                     tree.head = value[:HASH_LEN]
@@ -210,21 +209,19 @@ class Trees:
 
         if pindex > 0:
             trees = [trees[pindex]] + trees[:pindex] + trees[pindex + 1 :]
-            cls.toplevel = trees[1]
+            self.toplevel = trees[1]
         else:
-            cls.toplevel = trees[0]
+            self.toplevel = trees[0]
 
-        cls.current = trees[0]
-        cls.trees = trees
-        cls.names = names
+        self.trees = trees
+        self.current = trees[0]
 
-    @classmethod
-    def get_trees(cls) -> list[str]:
+    def get_trees(self) -> list[str]:
         "Fetch string list of worktrees"
-        pw = max(len(str(t.path_display)) for t in cls.trees)
-        lines = []
-        for t in cls.trees:
-            tlist = [f'{t.path_display:{pw}}']
+        width = max(len(str(t.path_display)) for t in self.trees)
+        trees = []
+        for t in self.trees:
+            tlist = [f'{t.path_display:{width}}']
             if t.head:
                 tlist.append(t.head)
             if t.branch:
@@ -232,35 +229,43 @@ class Trees:
             else:
                 tlist.append('detached')
 
-            lines.append(' '.join(tlist))
+            trees.append(' '.join(tlist))
 
-        return lines
+        return trees
 
-    @classmethod
-    def get_tree(cls, name: str) -> Tree | None:
+    def get_tree(self, name: str) -> Tree | None:
         "Return worktree with given name, or None if not found"
-        return cls.current if cls.current.path.name == name else cls.names.get(name)
+        path_match = None
+        for tree in self.trees:
+            if tree.branch == name:
+                return tree
+
+            if tree.path.name == name:
+                path_match = tree
+
+        return path_match
 
-    @classmethod
-    def create_worktree(cls, name: str, args: Namespace) -> Path:
+    def create_worktree(self, name: str, args: Namespace) -> Path:
         "Create a new worktree and branch with the given name"
         if not name:
             # If no name is given, generate a new name that does not conflict
             # with existing worktrees or branches
-            existing = {t.path.name for t in cls.trees}
+            existing = {t.path.name for t in self.trees}
             branches = run('git --no-pager branch --list'.split()).splitlines()
-            existing.update(b.split(maxsplit=1)[1] for b in branches)
+            existing.update(b.split(maxsplit=1)[-1] for b in branches)
             name = generate_new_name(existing)
+        else:
+            validate_name(name)
 
         try:
             basedir = args.basedir.format(
-                user=getpass.getuser(), repo=cls.toplevel.path.name, home=str(HOME)
+                user=getpass.getuser(), repo=self.toplevel.path.name, home=str(HOME)
             )
         except Exception as e:
             sys.exit(f'error: failed to format basedir: {e}')
 
         basepath = Path(basedir).expanduser()
-        basepath = (cls.toplevel.path / basepath).resolve()
+        basepath = (self.toplevel.path / basepath).resolve()
         basepath.mkdir(parents=True, exist_ok=True)
         path = basepath / name
 
@@ -270,19 +275,23 @@ class Trees:
         run(cmd + [str(path)], stdout=args._stdout)
         return path
 
-    @classmethod
-    def remove_worktree(cls, name: str, args: Namespace) -> Path | None:
+    def remove_worktree(
+        self, name: str, args: Namespace, tree: Tree | None = None
+    ) -> Path | None:
         "Remove the worktree and branch with the given name"
-        if name:
-            if not (tree := cls.get_tree(name)):
-                sys.exit(f'error: no worktree found with name "{name}".')
-        else:
-            # If no name is given, remove the current worktree and branch
-            tree = cls.current
+        if not tree and not (tree := self.get_tree(name)):
+            sys.exit(f'error: no worktree found with name "{name}".')
+
+        if tree == self.toplevel:
+            print(
+                f'warning: not removing top-level worktree "{tree.path}"',
+                file=sys.stderr,
+            )
+            return None
 
         # Change to the top-level worktree directory before deleting a worktree
         # and/or branch, in case the current directory is removed.
-        os.chdir(cls.toplevel.path)
+        os.chdir(self.toplevel.path)
 
         cmd = 'git worktree remove'.split()
         if args.force:
@@ -297,19 +306,18 @@ class Trees:
             cmd = 'git branch'.split() + ['-D' if args.force else '-d']
             run(cmd + [tree.branch], stdout=args._stdout, ignore_error=True)
 
-        return cls.toplevel.path if tree == cls.current else None
+        return self.toplevel.path if tree == self.current else None
 
-    @classmethod
-    def prompt(cls, args: Namespace) -> Path | None:
+    def prompt(self, args: Namespace) -> Tree | None:
         "Prompt user to select a worktree using fuzzy finder"
-        wtrees = cls.get_trees()
+        wtrees = self.get_trees()
         if not wtrees:
             sys.exit('error: no worktrees to remove.')
         line = run(shlex.split(args.fuzzy), stdin='\n'.join(wtrees)).strip()
         if not line or line not in wtrees:
             return None
 
-        return cls.trees[wtrees.index(line)].path
+        return self.trees[wtrees.index(line)]
 
 
 def main() -> int:
@@ -335,12 +343,22 @@ def main() -> int:
         action='store_true',
         help='display worktree paths relative instead of absolute',
     )
+    opt.add_argument(
+        '-r',
+        action='store_true',
+        help='toggle -R/--relative option for one-off command only',
+    )
     opt.add_argument(
         '-U',
         '--no-user',
         action='store_true',
         help='do not substitute "~" for home directory',
     )
+    opt.add_argument(
+        '-u',
+        action='store_true',
+        help='toggle -U/--no-user option for one-off command only',
+    )
     opt.add_argument(
         '-F',
         '--fuzzy',
@@ -389,6 +407,13 @@ def main() -> int:
 
     args = opt.parse_args()
     args._opt = opt
+
+    if args.r:
+        args.relative = not args.relative
+
+    if args.u:
+        args.no_user = not args.no_user
+
     if args._:
         try:
             args._stdout = open('/dev/tty', 'w')
@@ -437,16 +462,19 @@ class add_:
         )
         parser.add_argument(
             'worktree',
-            default='',
-            nargs='?',
+            nargs='*',
             help='new worktree + branch to add. A name is automatically created if not specified.',
         )
 
     @staticmethod
     def run(args: Namespace) -> str | None:
-        Trees.fetch(args)
-        path = Trees.create_worktree(args.worktree, args)
-        return str(path) if path and not args.no_cd else None
+        trees = Trees(args)
+        retpath = None
+        for name in args.worktree or ['']:
+            if (path := trees.create_worktree(name, args)) and not retpath:
+                retpath = path
+
+        return str(retpath) if retpath and not args.no_cd else None
 
 
 # COMMAND
@@ -470,10 +498,15 @@ class rm_:
             help='force removal of worktree + branch even if '
             'untracked or unmerged changes exist.',
         )
+        parser.add_argument(
+            '-a',
+            '--all',
+            action='store_true',
+            help='remove all worktrees',
+        )
         parser.add_argument(
             'worktree',
-            default='',
-            nargs='?',
+            nargs='*',
             help='worktree + branch name to remove. If not specified then '
             'fuzzy finder will prompt with a list of worktrees, with the '
             'current worktree as the default selection.',
@@ -481,14 +514,29 @@ class rm_:
 
     @staticmethod
     def run(args: Namespace) -> str | None:
-        Trees.fetch(args)
-        if not (name := args.worktree):
-            if not (path := Trees.prompt(args)):
+        trees = Trees(args)
+
+        if args.all:
+            if args.worktree:
+                sys.exit('error: cannot specify any worktree name with --all option.')
+
+            names = [t.path.name for t in trees.trees if t != trees.toplevel]
+        else:
+            names = args.worktree or ['']
+
+        retpath = None
+        tree = None
+        for name in names:
+            # If no worktree name is given, prompt user to select one
+            if not name and not (tree := trees.prompt(args)):
                 return None
-            name = path.name
 
-        path = Trees.remove_worktree(name, args)
-        return str(path) if path else None
+            if (path := trees.remove_worktree(name, args, tree)) and not retpath:
+                retpath = path
+
+            tree = None
+
+        return str(retpath) if retpath else None
 
 
 # COMMAND
@@ -509,18 +557,18 @@ class cd_:
 
     @staticmethod
     def run(args: Namespace) -> str | None:
-        Trees.fetch(args)
+        trees = Trees(args)
         if name := args.worktree:
             if name == '/':
-                path = Trees.toplevel.path
-            elif tree := Trees.get_tree(name):
-                path = tree.path
-            else:
+                # Shortcut to top-level worktree
+                tree = trees.toplevel
+            elif not (tree := trees.get_tree(name)):
                 sys.exit(f'error: no worktree found with name "{name}".')
         else:
-            path = Trees.prompt(args)
+            # If no worktree name is given, prompt user to select one
+            tree = trees.prompt(args)
 
-        return str(path) if path else None
+        return str(tree.path) if tree else None
 
 
 # COMMAND
@@ -531,9 +579,8 @@ class ls_:
 
     @staticmethod
     def run(args: Namespace) -> str | None:
-        Trees.fetch(args)
-        trees = Trees.get_trees()
-        for line in reversed(trees):
+        trees = Trees(args)
+        for line in reversed(trees.get_trees()):
             print(line, file=args._stdout)
 
         return None

worktree_aid-1.2/worktree_aid.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.2",
-  "distance": 0,
-  "node": "gcb78b4dc270eb62209b736dedbcf8e12ad2591ec",
-  "dirty": false,
-  "branch": "main",
-  "node_date": "2026-08-02"
-}