Refactor CLI version command and remove obsolete test file. Further cleaning of code, simplifying the help command, and improving the plugin list command

- Removed `root_test_main_test.go` as it was no longer needed.
- Introduced `version_cmd.go` to handle version information display, including tracking third-party dependencies.
- Added tests for the new version command in `version_cmd_test.go`, ensuring correct output and behavior.
- Updated `git.go` to replace custom logger interface with `zap.Logger` for consistency.
- Modified smoke test for plugin listing to use the new `--format` flag instead of `--json`.

Author: bomly-guy

.gitignore

@@ -13,8 +13,8 @@ coverage
 # IDE files
 .idea
 
-# Claude files
-/.claude
+# Claude worktrees
+/.claude/worktrees
 
 # Qodana files
 qodana.yaml

AGENTS.md

@@ -111,7 +111,7 @@ Cache failures are **non-fatal** — log a warning and continue without caching.
 
 ### Terminal Output
 
-- Use `internal/cli/ansi.go` helpers (`ansiStyled`, `ansiWrap`, `stripANSI`) — never raw escape codes inline.
+- Use `internal/cli/render/ansi.go` helpers (`Style`, `Wrap`, `StripANSI`) — never raw escape codes inline.
 - Interactive TUI uses Bubbletea (`internal/cli/interactive.go`) with the `interactiveModel` interface.
 - SARIF output via `internal/output` — do not hand-craft SARIF JSON.
 

internal/cli/ansi.go

@@ -6,12 +6,6 @@ import (
 	"go.uber.org/zap"
 )
 
-type executionLogger interface {
-	Info(msg string, fields ...zap.Field)
-	Debug(msg string, fields ...zap.Field)
-	Error(msg string, fields ...zap.Field)
-}
-
 func commandLogger(cmd *cobra.Command, options *globalOptions, name string) *zap.Logger {
 	current := options.current()
 	// In default mode (no verbosity flags), suppress log output so only the

internal/cli/logger.go internal/cli/cmd_logger.gointernal/cli/logger.go renamed to internal/cli/cmd_logger.go

@@ -5,22 +5,29 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/bomly-dev/bomly-cli/internal/progress"
 	"github.com/bomly-dev/bomly-cli/internal/scan"
 	model "github.com/bomly-dev/bomly-cli/sdk"
 )
 
+// newCommandProgress constructs a Progress sourcing its writer + TTY-detection
+// from the CLI's commandStreams.
+func newCommandProgress(streams commandStreams, label string) *progress.Progress {
+	return progress.New(streams.notificationWriter(), streams.canRenderProgress(), label)
+}
+
 // warningProgressChildren converts pipeline warnings into ⚠ children using
 // the warning source as Label and the message as Detail.
-func warningProgressChildren(warnings []scan.PipelineWarning) []progressChild {
-	children := make([]progressChild, 0, len(warnings))
+func warningProgressChildren(warnings []scan.PipelineWarning) []progress.Child {
+	children := make([]progress.Child, 0, len(warnings))
 	for _, w := range warnings {
 		label := w.Source
 		if label == "" {
 			label = "unknown"
 		}
 		detail := strings.ReplaceAll(w.Message, "\n", " ")
-		children = append(children, progressChild{
-			Icon:   progressWarningMark,
+		children = append(children, progress.Child{
+			Icon:   progress.WarningMark,
 			Label:  label,
 			Detail: detail,
 		})
@@ -30,8 +37,8 @@ func warningProgressChildren(warnings []scan.PipelineWarning) []progressChild {
 
 // subprojectProgressChildren returns one child per resolved subproject showing
 // the relative path and ecosystem.
-func subprojectProgressChildren(results []model.DetectionResult) []progressChild {
-	children := make([]progressChild, 0, len(results))
+func subprojectProgressChildren(results []model.DetectionResult) []progress.Child {
+	children := make([]progress.Child, 0, len(results))
 	for _, r := range results {
 		label := r.SubprojectInfo.RelativePath
 		if label == "" || label == "." {
@@ -44,14 +51,14 @@ func subprojectProgressChildren(results []model.DetectionResult) []progressChild
 		if detail != "" {
 			label += " (" + detail + ")"
 		}
-		children = append(children, progressChild{Label: label})
+		children = append(children, progress.Child{Label: label})
 	}
 	return children
 }
 
 // detectorProgressChildren groups results by detector name, sums the total
 // package count per detector, and returns children with ✔ icon.
-func detectorProgressChildren(results []model.DetectionResult) []progressChild {
+func detectorProgressChildren(results []model.DetectionResult) []progress.Child {
 	type detectorInfo struct {
 		name     string
 		packages int
@@ -74,73 +81,24 @@ func detectorProgressChildren(results []model.DetectionResult) []progressChild {
 			}
 		}
 	}
-	children := make([]progressChild, 0, len(order))
+	children := make([]progress.Child, 0, len(order))
 	for _, key := range order {
 		info := index[key]
-		children = append(children, progressChild{
-			Icon:   progressCheckMark,
+		children = append(children, progress.Child{
+			Icon:   progress.CheckMark,
 			Label:  humanizeDetectorName(info.name),
 			Detail: fmt.Sprintf("[%d packages]", info.packages),
 		})
 	}
 	return children
 }
 
-// licenseProgressChildren counts packages with license data grouped by source type and
-// returns children with ✔ icon and [N licenses] detail.
-func licenseProgressChildren(results []model.DetectionResult) []progressChild {
-	type sourceInfo struct {
-		name     string
-		packages map[string]struct{}
-	}
-	index := make(map[string]*sourceInfo)
-	order := make([]string, 0)
-	for _, r := range results {
-		if r.Graphs == nil {
-			continue
-		}
-		for _, entry := range r.Graphs.Entries {
-			if entry.Graph == nil {
-				continue
-			}
-			for _, pkg := range entry.Graph.Packages() {
-				if pkg == nil {
-					continue
-				}
-				for _, lic := range pkg.Licenses {
-					key := lic.Type
-					if key == "" {
-						continue
-					}
-					info, exists := index[key]
-					if !exists {
-						info = &sourceInfo{name: key, packages: make(map[string]struct{})}
-						index[key] = info
-						order = append(order, key)
-					}
-					info.packages[pkg.ID] = struct{}{}
-				}
-			}
-		}
-	}
-	children := make([]progressChild, 0, len(order))
-	for _, key := range order {
-		info := index[key]
-		children = append(children, progressChild{
-			Icon:   progressCheckMark,
-			Label:  humanizeLicenseSource(info.name),
-			Detail: fmt.Sprintf("[%d licenses]", len(info.packages)),
-		})
-	}
-	return children
-}
-
 // auditProgressChildren groups findings by source and returns children with ✔ icon.
-func auditProgressChildren(auditorRuns []string, auditorFindings map[string]int, warnings []scan.PipelineWarning) []progressChild {
-	children := make([]progressChild, 0, len(auditorRuns)+len(warnings))
+func auditProgressChildren(auditorRuns []string, auditorFindings map[string]int, warnings []scan.PipelineWarning) []progress.Child {
+	children := make([]progress.Child, 0, len(auditorRuns)+len(warnings))
 	for _, name := range auditorRuns {
-		children = append(children, progressChild{
-			Icon:   progressCheckMark,
+		children = append(children, progress.Child{
+			Icon:   progress.CheckMark,
 			Label:  humanizeAuditorSource(name),
 			Detail: fmt.Sprintf("[%d findings]", auditorFindings[name]),
 		})
@@ -151,11 +109,11 @@ func auditProgressChildren(auditorRuns []string, auditorFindings map[string]int,
 
 // matchProgressChildren returns ✔ children for each successful matcher run
 // and ⚠ children for each warning.
-func matchProgressChildren(g *model.Graph, runs []string, warnings []scan.PipelineWarning) []progressChild {
-	children := make([]progressChild, 0, len(runs)+len(warnings))
+func matchProgressChildren(g *model.Graph, runs []string, warnings []scan.PipelineWarning) []progress.Child {
+	children := make([]progress.Child, 0, len(runs)+len(warnings))
 	for _, name := range runs {
-		children = append(children, progressChild{
-			Icon:   progressCheckMark,
+		children = append(children, progress.Child{
+			Icon:   progress.CheckMark,
 			Label:  humanizeMatcherName(name),
 			Detail: matcherProgressDetail(g, name),
 		})
@@ -177,11 +135,11 @@ func matcherProgressDetail(g *model.Graph, matcherName string) string {
 		}
 		switch matcherName {
 		case depsdevCheckerName:
-			if packageHasLicenseSource(pkg, "external-depsdev") {
+			if packageHasLicenseSource(pkg, "deps.dev") {
 				packages++
 			}
 		case clearlyDefinedCheckerName:
-			if packageHasLicenseSource(pkg, "external-clearlydefined") {
+			if packageHasLicenseSource(pkg, "ClearlyDefined") {
 				packages++
 			}
 		case osvMatcherName, grypeMatcherName:
@@ -247,18 +205,6 @@ func humanizeDetectorName(name string) string {
 	return strings.Join(parts, " ") + " Detector"
 }
 
-// humanizeLicenseSource converts a license source type to a display name.
-func humanizeLicenseSource(sourceType string) string {
-	switch sourceType {
-	case "external-depsdev":
-		return "deps.dev"
-	case "external-clearlydefined":
-		return "ClearlyDefined"
-	default:
-		return sourceType
-	}
-}
-
 // humanizeAuditorSource converts an auditor source name to a display name.
 func humanizeAuditorSource(source string) string {
 	switch strings.ToLower(source) {

internal/cli/progress_helpers.go internal/cli/cmd_progress.gointernal/cli/progress_helpers.go renamed to internal/cli/cmd_progress.go

@@ -3,70 +3,17 @@ package cli
 import (
 	"testing"
 
-	"github.com/bomly-dev/bomly-cli/internal/scan"
 	model "github.com/bomly-dev/bomly-cli/sdk"
 )
 
-func TestLicenseProgressChildren_CountsPackagesWithLicensesPerSource(t *testing.T) {
-	g := model.New()
-	for _, pkg := range []*model.Package{
-		model.NewPackage(model.Package{
-			Name:    "react",
-			Version: "18.2.0",
-			Licenses: []model.PackageLicense{{
-				Type:  "external-depsdev",
-				Value: "MIT",
-			}},
-		}),
-		model.NewPackage(model.Package{
-			Name:    "zod",
-			Version: "3.23.0",
-			Licenses: []model.PackageLicense{{
-				Type:  "external-depsdev",
-				Value: "MIT",
-			}},
-		}),
-		model.NewPackage(model.Package{
-			Name:    "chalk",
-			Version: "5.4.1",
-			Licenses: []model.PackageLicense{{
-				Type:  "external-clearlydefined",
-				Value: "ISC",
-			}},
-		}),
-	} {
-		if err := g.AddPackage(pkg); err != nil {
-			t.Fatalf("AddPackage() error = %v", err)
-		}
-	}
-
-	children := licenseProgressChildren([]model.DetectionResult{{
-		Graphs: scan.SingleGraphContainer(g, model.ManifestMetadata{Path: "package.json", Kind: "npm"}),
-	}})
-
-	if len(children) != 2 {
-		t.Fatalf("expected 2 children, got %#v", children)
-	}
-	counts := make(map[string]string, len(children))
-	for _, child := range children {
-		counts[child.Label] = child.Detail
-	}
-	if counts["deps.dev"] != "[2 licenses]" {
-		t.Fatalf("expected deps.dev count based on packages, got %#v", children)
-	}
-	if counts["ClearlyDefined"] != "[1 licenses]" {
-		t.Fatalf("expected ClearlyDefined count based on packages, got %#v", children)
-	}
-}
-
 func TestMatchProgressChildren_ReportsMatcherCounts(t *testing.T) {
 	g := model.New()
 	for _, pkg := range []*model.Package{
 		model.NewPackage(model.Package{
 			Name:    "react",
 			Version: "18.2.0",
 			Licenses: []model.PackageLicense{{
-				Type:  "external-depsdev",
+				Type:  "deps.dev",
 				Value: "MIT",
 			}},
 			Vulnerabilities: []model.PackageVulnerability{
@@ -78,7 +25,7 @@ func TestMatchProgressChildren_ReportsMatcherCounts(t *testing.T) {
 			Name:    "zod",
 			Version: "3.23.0",
 			Licenses: []model.PackageLicense{{
-				Type:  "external-clearlydefined",
+				Type:  "ClearlyDefined",
 				Value: "Apache-2.0",
 			}},
 			Vulnerabilities: []model.PackageVulnerability{

internal/cli/progress_helpers_test.go internal/cli/cmd_progress_test.gointernal/cli/progress_helpers_test.go renamed to internal/cli/cmd_progress_test.go

@@ -211,19 +211,7 @@ func optionValuesHelpSection(cmd *cobra.Command) string {
 		return ""
 	}
 
-	reg := scan.NewRegistry(scan.RegistryConfigs{}, *zap.NewNop())
-	reg.Build()
-
-	var b strings.Builder
-	b.WriteString("\n\n")
-	b.WriteString(formatTable("Available Native Detectors", []string{"Ecosystem", "Package Managers", "Detectors (Alias)"}, buildNativeDetectorRows(reg)))
-	b.WriteString("\n")
-	b.WriteString(formatTable("Available Third-party Detectors", []string{"Detector", "Ecosystems"}, buildThirdPartyDetectorRows(reg)))
-	b.WriteString("\n")
-	b.WriteString(formatHelpList("Available Auditors", availableAuditorOptions(zap.NewNop())))
-	b.WriteString("\n")
-	b.WriteString(formatHelpList("Available Matchers", availableMatcherOptions()))
-	return b.String()
+	return "\n\nExplore available detectors, matchers, and auditors with `bomly plugin list`."
 }
 
 func formatHelpList(label string, values []string) string {

internal/cli/streams.go internal/cli/cmd_streams.gointernal/cli/streams.go renamed to internal/cli/cmd_streams.go

@@ -244,7 +244,7 @@ func (ctx commandContext) close() error {
 	return ctx.cleanup()
 }
 
-func (o *globalOptions) resolveExecutionTarget(logger executionLogger) (model.ExecutionTarget, string, func() error, error) {
+func (o *globalOptions) resolveExecutionTarget(logger *zap.Logger) (model.ExecutionTarget, string, func() error, error) {
 	current := o.current()
 	if current.SBOM {
 		if current.Container != "" || current.URL != "" || current.Ref != "" {