Fix column alignment in list output and unblock pre-push hook (#96)

* test: add column alignment test for `stave -l`

Verifies that USAGE and SYNOPSIS headers land at the same horizontal
position across Local, Namespace, and Import groups. Also checks that
data row synopsis text starts at the expected column.

This test fails against the current implementation because each group
computes its own column widths independently.

* fix: align columns across groups in `stave -l`

Each writeTable call was computing maxUsage from only its own group's
items, so groups with shorter target names got narrower columns and the
USAGE/SYNOPSIS headers landed at different horizontal positions.

Pre-compute a single global maxUsage across all sections after
groupTargets runs, then pass it into each writeTable call. This also
removes the dead maxSyn variable that was computed but never read.

* fix: isolate git hook tests from user global config

testGitInit in both internal/hooks and pkg/stave now sets
GIT_CONFIG_GLOBAL and GIT_CONFIG_SYSTEM to /dev/null via cmd.Env
and writes a local core.hooksPath override so production code under
test doesn't inherit the user's global hooks path.

Also adds .worktrees/ to .gitignore.

Closes #90

* chore: add CHANGELOG entry for v0.13.3

Author: jamesainslie

.gitignore

@@ -73,3 +73,6 @@ stave_test_out
 
 # gomdlint
 *.gomdlint.bak
+
+# Worktrees
+.worktrees/

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.13.3] - 2026-03-24
+
+### Fixed
+
+- Align USAGE and SYNOPSIS columns across all groups in `stave -l` output.
+- Isolate git hook tests from user global config (`core.hooksPath`). Closes #90.
+
 ## [0.13.2] - 2026-03-07
 
 ### Changed
@@ -491,7 +498,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Parallelized tests where possible, including locking mechanism to prevent parallel tests in same `testdata/(xyz/)` subdir.
 
-[unreleased]: https://github.com/yaklabco/stave/compare/v0.13.2...HEAD
+[unreleased]: https://github.com/yaklabco/stave/compare/v0.13.3...HEAD
+[0.13.3]: https://github.com/yaklabco/stave/compare/v0.13.2...v0.13.3
 [0.13.2]: https://github.com/yaklabco/stave/compare/v0.13.1...v0.13.2
 [0.13.1]: https://github.com/yaklabco/stave/compare/v0.13.0...v0.13.1
 [0.13.0]: https://github.com/yaklabco/stave/compare/v0.12.0...v0.13.0

internal/hooks/git_test.go

@@ -10,17 +10,31 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// testGitInit initializes a git repository in the given directory.
-// It uses --template= to avoid inheriting hooks from user git templates,
-// ensuring test isolation regardless of the user's git configuration.
-// It also creates the hooks directory since --template= skips creating it.
+// testGitInit initializes an isolated git repository in the given directory.
+// It uses --template= to avoid inheriting hooks from user git templates and
+// sets GIT_CONFIG_GLOBAL/SYSTEM to /dev/null so user git config (e.g.
+// core.hooksPath) doesn't leak into the test repo. It also writes a local
+// git config that unsets core.hooksPath for any subsequent git commands that
+// run without the env overrides (e.g. in production code under test).
 func testGitInit(t *testing.T, dir string) {
 	t.Helper()
+
 	cmd := exec.Command("git", "init", "--template=")
 	cmd.Dir = dir
+	cmd.Env = append(os.Environ(),
+		"GIT_CONFIG_GLOBAL="+os.DevNull,
+		"GIT_CONFIG_SYSTEM="+os.DevNull,
+	)
 	if err := cmd.Run(); err != nil {
 		t.Fatalf("git init failed: %v", err)
 	}
+
+	// Ensure core.hooksPath is not inherited from global config for
+	// subsequent git commands run by the code under test.
+	unset := exec.Command("git", "config", "--local", "core.hooksPath", "")
+	unset.Dir = dir
+	_ = unset.Run() //nolint:errcheck // non-zero exit if key absent is fine
+
 	// Create hooks directory since --template= skips it
 	hooksDir := filepath.Join(dir, ".git", "hooks")
 	if err := os.MkdirAll(hooksDir, 0o755); err != nil {

pkg/stave/hooks_cmd_test.go

@@ -28,17 +28,31 @@ hooks:
     - target: fmt
 `
 
-// testGitInit initializes a git repository in the given directory.
-// It uses --template= to avoid inheriting hooks from user git templates,
-// ensuring test isolation regardless of the user's git configuration.
-// It also creates the hooks directory since --template= skips creating it.
+// testGitInit initializes an isolated git repository in the given directory.
+// It uses --template= to avoid inheriting hooks from user git templates and
+// sets GIT_CONFIG_GLOBAL/SYSTEM to /dev/null so user git config (e.g.
+// core.hooksPath) doesn't leak into the test repo. It also writes a local
+// git config that unsets core.hooksPath for any subsequent git commands that
+// run without the env overrides (e.g. in production code under test).
 func testGitInit(t *testing.T, dir string) {
 	t.Helper()
+
 	cmd := exec.Command("git", "init", "--template=")
 	cmd.Dir = dir
+	cmd.Env = append(os.Environ(),
+		"GIT_CONFIG_GLOBAL="+os.DevNull,
+		"GIT_CONFIG_SYSTEM="+os.DevNull,
+	)
 	if err := cmd.Run(); err != nil {
 		t.Fatalf("git init failed: %v", err)
 	}
+
+	// Ensure core.hooksPath is not inherited from global config for
+	// subsequent git commands run by the code under test.
+	unset := exec.Command("git", "config", "--local", "core.hooksPath", "")
+	unset.Dir = dir
+	_ = unset.Run() //nolint:errcheck // non-zero exit if key absent is fine
+
 	// Create hooks directory since --template= skips it
 	hooksDir := filepath.Join(dir, ".git", "hooks")
 	if err := os.MkdirAll(hooksDir, 0o755); err != nil {

pkg/stave/list.go

@@ -151,14 +151,16 @@ func renderTargetList(out io.Writer, info *parse.PkgInfo, filters []string) erro
 	_, _ = fmt.Fprintln(out, titleStyle.Render("Targets:"))
 
 	sections := groupTargets(items)
+	maxUsage := globalUsageWidth(sections)
+
 	writeSection := func(title string, groups []targetGroup) {
 		if len(groups) == 0 {
 			return
 		}
 		_, _ = fmt.Fprintln(out)
 		_, _ = fmt.Fprintln(out, sectionStyle.Render(title))
 		for _, g := range groups {
-			writeTable(out, tableHeaderStyle, subsectionStyle, g, renderName, indent)
+			writeTable(out, tableHeaderStyle, subsectionStyle, g, renderName, indent, maxUsage)
 		}
 	}
 
@@ -284,6 +286,30 @@ func usageFor(binaryName, display string, args []parse.Arg) string {
 	return sb.String()
 }
 
+func usageWidthFor(name string, args []parse.Arg, isWatch bool) int {
+	usage := usageFor("", name, args)
+	if isWatch {
+		usage += " [W]"
+	}
+	return lipgloss.Width(usage)
+}
+
+func globalUsageWidth(sections targetSections) int {
+	maxWidth := lipgloss.Width("USAGE")
+	for _, groups := range [][]targetGroup{sections.local, sections.namespaces, sections.imports} {
+		for _, g := range groups {
+			for _, it := range g.items {
+				name := it.displayName
+				if len(it.aliases) > 0 {
+					name = fmt.Sprintf("%s (%s)", name, strings.Join(it.aliases, ", "))
+				}
+				maxWidth = max(maxWidth, usageWidthFor(name, it.args, it.isWatch))
+			}
+		}
+	}
+	return maxWidth
+}
+
 func applyTargetFilters(items []targetItem, filters []string) []targetItem {
 	if len(filters) == 0 {
 		return items
@@ -407,6 +433,7 @@ func writeTable(
 	group targetGroup,
 	renderName func(name string, isDefault, isWatch bool, args []parse.Arg) string,
 	indent string,
+	maxUsage int,
 ) {
 	if len(group.items) == 0 {
 		return
@@ -453,21 +480,6 @@ func writeTable(
 		})
 	}
 
-	// Column widths (ANSI-aware via lipgloss.Width).
-	maxUsage, maxSyn := 0, 0
-	for i, theRow := range rows {
-		usage := theRow.name
-		if i > 0 {
-			// For data rows, use the non-colored usage string to calculate width
-			usage = usageFor("", theRow.name, theRow.args)
-			if theRow.isWatch {
-				usage += " [W]"
-			}
-		}
-		maxUsage = max(maxUsage, lipgloss.Width(usage))
-		maxSyn = max(maxSyn, lipgloss.Width(theRow.synopsis))
-	}
-
 	pad := func(text string, width int) string {
 		if width <= 0 {
 			return text

pkg/stave/list_test.go

@@ -2,13 +2,102 @@ package stave
 
 import (
 	"bytes"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/yaklabco/stave/internal/parse"
 )
 
+func TestRenderTargetList_ColumnsAlignAcrossGroups(t *testing.T) {
+	t.Setenv("NO_COLOR", "1")
+
+	info := &parse.PkgInfo{
+		PkgName: "main",
+		Funcs: []*parse.Function{
+			// Short local target.
+			{Name: "Build", Synopsis: "Compile the project"},
+			// Namespace with a long target name + args → wider USAGE column.
+			{
+				Name:     "VeryLongTargetName",
+				Receiver: "LongNamespace",
+				Synopsis: "Does something elaborate",
+				Args:     []parse.Arg{{Name: "file"}, {Name: "output"}},
+			},
+		},
+		Imports: []*parse.Import{
+			{
+				Name: "ext",
+				Path: "example.com/ext",
+				Info: parse.PkgInfo{
+					PkgName: "ext",
+					Funcs: []*parse.Function{
+						{Name: "Run", Synopsis: "Run the external tool"},
+					},
+				},
+			},
+		},
+	}
+
+	var buf bytes.Buffer
+	err := renderTargetList(&buf, info, nil)
+	require.NoError(t, err)
+
+	output := buf.String()
+	lines := strings.Split(output, "\n")
+
+	// Collect horizontal positions of "USAGE" and "SYNOPSIS" headers.
+	var usagePositions, synPositions []int
+	for _, line := range lines {
+		if idx := strings.Index(line, "USAGE"); idx >= 0 {
+			usagePositions = append(usagePositions, idx)
+		}
+		if idx := strings.Index(line, "SYNOPSIS"); idx >= 0 {
+			synPositions = append(synPositions, idx)
+		}
+	}
+
+	require.GreaterOrEqual(t, len(usagePositions), 3, "expected USAGE header in at least 3 groups, got %d", len(usagePositions))
+	for i := 1; i < len(usagePositions); i++ {
+		assert.Equal(t, usagePositions[0], usagePositions[i],
+			"USAGE column misaligned: group 0 at %d, group %d at %d", usagePositions[0], i, usagePositions[i])
+	}
+
+	require.GreaterOrEqual(t, len(synPositions), 3, "expected SYNOPSIS header in at least 3 groups, got %d", len(synPositions))
+	for i := 1; i < len(synPositions); i++ {
+		assert.Equal(t, synPositions[0], synPositions[i],
+			"SYNOPSIS column misaligned: group 0 at %d, group %d at %d", synPositions[0], i, synPositions[i])
+	}
+
+	// Verify data rows also align: every non-blank, non-header content line should
+	// have its synopsis text starting at the same column as the SYNOPSIS header.
+	synCol := synPositions[0]
+	for _, line := range lines {
+		if strings.TrimSpace(line) == "" {
+			continue
+		}
+		// Skip header lines, section titles, and short lines that don't reach the synopsis column.
+		if strings.Contains(line, "SYNOPSIS") || strings.Contains(line, "USAGE") {
+			continue
+		}
+		if len(line) <= synCol {
+			continue
+		}
+		// Data rows have synopsis text; check that the character at synCol is non-space
+		// (i.e. the synopsis starts there, not shifted left or right). Skip continuation
+		// lines (indented wrapped text) which start with spaces at synCol.
+		if strings.HasPrefix(strings.TrimLeft(line, " "), "stave ") ||
+			strings.HasPrefix(strings.TrimLeft(line, " "), "build") ||
+			strings.HasPrefix(strings.TrimLeft(line, " "), "ext:") ||
+			strings.HasPrefix(strings.TrimLeft(line, " "), "longNamespace:") {
+			// This is a data row — the synopsis column should have non-space content.
+			assert.NotEqual(t, ' ', rune(line[synCol]),
+				"data row synopsis not aligned at column %d: %q", synCol, line)
+		}
+	}
+}
+
 func TestRenderTargetList_Watch(t *testing.T) {
 	info := &parse.PkgInfo{
 		PkgName: "main",