Improve git root detection logic

[jesseleite]

Firstly, a quick thank you, for all your awesome work on sesh! It's a game changer for me ❤️

The problem:

The sesh README says that sesh root assumes existence of a .bare folder...

Note: This will only work if you are in a git worktree or git repository. For now, git worktrees expect a .bare folder.

Not everyone uses git worktrees this way. For example, many prefer the conventional git clone --bare [repo] project, which leaves you with a messy project folder, but this is still very common nonetheless.

I on the other hand, prefer to run git clone --bare [repo] project/.git, which stores all of the git meta in .git folder, but still creates a bare repo. This leaves me with a really clean project folder when using worktrees...

The .bare convention is cool too, but again would require different pathing logic for each situation.

A possible solution:

My proposition is to use the output of git worktree list, since git knows where the main worktree / bare repo lives...

^ As you can see, the main worktree is always listed first, no matter how you roll with git worktrees (whether that be using .git, or .bare, or doing it the messier default way.

For example, this is what you see when running git worktree list...

This PR uses git worktree list to grab that first field, for the basis of sesh root and also for the namer package used when naming sessions.

I was able to remove both --git-common-dir and --show-toplevel checks, because those seem to be handled well with the first field returned by git worktree list; It seems to be super consistent across all situations 🎉

Todo:

• Proof of concept
  • Using git worktree list to find root from within git worktree repos
    • Using .bare convention
    • Using .git convention
    • With standard worktree (git config/refs/etc. files at root)
  • Using git worktree list to find root from non-worktree repo subdirs
• Get working with sesh root command
• Get working with namer package
• Add test coverage

[jesseleite]

Also, as a side effect of the new implementation, the issue described in #192 seems to be solved! 🎉

Tmux + gum example using the new sesh root functionality...

[joshmedeski]

Gotta fix tests, I'll DM you and we can do some pair programming to fix it.

[joshmedeski]

When I choose a git worktree I got this result:

_bare/Users/joshmedeski/c/sesh/v1

But expected this::

sesh/v1

[joshmedeski]

Furthermore, when I call sesh root I'm getting the following output:

~/c/sesh/.bare

However, I need this to be the root so I can properly leverage the root search feature:

~/c/sesh

[joshmedeski]

I moved this to a draft for now, let me know if you want someone else to take over or have some time soon to revisit this work and finish it up, thanks!

[jesseleite]

TLDR of recent changes:

While git worktree list is still a much cleaner / more reliable solution than having to juggle between rev-parse --git-common-dir and --show-toplevel, I couldn't figure out how to get git to return without the .bare suffix, so I just restored your trim logic for .bare folder convention 👍

[Copilot]

Pull Request Overview

This PR improves the git root detection logic by leveraging the output of "git worktree list" to determine the repository root, streamlining the handling of different git worktree conventions.

• Updated the Root command to inject new dependencies (git and home) and use GitRoot for path resolution.
• Refactored the namer package to remove outdated methods and adjust tests accordingly.
• Updated the Git interface and its mocks, along with test coverage for new git root logic.

Reviewed Changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
seshcli/seshcli.go	Updated CLI registration with new dependencies for the root cmd.
seshcli/root.go	Modified root command implementation to use GitRoot and Home.
namer/namer_test.go	Adjusted tests to reflect changes from GitCommonDir/ShowTopLevel to GitRoot.
namer/namer.go	Removed the gitBareName strategy for git root detection.
namer/git.go	Refactored git name resolution to use GitRoot.
git/mock_Git.go	Updated mocks to support GitRoot instead of deprecated methods.
git/git_test.go	Added tests covering new worktree list based GitRoot implementation.
git/git.go	Refactored GitRoot to use "git worktree list" and trim .bare suffix.
dir/dir.go	Simplified root directory detection by directly calling GitRoot.

[joshmedeski]

I'm looking over the code and there's a breaking change I need fixed:

sesh root
~/c/sesh

sesh root
~/c/sesh/main

When calling sesh root on a worktree, I need the "root" to be the worktree folder, not the place the bare worktree is installed.

[joshmedeski]

Some additional feedback on where we want the logic to live, nice work overall and I'm looking forward to getting this merged soon 🫶

[joshmedeski]

With my request to move the logic of determining the name in the namer package, we can reverse this change.

[jesseleite]

I did move the name parsing logic into the namer package as you requested 👍, but need to think on how we want to wire it up in the dir package. Do we just import the namer, or dependency inject it? Maybe we can pair on this 🤔

[niksingh710]

Is this PR is in consideration?

[joshmedeski]

Yes, the development was paused for a while. I would like to pick it up and finish it soon.

[joshmedeski]

The work has been moved to #288

[niksingh710]

@jesseleite can you share how you are listing branches in sesh for git worktree?

I was thinking something like repo:branchname for git worktree.

I am using the https://github.com/nix-community/home-manager/blob/9a2dc0efbc569ce9352a6ffb8e8ec8dbc098e142/modules/programs/sesh.nix#L95-L109 currenlty for listing.

[joshmedeski]

@niksingh710 this is how I work with git worktrees and sesh:

I always do a bare clone of the repo that I want to use for worktrees. Typically the directory is a short abbreviation (since sesh is only 4 characters, I bare clone to sesh).

My git worktrees are simple directory names, typically feature-focused. For example, if I'm working on updating a git-bare-namer feature for sesh I'd create a worktree called git-bare-namer.

Then, I setup this custom sesh configuration if I ever want to explicitly pick a sesh worktree:

[[session]]
name = "sesh pick worktree"
path = "~/c/sesh"
startup_command = "sesh connect (find . -maxdepth 1 -type d | gum filter --limit 1 --fuzzy --no-sort --placeholder 'Pick a worktree' --prompt='🌲') && exit"

Note

The && exit makes sure to close the picker session.
p.s. I hope to make this kind of functionality easier to configure and more intuitive in the near future.