git-worktrees 0.3.0__tar.gz → 0.3.1__tar.gz

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/AGENTS.md

@@ -156,10 +156,14 @@ Two more about what is in the list at all:
   the one a finished branch leaves you in, so leaving it out leaves out the
   only answer that is always right. `main` finds it whatever branch it stands
   on, because its label carries the word, once.
-- The worktree you are standing in is listed and never offered. Picking it is
-  the one answer that takes you nowhere, and a picker whose single candidate
-  is where you already are prints nothing at all, which reads as a broken
-  command.
+- The worktree you are standing in is shown and never offered. It carries a
+  `*` rather than a number, because picking it is the one answer that takes
+  you nowhere. Leaving it out of the list entirely is worse: the list then
+  shows fewer rows than `git worktree list` does, and reads as though
+  something went missing rather than as where you already are. The main
+  checkout is in `gws` and `gwp` for the same reason, kept and never
+  proposed, and out of `gwr`'s candidates because `git worktree remove`
+  refuses it whatever flag it is given.
 
 `--json` and `--list` answer the same question without any of this, and an
 agent uses those.

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/CHANGELOG.md

@@ -17,6 +17,38 @@ not in here, whatever it cost to build.
 A release closes with a `### Choices` section when a decision in it is worth
 the reader's time: what was chosen, and what the alternative failed to do.
 
+## 0.3.1 - 2026-09-20
+
+`gws` and `gwp` list the main checkout, and `gwl`'s picker shows the
+worktree you are standing in. Both listings used to leave those rows out, so
+a repository with the main checkout and one worktree showed one row where
+`git worktree list` shows two, which reads as though something went missing
+rather than as where you already are.
+
+The main checkout is `keep`, with `it is the main checkout, and never
+removable`. Nothing proposes it, and `git worktree remove` answers
+`fatal: '<path>' is a main working tree` whatever flag it is given, so `gwr`
+still does not offer it.
+
+The one you are standing in carries a `*` rather than a number:
+
+```
+  *  cleanup                           /home/you/git/.worktrees/cleanup/repo
+  1  docs-ship-with-the-change (main)  /home/you/git/repo
+which? [1-1, or blank to cancel]
+```
+
+Two things move with those rows. The counts include the main checkout, so a
+repository with one linked worktree reads `1 removable, 1 kept, 0 unclear`
+where it read `1 removable, 0 kept, 0 unclear`, and `gws --json` and
+`gwp --json` carry the extra verdict. A caller filtering on
+`verdict == "remove"` is unaffected; one reading `verdicts[0]` gets the main
+checkout now.
+
+`no worktrees besides the main checkout` is on stderr rather than stdout, and
+says `; gwa NAME makes one`. The table is always on stdout now, so stdout is
+never that sentence instead.
+
 ## 0.3.0 - 2026-09-20
 
 `gwl` with no query asks which worktree rather than moving you to one.

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: git-worktrees
-Version: 0.3.0
+Version: 0.3.1
 Summary: Git worktree commands that refuse to lose work.
 Project-URL: Bug reports, https://github.com/MihaiBojin/worktrees/issues/new
 Project-URL: Source, https://github.com/MihaiBojin/worktrees
@@ -168,17 +168,21 @@ separate.
 ```console
 $ gws
 VERDICT  BRANCH         WHY                                                                                PATH
+keep     main           it is the main checkout, and never removable                                       /home/you/git/repo
 keep     dirty-work     it has uncommitted changes                                                         /home/you/git/.worktrees/dirty-work/repo
 keep     holds-secrets  merged, but holds 2 ignored path(s); pass --delete-ignored                         /home/you/git/.worktrees/holds-secrets/repo
 unknown  never-pushed   not merged into origin/main, and no upstream says whether its commits were pushed  /home/you/git/.worktrees/never-pushed/repo
 remove   squash-merged  squash-merged                                                                      /home/you/git/.worktrees/squash-merged/repo
 
-1 removable, 2 kept, 1 unclear
+1 removable, 3 kept, 1 unclear
 unclear, and gwp does not touch these: never-pushed
 gwp removes the 1 marked removable
 ```
 
-Rows come in `git worktree list` order. Paths are absolute wherever this
+Rows come in `git worktree list` order, the main checkout first. It is there
+so the table shows what `git worktree list` shows; nothing proposes it, and
+`git worktree remove` answers `fatal: '<path>' is a main working tree`
+whatever flag it is given. Paths are absolute wherever this
 prints one, so a row can be pasted into the next command. The table and the
 count are on stdout; the two lines after them are on stderr.
 
@@ -326,13 +330,18 @@ show me the options, and being moved without being asked is not that. So it
 asks, numbered, however many there are:
 
 ```console
-$ gwl                # standing in the main checkout
-  1  dirty-work     /home/you/git/.worktrees/dirty-work/repo
-  2  holds-secrets  /home/you/git/.worktrees/holds-secrets/repo
-  3  never-pushed   /home/you/git/.worktrees/never-pushed/repo
+$ gwl                # standing in never-pushed
+  *  never-pushed    /home/you/git/.worktrees/never-pushed/repo
+  1  main            /home/you/git/repo
+  2  dirty-work      /home/you/git/.worktrees/dirty-work/repo
+  3  holds-secrets   /home/you/git/.worktrees/holds-secrets/repo
 which? [1-3, or blank to cancel]
 ```
 
+The one you are standing in is marked `*` and carries no number. It is where
+you are rather than somewhere to go, and a list without it shows three rows
+where `git worktree list` shows four.
+
 Matching is substring first and then subsequence, so `tst` finds `add-tests`,
 and a substring hit always outranks a loose one. Without a terminal `gwl`
 refuses at exit 3 and names `--list` and `--json`.

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/README.md

@@ -142,17 +142,21 @@ separate.
 ```console
 $ gws
 VERDICT  BRANCH         WHY                                                                                PATH
+keep     main           it is the main checkout, and never removable                                       /home/you/git/repo
 keep     dirty-work     it has uncommitted changes                                                         /home/you/git/.worktrees/dirty-work/repo
 keep     holds-secrets  merged, but holds 2 ignored path(s); pass --delete-ignored                         /home/you/git/.worktrees/holds-secrets/repo
 unknown  never-pushed   not merged into origin/main, and no upstream says whether its commits were pushed  /home/you/git/.worktrees/never-pushed/repo
 remove   squash-merged  squash-merged                                                                      /home/you/git/.worktrees/squash-merged/repo
 
-1 removable, 2 kept, 1 unclear
+1 removable, 3 kept, 1 unclear
 unclear, and gwp does not touch these: never-pushed
 gwp removes the 1 marked removable
 ```
 
-Rows come in `git worktree list` order. Paths are absolute wherever this
+Rows come in `git worktree list` order, the main checkout first. It is there
+so the table shows what `git worktree list` shows; nothing proposes it, and
+`git worktree remove` answers `fatal: '<path>' is a main working tree`
+whatever flag it is given. Paths are absolute wherever this
 prints one, so a row can be pasted into the next command. The table and the
 count are on stdout; the two lines after them are on stderr.
 
@@ -300,13 +304,18 @@ show me the options, and being moved without being asked is not that. So it
 asks, numbered, however many there are:
 
 ```console
-$ gwl                # standing in the main checkout
-  1  dirty-work     /home/you/git/.worktrees/dirty-work/repo
-  2  holds-secrets  /home/you/git/.worktrees/holds-secrets/repo
-  3  never-pushed   /home/you/git/.worktrees/never-pushed/repo
+$ gwl                # standing in never-pushed
+  *  never-pushed    /home/you/git/.worktrees/never-pushed/repo
+  1  main            /home/you/git/repo
+  2  dirty-work      /home/you/git/.worktrees/dirty-work/repo
+  3  holds-secrets   /home/you/git/.worktrees/holds-secrets/repo
 which? [1-3, or blank to cancel]
 ```
 
+The one you are standing in is marked `*` and carries no number. It is where
+you are rather than somewhere to go, and a list without it shows three rows
+where `git worktree list` shows four.
+
 Matching is substring first and then subsequence, so `tst` finds `add-tests`,
 and a substring hit always outranks a loose one. Without a terminal `gwl`
 refuses at exit 3 and names `--list` and `--json`.

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 # Static, and the single source of truth for the version. Bump it in a pull
 # request and run `uv lock`; the release tag only has to agree with it.
-version = "0.3.0"
+version = "0.3.1"
 # The standard library answers every question this asks. A dependency here
 # would be paid on every invocation, and an invocation is 67 ms of which 25 ms
 # is the interpreter starting.

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/src/worktrees/cli.py

@@ -193,7 +193,15 @@ def _assess(
         judge(only, head, head_branch, ignored, ask_forge=ask_forge)
         if judge
         else verdicts.assess(
-            records, only, head, head_branch, ignored, ask_forge=ask_forge
+            records,
+            only,
+            head,
+            head_branch,
+            ignored,
+            ask_forge=ask_forge,
+            # `gws` and `gwp` report; `gwr` acts, and takes this list as its
+            # candidates, so it asks through `judge` and gets it without.
+            include_main=True,
         )
     )
     return rows, verdicts.stale(records), head, head_branch
@@ -247,16 +255,15 @@ def run_status(args: argparse.Namespace) -> int:
         )
         return 0
 
-    if not rows:
-        print("no worktrees besides the main checkout")
-    else:
-        print(_verdict_table(rows))
+    print(_verdict_table(rows))
 
     if args.quiet:
         return 0
 
     print()
     print(_counted(rows))
+    if len(rows) < 2:
+        _err("no worktrees besides the main checkout; gwa NAME makes one")
     if stale:
         _err(
             f"{len(stale)} stale record(s) for directories that are gone; "
@@ -300,13 +307,13 @@ def run_prune(args: argparse.Namespace) -> int:
         # command that would have printed it.
         if args.json:
             print(json.dumps({"removed": [], "failed": 0}, indent=2))
-        elif not rows:
-            print("no worktrees besides the main checkout")
         else:
             print(_verdict_table(rows))
             if not args.quiet:
                 print()
                 print(f"nothing to remove; {_counted(rows)}")
+                if len(rows) < 2:
+                    _err("no worktrees besides the main checkout; gwa NAME makes one")
         return 0
 
     if unknown and not args.quiet:
@@ -663,8 +670,14 @@ def run_list(args: argparse.Namespace) -> int:
         return 0
 
     # A query that narrows to one has said which. No query has not, even
-    # when the repository holds exactly one other worktree.
-    chosen = pick.choose(elsewhere, _err, outright=bool(args.query))
+    # when the repository holds exactly one other worktree. The one you are
+    # standing in is shown above them, marked and unnumbered.
+    chosen = pick.choose(
+        elsewhere,
+        _err,
+        outright=bool(args.query),
+        standing_in=next((w for w in found if _same(w.path, here)), None),
+    )
     if chosen is None:
         _err("nothing picked")
         return 0

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/src/worktrees/pick.py

@@ -69,6 +69,7 @@ def choose(
     show: Callable[[str], None],
     ask: Callable[[str], str] | None = None,
     outright: bool = True,
+    standing_in: Worktree | None = None,
 ) -> Worktree | None:
     """Ask which one, and None means cancelled.
 
@@ -77,6 +78,11 @@ def choose(
     a request to be shown the options, and being moved without being asked
     because there happened to be one other worktree is not that.
 
+    `standing_in` is shown above the numbered ones, marked `*` and carrying
+    no number. It is not somewhere to go, and a list that leaves it out shows
+    one row where `git worktree list` shows two, which reads as though
+    something went missing rather than as where you already are.
+
     A run whose stdin is not a terminal is refused rather than left to block:
     an agent or a pipe reaching a prompt would hang, and --json answers the
     same question without one.
@@ -96,7 +102,17 @@ def choose(
             )
         ask = _prompt
 
-    width = max(len(wt.label) for wt in candidates)
+    listed = [*([standing_in] if standing_in is not None else []), *candidates]
+    width = max(len(wt.label) for wt in listed)
+    if standing_in is not None:
+        # Padded before it is painted, or the escape codes count as width and
+        # every column under it sits crooked.
+        mark = f"{'*':>3}"
+        show(
+            f"{render.err(mark, render.DIM)}  "
+            f"{render.err(standing_in.label.ljust(width), render.DIM)}  "
+            f"{render.err(standing_in.path, render.DIM)}"
+        )
     for i, wt in enumerate(candidates, 1):
         show(
             f"{render.err(f'{i:>3}', render.DIM)}  "

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/src/worktrees/verdicts.py

@@ -74,6 +74,7 @@ def assess(
     repo: str | os.PathLike[str] | None = None,
     here: str | None = None,
     ask_forge: bool = False,
+    include_main: bool = False,
 ) -> list[Verdict]:
     """Every worktree, in the order `git worktree remove` would refuse them.
 
@@ -83,6 +84,11 @@ def assess(
     `here` is the checkout the caller is standing in, which is kept rather
     than proposed. Pass "" to judge it like any other: `gwr` is asked for one
     by name and steps out of it first, where a listing has no way to.
+
+    `include_main` puts the main checkout in the list, kept and never
+    proposed. A listing leaving it out shows one row where `git worktree
+    list` shows two, and reads as though something went missing. `gwr` takes
+    the list as its candidates, so it asks for the list without it.
     """
     main = R.main_worktree(repo)
     if here is None:
@@ -91,10 +97,26 @@ def assess(
 
     out: list[Verdict] = []
     for wt in records:
-        if "bare" in wt.flags or "prunable" in wt.flags or wt.path == main:
+        if "bare" in wt.flags or "prunable" in wt.flags:
             continue
         if only and wt.branch != only:
             continue
+        if wt.path == main:
+            # Said before the standing-in rule below, because which one is
+            # the main checkout is the more useful of the two facts and the
+            # only one that is true from anywhere.
+            if include_main:
+                out.append(
+                    Verdict(
+                        KEEP,
+                        wt.branch,
+                        wt.path,
+                        "it is the main checkout, and never removable",
+                        0,
+                        wt.sha,
+                    )
+                )
+            continue
 
         def say(verdict: str, why: str, ignored: int = 0, wt: R.Worktree = wt) -> None:
             out.append(Verdict(verdict, wt.branch, wt.path, why, ignored, wt.sha))

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/tests/test_cli.py

@@ -68,8 +68,21 @@ def run_with_a_terminal_on_stdout(
     return proc.returncode, b"".join(chunks).decode().replace("\r\n", "\n")
 
 
+def run_on_a_terminal_at(
+    world, at: Path, entry: str, *args: str, answer: str
+) -> tuple[int, str]:
+    """The same, from a directory that is not the main checkout."""
+    return _on_a_terminal(world, at, entry, *args, answer=answer)
+
+
 def run_on_a_terminal(world, entry: str, *args: str, answer: str) -> tuple[int, str]:
     """The same, with a real tty on stdin, so the prompt is reachable."""
+    return _on_a_terminal(world, world.repo, entry, *args, answer=answer)
+
+
+def _on_a_terminal(
+    world, at: Path, entry: str, *args: str, answer: str
+) -> tuple[int, str]:
     parent, child = pty.openpty()
     proc = subprocess.Popen(
         [
@@ -78,7 +91,7 @@ def run_on_a_terminal(world, entry: str, *args: str, answer: str) -> tuple[int,
             f"from worktrees.cli import {entry}; raise SystemExit({entry}())",
             *args,
         ],
-        cwd=str(world.repo),
+        cwd=str(at),
         stdin=child,
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -113,16 +126,19 @@ def test_status_leaves_a_removable_worktree_alone(world) -> None:
     p = run(world, "gws", "--no-fetch")
     assert p.returncode == 0, p.stderr
     assert "remove" in p.stdout
-    assert "1 removable, 0 kept, 0 unclear" in p.stdout
+    assert "1 removable, 1 kept, 0 unclear" in p.stdout  # the main checkout
     assert "gwp removes the 1 marked removable" in p.stderr
     assert wt.exists()
     assert world.git("rev-parse", "--verify", "refs/heads/done")
 
 
 def test_status_says_when_there_is_nothing(world) -> None:
+    """The main checkout is still a row, so the table shows what
+    `git worktree list` shows and the hint says what is missing."""
     p = run(world, "gws", "--no-fetch")
     assert p.returncode == 0, p.stderr
-    assert "no worktrees besides the main checkout" in p.stdout
+    assert "it is the main checkout" in p.stdout
+    assert "no worktrees besides the main checkout; gwa NAME makes one" in p.stderr
 
 
 def test_status_json_is_data_on_stdout(world) -> None:
@@ -131,7 +147,9 @@ def test_status_json_is_data_on_stdout(world) -> None:
     assert p.returncode == 0, p.stderr
     payload = json.loads(p.stdout)
     assert payload["head"] == "refs/heads/main"
-    assert payload["verdicts"][0]["verdict"] == "remove"
+    rows = {v["branch"]: v for v in payload["verdicts"]}
+    assert rows["done"]["verdict"] == "remove"
+    assert rows["main"]["why"] == "it is the main checkout, and never removable"
     assert payload["stale"] == []
 
 
@@ -147,9 +165,11 @@ def test_json_carries_the_ignored_count_as_a_number(world) -> None:
 
     p = run(world, "gws", "--no-fetch", "--no-forge", "--json")
     assert p.returncode == 0, p.stderr
-    row = json.loads(p.stdout)["verdicts"][0]
+    rows = {v["branch"]: v for v in json.loads(p.stdout)["verdicts"]}
+    row = rows["holds-secrets"]
     assert row["ignored"] == 1
     assert row["verdict"] == "keep"
+    assert rows["main"]["ignored"] == 0
     # and the sentence still says it, for the person reading the table
     assert "1 ignored path(s)" in row["why"]
 
@@ -312,7 +332,8 @@ def test_prune_clears_a_stale_record(world) -> None:
 def test_prune_says_so_when_there_is_nothing(world) -> None:
     p = run(world, "gwp", "--no-fetch", "--yes")
     assert p.returncode == 0, p.stderr
-    assert "no worktrees besides the main checkout" in p.stdout
+    assert "it is the main checkout" in p.stdout
+    assert "no worktrees besides the main checkout; gwa NAME makes one" in p.stderr
 
 
 def test_prune_prints_the_reason_rather_than_naming_the_command(world) -> None:
@@ -324,7 +345,7 @@ def test_prune_prints_the_reason_rather_than_naming_the_command(world) -> None:
     assert p.returncode == 0, p.stderr
     assert "busy" in p.stdout
     assert "it has uncommitted changes" in p.stdout
-    assert "nothing to remove; 0 removable, 1 kept, 0 unclear" in p.stdout
+    assert "nothing to remove; 0 removable, 2 kept, 0 unclear" in p.stdout
     assert "gws" not in p.stdout
 
 
@@ -390,7 +411,7 @@ def test_the_cli_name_takes_a_subcommand(world) -> None:
     world.worktree("done")
     p = run(world, "main", "status", "--no-fetch", "--json")
     assert p.returncode == 0, p.stderr
-    assert json.loads(p.stdout)["verdicts"][0]["branch"] == "done"
+    assert "done" in {v["branch"] for v in json.loads(p.stdout)["verdicts"]}
 
 
 def test_the_cli_name_with_no_argument_prints_help(world) -> None:
@@ -437,7 +458,7 @@ def test_every_shorthand_reaches_the_same_command(world, spelling: str) -> None:
     world.worktree("done")
     p = run(world, "main", spelling, "--no-fetch", "--json")
     assert p.returncode == 0, p.stderr
-    assert json.loads(p.stdout)["verdicts"][0]["branch"] == "done"
+    assert "done" in {v["branch"] for v in json.loads(p.stdout)["verdicts"]}
 
 
 @pytest.mark.parametrize(
@@ -560,7 +581,7 @@ def test_json_is_never_coloured_even_on_a_terminal(world) -> None:
     code, out = run_with_a_terminal_on_stdout(world, "gws", "--no-fetch", "--json")
     assert code == 0, out
     assert "[" not in out
-    assert json.loads(out)["verdicts"][0]["branch"] == "done"
+    assert "done" in {v["branch"] for v in json.loads(out)["verdicts"]}
 
 
 def test_no_color_turns_it_off_on_a_terminal(world) -> None:
@@ -696,3 +717,45 @@ def test_list_with_no_query_takes_blank_as_cancelled(world) -> None:
     code, out = run_on_a_terminal(world, "gwl", answer="\n")
     assert code == 0, out
     assert "nothing picked" in out
+
+
+def test_status_lists_the_main_checkout_and_never_proposes_it(world) -> None:
+    """A listing that leaves it out shows one row where `git worktree list`
+    shows two, which reads as though something went missing."""
+    world.worktree("done")
+    p = run(world, "gws", "--no-fetch", "--no-forge")
+    assert p.returncode == 0, p.stderr
+    assert "it is the main checkout, and never removable" in p.stdout
+    assert p.stdout.count("keep") == 1
+    assert "1 removable, 1 kept, 0 unclear" in p.stdout
+    rows = {
+        v["branch"]: v
+        for v in json.loads(
+            run(world, "gws", "--no-fetch", "--no-forge", "--json").stdout
+        )["verdicts"]
+    }
+    assert set(rows) == {"main", "done"}
+    assert rows["main"]["verdict"] == "keep"
+
+
+def test_remove_is_never_offered_the_main_checkout(world) -> None:
+    """`gwr` takes the same list as its candidates, and `git worktree remove`
+    answers `fatal: '<path>' is a main working tree` whatever flag it is
+    given, so offering it would propose something certain to be refused.
+    """
+    world.worktree("done")
+    p = run(world, "gwr", "--no-fetch", "--complete")
+    assert p.returncode == 0, p.stderr
+    assert "main" not in p.stdout
+    assert "done" in p.stdout
+
+
+def test_list_shows_the_worktree_you_are_standing_in_unnumbered(world) -> None:
+    """Marked, above the ones you can go to, and carrying no number: it is
+    where you are rather than somewhere to go."""
+    wt = world.worktree("cleanup")
+    code, out = run_on_a_terminal_at(world, wt, "gwl", answer="\n")
+    assert code == 0, out
+    assert "  *  cleanup" in out
+    assert "  1  main" in out
+    assert "which? [1-1, or blank to cancel]" in out

{git_worktrees-0.3.0 → git_worktrees-0.3.1}/uv.lock

@@ -40,7 +40,7 @@ wheels = [
 
 [[package]]
 name = "git-worktrees"
-version = "0.3.0"
+version = "0.3.1"
 source = { editable = "." }
 
 [package.optional-dependencies]