[refactor] Enable gocognit linter and fix all violations (#84)

* [refactor] Enable gocognit linter in golangci-lint config

Add gocognit (cognitive complexity) linter alongside existing gocyclo
with min-complexity threshold of 15. Exclude test files from checks.

* [refactor] Reduce cognitive complexity in 10 production functions

Extract helper functions from functions exceeding gocognit threshold of 15:
- tool_list.go: filterListCandidates, detailsToListItems
- tool_status.go: buildStatusResult, buildStatusItem
- planner.go: buildConflictMatrix, selectMergeOrder
- tool_conflict.go: processOverlaps, processDryMerges
- archived.go: searchByPrefixedTask, searchByExactMatch, searchByTaskExtraction
- status.go: buildCLIStatusSummary, buildStatusRow, formatAgeCell
- exec.go: formatExecStatus, printIndentedOutput
- copy.go: copyEntry, copyDirEntry
- manager.go: tryCloneFromExisting

Author: lugassawan

.golangci.yml

@@ -15,6 +15,7 @@ linters:
     - funcorder
     - goconst
     - gocritic
+    - gocognit
     - gocyclo
     - gosec
     - intrange
@@ -50,6 +51,8 @@ linters:
       constructor: true
       struct-method: true
       alphabetical: false
+    gocognit:
+      min-complexity: 15
     gocyclo:
       min-complexity: 15
     goconst:
@@ -79,6 +82,8 @@ linters:
     rules:
       - path: (_test\.go|testutil/)
         linters: [gosec]
+      - path: _test\.go
+        linters: [gocognit]
       - path: _test\.go
         linters: [rimbalint]
         text: "nolateexport:"

cmd/exec.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"io"
 	"strings"
 	"sync"
 
@@ -229,6 +230,7 @@ func filterDirtyWorktrees(r git.Runner, s *spinner.Spinner, worktrees []resolver
 
 // printExecResults prints the formatted output for each execution result.
 func printExecResults(cmd *cobra.Command, p *termcolor.Painter, results []executor.Result, prefixes []string) {
+	out := cmd.OutOrStdout()
 	for _, r := range results {
 		_, matchedPrefix := resolver.TaskFromBranch(r.Target.Branch, prefixes)
 		typeName := strings.TrimSuffix(matchedPrefix, "/")
@@ -238,32 +240,38 @@ func printExecResults(cmd *cobra.Command, p *termcolor.Painter, results []execut
 			taskLabel = p.Paint(taskLabel, c)
 		}
 
-		var status string
-		switch {
-		case r.Cancelled:
-			status = p.Paint("cancelled", termcolor.Gray)
-		case r.Err != nil:
-			status = p.Paint("error", termcolor.Red)
-		case r.ExitCode != 0:
-			status = p.Paint(fmt.Sprintf("exit %d", r.ExitCode), termcolor.Red)
-		default:
-			status = p.Paint("ok", termcolor.Green)
-		}
+		fmt.Fprintf(out, "%s  %s\n", taskLabel, formatExecStatus(r, p))
+		printIndentedOutput(out, r)
+	}
+}
 
-		fmt.Fprintf(cmd.OutOrStdout(), "%s  %s\n", taskLabel, status)
+// formatExecStatus returns the colored status string for an execution result.
+func formatExecStatus(r executor.Result, p *termcolor.Painter) string {
+	switch {
+	case r.Cancelled:
+		return p.Paint("cancelled", termcolor.Gray)
+	case r.Err != nil:
+		return p.Paint("error", termcolor.Red)
+	case r.ExitCode != 0:
+		return p.Paint(fmt.Sprintf("exit %d", r.ExitCode), termcolor.Red)
+	default:
+		return p.Paint("ok", termcolor.Green)
+	}
+}
 
-		if out := strings.TrimRight(string(r.Stdout), "\n"); out != "" {
-			for line := range strings.SplitSeq(out, "\n") {
-				fmt.Fprintf(cmd.OutOrStdout(), "  %s\n", line)
-			}
+// printIndentedOutput prints stdout/stderr with indentation for a result.
+func printIndentedOutput(out io.Writer, r executor.Result) {
+	if s := strings.TrimRight(string(r.Stdout), "\n"); s != "" {
+		for line := range strings.SplitSeq(s, "\n") {
+			fmt.Fprintf(out, "  %s\n", line)
 		}
+	}
 
-		if r.Err != nil {
-			fmt.Fprintf(cmd.OutOrStdout(), "  %s\n", r.Err)
-		} else if errOut := strings.TrimRight(string(r.Stderr), "\n"); errOut != "" {
-			for line := range strings.SplitSeq(errOut, "\n") {
-				fmt.Fprintf(cmd.OutOrStdout(), "  %s\n", line)
-			}
+	if r.Err != nil {
+		fmt.Fprintf(out, "  %s\n", r.Err)
+	} else if s := strings.TrimRight(string(r.Stderr), "\n"); s != "" {
+		for line := range strings.SplitSeq(s, "\n") {
+			fmt.Fprintf(out, "  %s\n", line)
 		}
 	}
 }

cmd/status.go

@@ -138,29 +138,15 @@ func collectStatuses(r git.Runner, candidates []git.WorktreeEntry, s *spinner.Sp
 
 // renderStatusDashboard prints the summary header and per-worktree table.
 func renderStatusDashboard(out io.Writer, p *termcolor.Painter, results []statusEntry, staleDays int) {
-	var totalCount, dirtyCount, staleCount, behindCount int
-	totalCount = len(results)
 	staleThreshold := time.Now().Add(-time.Duration(staleDays) * 24 * time.Hour)
-
-	for _, r := range results {
-		if r.status.Dirty {
-			dirtyCount++
-		}
-		if r.status.Behind > 0 {
-			behindCount++
-		}
-		if r.hasTime && r.commitTime.Before(staleThreshold) {
-			staleCount++
-		}
-	}
-
+	summary := buildCLIStatusSummary(results, staleThreshold)
 	prefixes := resolver.AllPrefixes()
 
 	fmt.Fprintf(out, "Worktrees: %s  Dirty: %s  Stale: %s  Behind: %s\n\n",
-		p.Paint(strconv.Itoa(totalCount), termcolor.Bold),
-		colorCount(p, dirtyCount, termcolor.Yellow),
-		colorCount(p, staleCount, termcolor.Red),
-		colorCount(p, behindCount, termcolor.Red),
+		p.Paint(strconv.Itoa(summary.total), termcolor.Bold),
+		colorCount(p, summary.dirty, termcolor.Yellow),
+		colorCount(p, summary.stale, termcolor.Red),
+		colorCount(p, summary.behind, termcolor.Red),
 	)
 
 	tbl := termcolor.NewTable(2)
@@ -173,33 +159,57 @@ func renderStatusDashboard(out io.Writer, p *termcolor.Painter, results []status
 	)
 
 	for _, r := range results {
-		task, matchedPrefix := resolver.TaskFromBranch(r.entry.Branch, prefixes)
-		typeName := strings.TrimSuffix(matchedPrefix, "/")
+		tbl.AddRow(buildStatusRow(r, prefixes, staleThreshold, p)...)
+	}
 
-		taskCell := "  " + task
-		typeCell := typeName
-		if c := typeColor(typeName); c != "" {
-			typeCell = p.Paint(typeCell, c)
-		}
+	tbl.Render(out)
+}
 
-		statusCell := colorStatus(p, r.status)
+type cliStatusSummary struct {
+	total, dirty, stale, behind int
+}
 
-		var ageCell string
-		if r.hasTime {
-			ageStr := resolver.FormatAge(r.commitTime)
-			if r.commitTime.Before(staleThreshold) {
-				ageCell = p.Paint(ageStr, termcolor.Red) + " " + p.Paint("⚠ stale", termcolor.Red)
-			} else {
-				ageCell = p.Paint(ageStr, resolver.AgeColor(r.commitTime))
-			}
-		} else {
-			ageCell = p.Paint("unknown", termcolor.Gray)
+// buildCLIStatusSummary counts summary stats from results.
+func buildCLIStatusSummary(results []statusEntry, staleThreshold time.Time) cliStatusSummary {
+	s := cliStatusSummary{total: len(results)}
+	for _, r := range results {
+		if r.status.Dirty {
+			s.dirty++
 		}
+		if r.status.Behind > 0 {
+			s.behind++
+		}
+		if r.hasTime && r.commitTime.Before(staleThreshold) {
+			s.stale++
+		}
+	}
+	return s
+}
 
-		tbl.AddRow(taskCell, typeCell, r.entry.Branch, statusCell, ageCell)
+// buildStatusRow formats a single worktree row for the status table.
+func buildStatusRow(r statusEntry, prefixes []string, staleThreshold time.Time, p *termcolor.Painter) []string {
+	task, matchedPrefix := resolver.TaskFromBranch(r.entry.Branch, prefixes)
+	typeName := strings.TrimSuffix(matchedPrefix, "/")
+
+	taskCell := "  " + task
+	typeCell := typeName
+	if c := typeColor(typeName); c != "" {
+		typeCell = p.Paint(typeCell, c)
 	}
 
-	tbl.Render(out)
+	return []string{taskCell, typeCell, r.entry.Branch, colorStatus(p, r.status), formatAgeCell(r, staleThreshold, p)}
+}
+
+// formatAgeCell formats the age cell with color and stale indicator.
+func formatAgeCell(r statusEntry, staleThreshold time.Time, p *termcolor.Painter) string {
+	if !r.hasTime {
+		return p.Paint("unknown", termcolor.Gray)
+	}
+	ageStr := resolver.FormatAge(r.commitTime)
+	if r.commitTime.Before(staleThreshold) {
+		return p.Paint(ageStr, termcolor.Red) + " " + p.Paint("⚠ stale", termcolor.Red)
+	}
+	return p.Paint(ageStr, resolver.AgeColor(r.commitTime))
 }
 
 // writeStatusJSON builds the JSON output for the status command.

internal/conflict/planner.go

@@ -18,14 +18,17 @@ func PlanMergeOrder(overlaps []FileOverlap, branches []string) []MergeStep {
 		return nil
 	}
 
-	// Build branch index
 	idx := make(map[string]int, len(branches))
 	for i, b := range branches {
 		idx[b] = i
 	}
 
-	// Build NxN conflict matrix
-	n := len(branches)
+	matrix := buildConflictMatrix(overlaps, idx, len(branches))
+	return selectMergeOrder(matrix, branches)
+}
+
+// buildConflictMatrix builds an NxN matrix counting file overlaps between branch pairs.
+func buildConflictMatrix(overlaps []FileOverlap, idx map[string]int, n int) [][]int {
 	matrix := make([][]int, n)
 	for i := range n {
 		matrix[i] = make([]int, n)
@@ -43,8 +46,12 @@ func PlanMergeOrder(overlaps []FileOverlap, branches []string) []MergeStep {
 			}
 		}
 	}
+	return matrix
+}
 
-	// Greedily pick branch with fewest total conflicts against remaining
+// selectMergeOrder greedily picks branches with fewest conflicts against remaining branches.
+func selectMergeOrder(matrix [][]int, branches []string) []MergeStep {
+	n := len(branches)
 	remaining := make([]int, n)
 	for i := range n {
 		remaining[i] = i

internal/deps/manager.go

@@ -114,26 +114,8 @@ func (m *Manager) installModule(worktreePath string, mh ModuleWithHash, existing
 		return InstallResult{Module: mod}
 	}
 
-	for _, wtPath := range existingPaths {
-		otherHash, err := HashLockfile(wtPath, mod.Lockfile)
-		if err != nil || otherHash != mh.Hash {
-			continue
-		}
-
-		modDir := filepath.Join(wtPath, mod.Dir)
-		if info, err := os.Stat(modDir); err != nil || !info.IsDir() {
-			continue
-		}
-
-		if err := CloneModule(wtPath, worktreePath, mod); err != nil {
-			if !mod.CloneOnly {
-				installErr := runInstall(worktreePath, mod)
-				return InstallResult{Module: mod, Error: installErr}
-			}
-			return InstallResult{Module: mod, Error: fmt.Errorf("clone from %s: %w", wtPath, err)}
-		}
-
-		return InstallResult{Module: mod, Source: wtPath, Cloned: true}
+	if result, ok := tryCloneFromExisting(worktreePath, mh, existingPaths); ok {
+		return result
 	}
 
 	if mod.CloneOnly {
@@ -173,6 +155,33 @@ func ResolveModules(worktreePath string, autoDetect bool, configModules []config
 	return modules, nil
 }
 
+// tryCloneFromExisting attempts to clone the module from an existing worktree with matching lockfile.
+func tryCloneFromExisting(worktreePath string, mh ModuleWithHash, existingPaths []string) (InstallResult, bool) {
+	mod := mh.Module
+	for _, wtPath := range existingPaths {
+		otherHash, err := HashLockfile(wtPath, mod.Lockfile)
+		if err != nil || otherHash != mh.Hash {
+			continue
+		}
+
+		modDir := filepath.Join(wtPath, mod.Dir)
+		if info, err := os.Stat(modDir); err != nil || !info.IsDir() {
+			continue
+		}
+
+		if err := CloneModule(wtPath, worktreePath, mod); err != nil {
+			if !mod.CloneOnly {
+				installErr := runInstall(worktreePath, mod)
+				return InstallResult{Module: mod, Error: installErr}, true
+			}
+			return InstallResult{Module: mod, Error: fmt.Errorf("clone from %s: %w", wtPath, err)}, true
+		}
+
+		return InstallResult{Module: mod, Source: wtPath, Cloned: true}, true
+	}
+	return InstallResult{}, false
+}
+
 func runInstall(worktreePath string, mod Module) error {
 	dir := worktreePath
 	if mod.WorkDir != "" {