feat(cli/clean): display and remove extra taps

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>

Author: fullstackjam

internal/cli/clean.go

@@ -77,7 +77,7 @@ func runClean(cmd *cobra.Command) error {
 	showCleanPreview(result)
 
 	if !dryRun {
-		proceed, err := ui.Confirm(fmt.Sprintf("Remove %d packages?", result.TotalExtra()), false)
+		proceed, err := ui.Confirm(fmt.Sprintf("Remove %d item(s)?", result.TotalExtra()), false)
 		if err != nil {
 			return err
 		}
@@ -130,7 +130,7 @@ func cleanFromRemote(userSlug string) (*cleaner.CleanResult, error) {
 		return nil, fmt.Errorf("failed to fetch remote config: %w", err)
 	}
 
-	return cleaner.DiffFromLists(rc.Packages, rc.Casks, rc.Npm)
+	return cleaner.DiffFromLists(rc.Packages, rc.Casks, rc.Npm, rc.Taps)
 }
 
 func cleanFromLocalSnapshot() (*cleaner.CleanResult, error) {
@@ -158,6 +158,9 @@ func showCleanSummary(result *cleaner.CleanResult) {
 		if len(result.RemovedNpm) > 0 {
 			fmt.Printf("  npm: %s\n", strings.Join(result.RemovedNpm, ", "))
 		}
+		if len(result.RemovedTaps) > 0 {
+			fmt.Printf("  taps: %s\n", strings.Join(result.RemovedTaps, ", "))
+		}
 	}
 	if result.TotalFailed() > 0 {
 		ui.Warn(fmt.Sprintf("Failed to remove %d package(s):", result.TotalFailed()))
@@ -170,11 +173,14 @@ func showCleanSummary(result *cleaner.CleanResult) {
 		if len(result.FailedNpm) > 0 {
 			fmt.Printf("  npm: %s\n", strings.Join(result.FailedNpm, ", "))
 		}
+		if len(result.FailedTaps) > 0 {
+			fmt.Printf("  taps: %s\n", strings.Join(result.FailedTaps, ", "))
+		}
 	}
 }
 
 func showCleanPreview(result *cleaner.CleanResult) {
-	ui.Info(fmt.Sprintf("Found %d extra packages not in your config:", result.TotalExtra()))
+	ui.Info(fmt.Sprintf("Found %d extra item(s) not in your config:", result.TotalExtra()))
 	fmt.Println()
 
 	if len(result.ExtraFormulae) > 0 {
@@ -189,5 +195,9 @@ func showCleanPreview(result *cleaner.CleanResult) {
 		ui.Info(fmt.Sprintf("  NPM (%d):", len(result.ExtraNpm)))
 		fmt.Printf("    %s\n", strings.Join(result.ExtraNpm, ", "))
 	}
+	if len(result.ExtraTaps) > 0 {
+		ui.Info(fmt.Sprintf("  Taps (%d):", len(result.ExtraTaps)))
+		fmt.Printf("    %s\n", strings.Join(result.ExtraTaps, ", "))
+	}
 	fmt.Println()
 }

test/integration/cleaner_integration_test.go

@@ -0,0 +1,143 @@
+//go:build integration
+
+package integration
+
+import (
+	"testing"
+
+	"github.com/openbootdotdev/openboot/internal/brew"
+	"github.com/openbootdotdev/openboot/internal/cleaner"
+	"github.com/openbootdotdev/openboot/internal/snapshot"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestIntegration_Cleaner_DiffFromLists_AllDesiredInstalled(t *testing.T) {
+	// Given: brew is installed and we know what's installed
+	require.True(t, brew.IsInstalled(), "brew must be installed")
+	formulae, casks, err := brew.GetInstalledPackages()
+	require.NoError(t, err)
+
+	desiredFormulae := make([]string, 0, len(formulae))
+	for name := range formulae {
+		desiredFormulae = append(desiredFormulae, name)
+	}
+	desiredCasks := make([]string, 0, len(casks))
+	for name := range casks {
+		desiredCasks = append(desiredCasks, name)
+	}
+
+	// When: desired == installed
+	result, err := cleaner.DiffFromLists(desiredFormulae, desiredCasks, nil, nil)
+
+	// Then: no extras detected
+	require.NoError(t, err)
+	assert.Empty(t, result.ExtraFormulae, "no extra formulae when desired matches installed")
+	assert.Empty(t, result.ExtraCasks, "no extra casks when desired matches installed")
+}
+
+func TestIntegration_Cleaner_DiffFromLists_EmptyDesired(t *testing.T) {
+	// Given: brew is installed with at least one package
+	require.True(t, brew.IsInstalled(), "brew must be installed")
+	formulae, casks, err := brew.GetInstalledPackages()
+	require.NoError(t, err)
+
+	// When: desired lists are empty (want nothing installed)
+	result, err := cleaner.DiffFromLists(nil, nil, nil, nil)
+
+	// Then: everything installed shows up as extra
+	require.NoError(t, err)
+	assert.Equal(t, len(formulae), len(result.ExtraFormulae),
+		"all installed formulae should appear as extra when desired is empty")
+	assert.Equal(t, len(casks), len(result.ExtraCasks),
+		"all installed casks should appear as extra when desired is empty")
+	t.Logf("Extra formulae: %d, extra casks: %d", len(result.ExtraFormulae), len(result.ExtraCasks))
+}
+
+func TestIntegration_Cleaner_DiffFromLists_SubsetDesired(t *testing.T) {
+	// Given: brew is installed with multiple packages
+	require.True(t, brew.IsInstalled(), "brew must be installed")
+	formulae, _, err := brew.GetInstalledPackages()
+	require.NoError(t, err)
+	if len(formulae) < 2 {
+		t.Skip("need at least 2 installed formulae for subset test")
+	}
+
+	// When: desired is exactly one installed formula
+	var oneFormula string
+	for name := range formulae {
+		oneFormula = name
+		break
+	}
+	result, err := cleaner.DiffFromLists([]string{oneFormula}, nil, nil, nil)
+
+	// Then: all other installed formulae appear as extras
+	require.NoError(t, err)
+	assert.NotContains(t, result.ExtraFormulae, oneFormula, "desired package should not appear as extra")
+	assert.Equal(t, len(formulae)-1, len(result.ExtraFormulae),
+		"all formulae except the desired one should be extra")
+}
+
+func TestIntegration_Cleaner_DiffFromSnapshot_CurrentState(t *testing.T) {
+	// Given: brew is installed; we build a snapshot from current installed state
+	require.True(t, brew.IsInstalled(), "brew must be installed")
+	formulae, casks, err := brew.GetInstalledPackages()
+	require.NoError(t, err)
+
+	installedFormulae := make([]string, 0, len(formulae))
+	for name := range formulae {
+		installedFormulae = append(installedFormulae, name)
+	}
+	installedCasks := make([]string, 0, len(casks))
+	for name := range casks {
+		installedCasks = append(installedCasks, name)
+	}
+
+	snap := &snapshot.Snapshot{
+		Packages: snapshot.PackageSnapshot{
+			Formulae: installedFormulae,
+			Casks:    installedCasks,
+		},
+	}
+
+	// When: we diff against a snapshot that matches current state
+	result, err := cleaner.DiffFromSnapshot(snap)
+
+	// Then: no extras
+	require.NoError(t, err)
+	assert.Empty(t, result.ExtraFormulae, "no extra formulae when snapshot matches installed")
+	assert.Empty(t, result.ExtraCasks, "no extra casks when snapshot matches installed")
+}
+
+func TestIntegration_Cleaner_Execute_DryRun_NoChanges(t *testing.T) {
+	// Given: brew is installed; build a result with formulae we know exist but won't actually remove
+	require.True(t, brew.IsInstalled(), "brew must be installed")
+
+	result := &cleaner.CleanResult{
+		ExtraFormulae: []string{"wget"},
+		ExtraCasks:    []string{},
+	}
+
+	// When: Execute in dry-run mode
+	err := cleaner.Execute(result, true)
+
+	// Then: no error, nothing removed from the system
+	assert.NoError(t, err)
+	t.Logf("Dry-run removed: %d formulae, %d casks", len(result.RemovedFormulae), len(result.RemovedCasks))
+}
+
+func TestIntegration_Cleaner_CleanResult_TotalMethods(t *testing.T) {
+	// Given: a real diff result from the current system
+	require.True(t, brew.IsInstalled(), "brew must be installed")
+
+	result, err := cleaner.DiffFromLists(nil, nil, nil, nil)
+	require.NoError(t, err)
+
+	// When: we query totals
+	total := result.TotalExtra()
+
+	// Then: total matches component counts
+	assert.Equal(t, len(result.ExtraFormulae)+len(result.ExtraCasks)+len(result.ExtraNpm)+len(result.ExtraTaps), total)
+	assert.Equal(t, 0, result.TotalRemoved(), "nothing removed yet")
+	assert.Equal(t, 0, result.TotalFailed(), "nothing failed yet")
+}