feat(cleaner): track per-package remove/fail outcomes in CleanResult

Adds RemovedFormulae/Casks/Npm + FailedFormulae/Casks/Npm fields and TotalRemoved/TotalFailed helpers. Execute now uninstalls one package at a time to populate these fields, and returns errors.Join with per-package detail instead of a lossy count-only message.

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

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

Author: fullstackjam

internal/cleaner/cleaner.go

@@ -1,6 +1,7 @@
 package cleaner
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/openbootdotdev/openboot/internal/brew"
@@ -13,12 +14,28 @@ type CleanResult struct {
 	ExtraFormulae []string
 	ExtraCasks    []string
 	ExtraNpm      []string
+
+	RemovedFormulae []string
+	RemovedCasks    []string
+	RemovedNpm      []string
+
+	FailedFormulae []string
+	FailedCasks    []string
+	FailedNpm      []string
 }
 
 func (r *CleanResult) TotalExtra() int {
 	return len(r.ExtraFormulae) + len(r.ExtraCasks) + len(r.ExtraNpm)
 }
 
+func (r *CleanResult) TotalRemoved() int {
+	return len(r.RemovedFormulae) + len(r.RemovedCasks) + len(r.RemovedNpm)
+}
+
+func (r *CleanResult) TotalFailed() int {
+	return len(r.FailedFormulae) + len(r.FailedCasks) + len(r.FailedNpm)
+}
+
 func DiffFromSnapshot(snap *snapshot.Snapshot) (*CleanResult, error) {
 	desiredFormulae := toSet(snap.Packages.Formulae)
 	desiredCasks := toSet(snap.Packages.Casks)
@@ -67,47 +84,60 @@ func diff(desiredFormulae, desiredCasks, desiredNpm map[string]bool) (*CleanResu
 	return result, nil
 }
 
-func Execute(result *CleanResult, dryRun bool) error {
-	type uninstallOp struct {
-		label     string
-		pkgs      []string
-		uninstall func([]string, bool) error
-	}
+type uninstallOneFn func(pkg string, dryRun bool) error
+
+type uninstallOp struct {
+	label        string
+	pkgs         []string
+	uninstallOne uninstallOneFn
+	removed      *[]string
+	failed       *[]string
+}
 
+func Execute(result *CleanResult, dryRun bool) error {
 	ops := []uninstallOp{
 		{
-			label:     "Removing extra formulae",
-			pkgs:      result.ExtraFormulae,
-			uninstall: brew.Uninstall,
+			label:        "Removing extra formulae",
+			pkgs:         result.ExtraFormulae,
+			uninstallOne: func(pkg string, dry bool) error { return brew.Uninstall([]string{pkg}, dry) },
+			removed:      &result.RemovedFormulae,
+			failed:       &result.FailedFormulae,
 		},
 		{
-			label:     "Removing extra casks",
-			pkgs:      result.ExtraCasks,
-			uninstall: brew.UninstallCask,
+			label:        "Removing extra casks",
+			pkgs:         result.ExtraCasks,
+			uninstallOne: func(pkg string, dry bool) error { return brew.UninstallCask([]string{pkg}, dry) },
+			removed:      &result.RemovedCasks,
+			failed:       &result.FailedCasks,
 		},
 		{
-			label:     "Removing extra npm packages",
-			pkgs:      result.ExtraNpm,
-			uninstall: npm.Uninstall,
+			label:        "Removing extra npm packages",
+			pkgs:         result.ExtraNpm,
+			uninstallOne: func(pkg string, dry bool) error { return npm.Uninstall([]string{pkg}, dry) },
+			removed:      &result.RemovedNpm,
+			failed:       &result.FailedNpm,
 		},
 	}
 
 	var errs []error
 	for _, op := range ops {
-		if len(op.pkgs) > 0 {
-			fmt.Println()
-			ui.Header(op.label)
-			fmt.Println()
-			if err := op.uninstall(op.pkgs, dryRun); err != nil {
-				errs = append(errs, fmt.Errorf("%s: %w", op.label, err))
+		if len(op.pkgs) == 0 {
+			continue
+		}
+		fmt.Println()
+		ui.Header(op.label)
+		fmt.Println()
+		for _, pkg := range op.pkgs {
+			if err := op.uninstallOne(pkg, dryRun); err != nil {
+				*op.failed = append(*op.failed, pkg)
+				errs = append(errs, fmt.Errorf("%s: %w", pkg, err))
+			} else {
+				*op.removed = append(*op.removed, pkg)
 			}
 		}
 	}
 
-	if len(errs) > 0 {
-		return fmt.Errorf("%d cleanup steps had failures", len(errs))
-	}
-	return nil
+	return errors.Join(errs...)
 }
 
 func toSet(items []string) map[string]bool {

internal/cleaner/cleaner_test.go

@@ -1,9 +1,11 @@
 package cleaner
 
 import (
+	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestToSet(t *testing.T) {
@@ -96,3 +98,103 @@ func TestCleanResult_TotalExtra(t *testing.T) {
 		})
 	}
 }
+
+func TestCleanResult_TotalRemoved(t *testing.T) {
+	r := &CleanResult{
+		RemovedFormulae: []string{"a"},
+		RemovedCasks:    []string{"b", "c"},
+		RemovedNpm:      []string{},
+	}
+	assert.Equal(t, 3, r.TotalRemoved())
+}
+
+func TestCleanResult_TotalFailed(t *testing.T) {
+	r := &CleanResult{
+		FailedFormulae: []string{"x"},
+		FailedNpm:      []string{"y"},
+	}
+	assert.Equal(t, 2, r.TotalFailed())
+}
+
+func runOp(op uninstallOp, dryRun bool) error {
+	var errs []error
+	for _, pkg := range op.pkgs {
+		if err := op.uninstallOne(pkg, dryRun); err != nil {
+			*op.failed = append(*op.failed, pkg)
+			errs = append(errs, err)
+		} else {
+			*op.removed = append(*op.removed, pkg)
+		}
+	}
+	return errors.Join(errs...)
+}
+
+func TestExecute_AllSucceed(t *testing.T) {
+	result := &CleanResult{
+		ExtraFormulae: []string{"wget", "curl"},
+	}
+
+	callLog := []string{}
+	op := uninstallOp{
+		label: "Removing extra formulae",
+		pkgs:  result.ExtraFormulae,
+		uninstallOne: func(pkg string, _ bool) error {
+			callLog = append(callLog, pkg)
+			return nil
+		},
+		removed: &result.RemovedFormulae,
+		failed:  &result.FailedFormulae,
+	}
+
+	require.NoError(t, runOp(op, false))
+	assert.Equal(t, []string{"wget", "curl"}, result.RemovedFormulae)
+	assert.Empty(t, result.FailedFormulae)
+	assert.Equal(t, []string{"wget", "curl"}, callLog)
+}
+
+func TestExecute_PartialFailure(t *testing.T) {
+	result := &CleanResult{
+		ExtraFormulae: []string{"good-pkg", "bad-pkg", "another-good"},
+	}
+
+	op := uninstallOp{
+		label: "Removing extra formulae",
+		pkgs:  result.ExtraFormulae,
+		uninstallOne: func(pkg string, _ bool) error {
+			if pkg == "bad-pkg" {
+				return errors.New("dependency conflict")
+			}
+			return nil
+		},
+		removed: &result.RemovedFormulae,
+		failed:  &result.FailedFormulae,
+	}
+
+	require.Error(t, runOp(op, false))
+	assert.Equal(t, []string{"good-pkg", "another-good"}, result.RemovedFormulae)
+	assert.Equal(t, []string{"bad-pkg"}, result.FailedFormulae)
+	assert.Equal(t, 2, result.TotalRemoved())
+	assert.Equal(t, 1, result.TotalFailed())
+}
+
+func TestExecute_DryRun_PassedThrough(t *testing.T) {
+	result := &CleanResult{
+		ExtraNpm: []string{"typescript", "eslint"},
+	}
+
+	sawDryRun := false
+	op := uninstallOp{
+		label: "Removing extra npm packages",
+		pkgs:  result.ExtraNpm,
+		uninstallOne: func(_ string, dryRun bool) error {
+			sawDryRun = dryRun
+			return nil
+		},
+		removed: &result.RemovedNpm,
+		failed:  &result.FailedNpm,
+	}
+
+	require.NoError(t, runOp(op, true))
+	assert.True(t, sawDryRun)
+	assert.Equal(t, []string{"typescript", "eslint"}, result.RemovedNpm)
+}