Merge branch 'main' into issue/249/hide-duplicates-and-hide-attached-bug

Author: joshmedeski

.github/workflows/ci-cd.yml

@@ -22,9 +22,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
-      - name: Install deps
+          go-version: "1.24"
+      - name: Install junit report
         run: go install github.com/jstemmer/go-junit-report/v2@latest
+      - name: Install mockery
+        run: go install github.com/vektra/mockery/[email protected]
+      - name: Create mocks
+        run: mockery
       - name: Run tests
         run: go test -cover -bench=. -benchmem -race -v 2>&1 ./... | go-junit-report -set-exit-code > report.xml
       - name: Test Summary
@@ -47,7 +51,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.24"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:

.gitignore

@@ -11,6 +11,9 @@
 # Test binary, built with `go test -c`
 *.test
 
+# Mocks
+mock_*
+
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 

.goreleaser.yaml

@@ -22,6 +22,8 @@ builds:
       - linux
       - windows
       - darwin
+    ldflags:
+      - -X main.version={{.Version}}
 
 archives:
   - format: tar.gz

.mockery.yaml

@@ -1,14 +1,12 @@
-with-expecter: True
-inpackage: True
-testonly: False
-issue-845-fix: True
-resolve-type-alias: False
-dir: "{{.InterfaceDir}}"
-mockname: "Mock{{.InterfaceName}}"
-outpkg: "{{.PackageName}}"
-filename: "mock_{{.InterfaceName}}.go"
-all: True
+all: true
+dir: '{{.InterfaceDir}}'
+structname: Mock{{.InterfaceName}}
+pkgname: '{{.SrcPackageName}}'
+filename: mock_{{.InterfaceName}}.go
+template: testify
+template-data:
+  unroll-variadic: true
 packages:
   github.com/joshmedeski/sesh:
     config:
-      recursive: True
+      recursive: true

CLAUDE.md

@@ -0,0 +1,65 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+Sesh is a smart terminal session manager written in Go that helps users create and manage tmux sessions quickly and easily using zoxide. It's a CLI tool that integrates with tmux and zoxide to provide intelligent session management.
+
+## Core Architecture
+
+- **Module**: `github.com/joshmedeski/sesh/v2`
+- **Go Version**: 1.23.0 (toolchain 1.24.3)
+- **Main Entry Point**: `main.go` → `seshcli.App()`
+
+### Key Packages
+
+- `seshcli/` - CLI command implementations (connect, list, preview, clone, last, tui)
+- `lister/` - Lists sessions from various sources (tmux, zoxide, config)
+- `connector/` - Handles session connections
+- `tmux/` - Tmux integration
+- `zoxide/` - Zoxide integration
+- `configurator/` - Configuration management (`sesh.toml` in `$XDG_CONFIG_HOME/sesh`)
+- `tui/` - Terminal UI implementation using Bubble Tea (currently under development)
+
+### Session Sources
+
+1. **Tmux**: Active tmux sessions
+2. **Zoxide**: Frequently used directories
+3. **Config**: User-defined sessions in configuration
+4. **Tmuxinator**: Tmuxinator project configurations
+
+## Common Development Commands
+
+### Build
+```bash
+make build
+# Or directly:
+go build -ldflags "-X 'main.version=`git describe --tags --abbrev=0`'" -o $GOPATH/bin/sesh
+```
+
+### Test
+```bash
+make test
+# Or directly:
+go test -cover -bench=. -benchmem -race ./... -coverprofile=coverage.out
+```
+
+### Run a single test
+```bash
+go test -run TestFunctionName ./package/...
+```
+
+### Generate mocks
+```bash
+# Uses mockery v2.52.3
+mockery --all
+```
+
+## Development Notes
+
+- The project uses dependency injection with interfaces for testability
+- Mock files follow the pattern `mock_*.go` generated by mockery
+- Configuration is stored in TOML format (`sesh.toml`)
+- The TUI feature is currently under active development on the `tui` branch
+- When editing code, follow existing patterns for error handling, logging, and interface design

Makefile

@@ -3,7 +3,7 @@
 BUILD_FLAGS="-X 'main.version=`git describe --tags --abbrev=0`'"
 
 test:
-	@go test -cover -bench=. -benchmem -race ./... -coverprofile=coverage.out
+	@mockery && go test -cover -bench=. -benchmem -race ./... -coverprofile=coverage.out
 
 build: 
-	@go build -ldflags ${BUILD_FLAGS} -o $(shell echo $$GOPATH)/bin/sesh
+	@go build -ldflags ${BUILD_FLAGS} -o $(shell go env GOPATH)/bin/sesh

README.md

@@ -63,6 +63,24 @@ This will download and install the latest version of Sesh. Make sure that your G
 
 </details>
 
+<details>
+  <summary>Conda</summary>
+
+To install sesh, run **one** of the following commands, depending on your setup:
+
+* Conda/(micro)mamba users
+```sh
+# Replace with mamba/micromamba if required
+conda -c conda-forge install sesh
+```
+
+* Pixi users
+```sh
+pixi global install sesh
+```
+
+</details>
+
 <details>
   <summary>Nix</summary>
 
@@ -72,6 +90,8 @@ See the [nix package directory](https://search.nixos.org/packages?channel=unstab
 
 **Note:** Do you want this on another package manager? [Create an issue](https://github.com/joshmedeski/sesh/issues/new) and let me know!
 
+## Extensions
+
 ## Raycast Extension
 
 The [sesh companion extension](https://www.raycast.com/joshmedeski/sesh) for [Raycast](https://www.raycast.com/) makes it easy to use sesh outside of the terminal.
@@ -83,7 +103,45 @@ Here are limitations to keep in mind:
 
 <a title="Install sesh Raycast Extension" href="https://www.raycast.com/joshmedeski/sesh"><img src="https://www.raycast.com/joshmedeski/sesh/[email protected]?v=1.1" height="64" alt="" style="height: 64px;"></a>
 
-## How to use
+## Ulauncher Extension
+
+For Linux users using [Ulauncher](https://ulauncher.io/) there are two extensions to use sesh outside the terminal:
+- [Sesh Session Manager](https://ext.ulauncher.io/-/github-jacostag-sesh-ulauncher)
+- [SESHion Manager](https://ext.ulauncher.io/-/github-mrinfinidy-seshion-manager)
+
+Here are limitations to keep in mind for Sesh Session Manager:
+
+- tmux has to be running before you can use the extension
+
+
+## Walker launcher usage (Linux)
+
+Create an action directly on $XDG_CONFIG_HOME/config.toml
+
+
+```
+[[plugins]]
+name = "sesh"
+prefix = ";s "
+src_once = "sesh list -d -c -t -T"
+cmd = "sesh connect --switch %RESULT%"
+keep_sort = false
+recalculate_score = true
+show_icon_when_single = true
+switcher_only = true
+```
+
+### For the dmenu mode you can use:
+
+#### Fish shell:
+set ssession $(sesh l -t -T -d -H | walker -d -f -k -p "Sesh sessions"); sesh cn --switch $ssession
+
+#### Bash/Zsh:
+ssession=$(sesh l -t -T -d -H | walker -d -f -k -p "Sesh sessions"); sesh cn --switch $ssession
+
+##### For dmenu launchers replace walker -dfk with dmenu or rofi)
+
+### How to use
 
 ### tmux for sessions
 
@@ -231,9 +289,39 @@ You may want to blacklist certain tmux sessions from showing up in the results.
 blacklist = ["scratch"]
 ```
 
+### Directory Length
+
+Control how many directory components are used for session names. Default is 1 (only the directory basename).
+
+```toml
+dir_length = 2  # Uses last 2 directories: "projects/sesh" instead of just "sesh"
+```
+
 > [!NOTE] 
 > Works great with [tmux-floatx](https://github.com/omerxx/tmux-floax)
 
+### Sorting
+
+If you'd like to change the order of the sessions shown, you can configure `sort_order` in your `sesh.toml` file
+
+```toml
+sort_order = [
+    "tmuxinator", # show first
+    "config",
+    "tmux",
+    "zoxide", # show last
+]
+```
+
+The default order is `tmux`, `config`, `tmuxinator`, and then `zoxide`.
+
+You can omit session types if you only care about the order of specific ones.
+
+```toml
+sort_order = [
+  "config", # resulting order: config, tmux, tmuxinator, zoxide
+]
+```
 ### Default Session
 
 The default session can be configured to run a command when connecting to a session. This is useful for running a dev server or starting a tmux plugin.
@@ -273,6 +361,41 @@ startup_command = "nvim tmux.conf"
 preview_command = "bat --color=always ~/c/dotfiles/.config/tmux/tmux.conf"
 ```
 
+### Path substitution
+If you want to use the path of the selected session in your startup or preview command, you can use the `{}` placeholder.  
+This will be replaced with the session's path when the command is run.
+
+An example of this in use is the following, where the `tmuxinator` default_project uses the path as key/value pair using [ERB syntax](https://github.com/tmuxinator/tmuxinator?tab=readme-ov-file#erb):
+```toml
+[default_session]
+startup_command = "tmuxinator start default_project path={}"
+preview_command = "eza --all --git --icons --color=always {}"
+```
+
+### Multiple windows
+
+If you want your session to have multiple windows you can define windows in your configuration. You can then use these window layouts in your sessions. These windows can be reused as many times as you want and you can add as many windows to each session as you want.
+
+Note: If you do not specify a path in the window, it will use the session's path.
+
+```toml
+[[session]]
+name = "Downloads 📥"
+path = "~/Downloads"
+startup_command = "ls"
+
+[[session]]
+name = "tmux config"
+path = "~/c/dotfiles/.config/tmux"
+startup_command = "nvim tmux.conf"
+preview_command = "bat --color=always ~/c/dotfiles/.config/tmux/tmux.conf"
+windows = [ "git" ]
+
+[[window]]
+name = "git"
+startup_script = "git pull"
+```
+
 ### Listing Configurations
 
 Session configurations will load by default if no flags are provided (the return after tmux sessions and before zoxide results). If you want to explicitly list them, you can use the `-c` flag.