feat: refactor waza new to use shared FileWriter #58 (#66)

* feat: refactor waza new to use shared FileWriter #58

Replace the inline write loop in cmd_new.go with the shared FileWriter
from internal/scaffold/writer.go. Malformed SKILL.md detection still runs
before FileWriter — the file is removed so FileWriter creates it fresh.

Inventory now uses consistent ➕/✅ emoji indicators (always visible,
not gated behind --verbose), matching the waza init behavior.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chore: update squad state for #58

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: wbreza

.squad/agents/linus/history.md

@@ -99,3 +99,10 @@ All code roles now use `claude-opus-4.6`. Docs/Scribe/diversity use `gemini-3-pr
 - **Files changed:** `internal/scaffold/writer.go` (new), `internal/scaffold/writer_test.go` (new), `cmd/waza/cmd_init.go` (modified)
 - **What:** Created `FileWriter` service in `internal/scaffold/` that encapsulates the create-if-missing + skip-if-exists pattern used by `waza init`. Returns structured `Inventory` with per-entry outcomes. Refactored `cmd_init.go` Phase 5 to use `FileWriter` instead of its inline write loop. Inventory is always visible with ➕/✅ indicators. 8 unit tests covering all paths.
 - **Key learning:** The `internal/scaffold/` package already existed with template functions for eval/skill generation — `FileWriter` fits naturally alongside those. The `FileEntry` type mirrors the old `initItem` struct but is exported for reuse by `cmd_new.go` in a future PR. Empty-content file entries (e.g., when `needConfigPrompt` is false) are treated as skipped — the writer doesn't create zero-byte files.
+
+### #58 — Refactor waza new to use shared FileWriter (PR pending)
+- **Date:** 2026-02-26
+- **Branch:** `squad/58-new-use-filewriter`
+- **Files changed:** `cmd/waza/cmd_new.go`, `cmd/waza/cmd_new_test.go`
+- **What:** Replaced the inline `writeFiles()` loop and `fileEntry` type in `cmd_new.go` with the shared `FileWriter` from `internal/scaffold/writer.go`. The malformed SKILL.md detection (`detectExistingSkillMD`) still runs before FileWriter — when overwrite is needed, the malformed file is deleted so FileWriter creates it fresh with ➕. Removed `lipgloss` dependency from the file. Updated 5 test assertions to match ➕/✅ emoji indicators instead of lipgloss-styled ✓/+.
+- **Key learning:** The `overwrite` flag pattern from the old `fileEntry` struct doesn't map directly to FileWriter's create-if-missing model. The clean solution is to `os.Remove` the malformed file before passing it to FileWriter, so the writer sees it as absent and creates it normally. This avoids adding overwrite complexity to the shared FileWriter API while keeping the malformed-detection logic intact.

.squad/decisions/inbox/linus-filewriter-overwrite-pattern.md

@@ -0,0 +1,17 @@
+# Decision: FileWriter overwrite pattern uses delete-then-create
+
+**By:** Linus (Backend Developer)
+**Date:** 2026-02-26
+**Issue:** #58
+
+## What
+
+When a file needs to be overwritten (e.g., malformed SKILL.md repair), the caller should `os.Remove` the file before passing it to `FileWriter`. The FileWriter then sees it as absent and creates it normally with ➕ indicator. This avoids adding overwrite/force-write complexity to the shared `FileWriter` API.
+
+## Why
+
+The FileWriter's single responsibility is create-if-missing + skip-if-exists. Adding an overwrite flag would complicate the API and make it harder to reason about. The delete-then-create pattern keeps the FileWriter simple while letting callers handle their own pre-write logic.
+
+## Impact
+
+Any future command that needs to overwrite an existing file via FileWriter should follow this pattern: detect the condition, remove the stale file, then call `fw.Write()`.

cmd/waza/cmd_new.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 
-	"github.com/charmbracelet/lipgloss"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 
@@ -250,25 +250,30 @@ func scaffoldInProject(cmd *cobra.Command, projectRoot, skillName, skillMD strin
 		}
 	}
 
-	files := []fileEntry{
-		{filepath.Join(skillDir, "SKILL.md"), skillMD, "Skill definition", overwriteSkill},
-		{filepath.Join(evalDir, "eval.yaml"), scaffold.EvalYAML(skillName, engine, model), "Eval configuration", false},
+	// If malformed SKILL.md needs replacement, remove it so FileWriter creates fresh
+	if overwriteSkill {
+		_ = os.Remove(filepath.Join(skillDir, "SKILL.md"))
+	}
+
+	entries := []scaffold.FileEntry{
+		{Path: filepath.Join(skillDir, "SKILL.md"), Label: "Skill definition", Content: skillMD},
+		{Path: filepath.Join(evalDir, "eval.yaml"), Label: "Eval configuration", Content: scaffold.EvalYAML(skillName, engine, model)},
 	}
 
 	// Only add default tasks if the tasks directory is empty
 	if !dirHasFiles(tasksDir) {
 		tasks := scaffold.TaskFiles(skillName)
 		for name, content := range tasks {
-			files = append(files, fileEntry{filepath.Join(tasksDir, name), content, taskLabel(name), false})
+			entries = append(entries, scaffold.FileEntry{Path: filepath.Join(tasksDir, name), Label: taskLabel(name), Content: content})
 		}
 	}
 
 	// Only add default fixture if the fixtures directory is empty
 	if !dirHasFiles(fixturesDir) {
-		files = append(files, fileEntry{filepath.Join(fixturesDir, "sample.py"), scaffold.Fixture(), "Fixture", false})
+		entries = append(entries, scaffold.FileEntry{Path: filepath.Join(fixturesDir, "sample.py"), Label: "Fixture", Content: scaffold.Fixture()})
 	}
 
-	return writeFiles(cmd, files, skillName, existing, tasksDir, fixturesDir)
+	return writeScaffold(cmd, entries, skillName, existing, tasksDir, fixturesDir)
 }
 
 // scaffoldStandalone creates a self-contained skill directory.
@@ -287,136 +292,98 @@ func scaffoldStandalone(cmd *cobra.Command, skillName, skillMD string, existing,
 		}
 	}
 
-	files := []fileEntry{
-		{filepath.Join(rootDir, "SKILL.md"), skillMD, "Skill definition", overwriteSkill},
-		{filepath.Join(evalsDir, "eval.yaml"), scaffold.EvalYAML(skillName, engine, model), "Eval configuration", false},
+	// If malformed SKILL.md needs replacement, remove it so FileWriter creates fresh
+	if overwriteSkill {
+		_ = os.Remove(filepath.Join(rootDir, "SKILL.md"))
+	}
+
+	entries := []scaffold.FileEntry{
+		{Path: filepath.Join(rootDir, "SKILL.md"), Label: "Skill definition", Content: skillMD},
+		{Path: filepath.Join(evalsDir, "eval.yaml"), Label: "Eval configuration", Content: scaffold.EvalYAML(skillName, engine, model)},
 	}
 
 	// Only add default tasks if the tasks directory is empty
 	if !dirHasFiles(tasksDir) {
 		tasks := scaffold.TaskFiles(skillName)
 		for name, content := range tasks {
-			files = append(files, fileEntry{filepath.Join(tasksDir, name), content, taskLabel(name), false})
+			entries = append(entries, scaffold.FileEntry{Path: filepath.Join(tasksDir, name), Label: taskLabel(name), Content: content})
 		}
 	}
 
 	// Only add default fixture if the fixtures directory is empty
 	if !dirHasFiles(fixturesDir) {
-		files = append(files, fileEntry{filepath.Join(fixturesDir, "sample.py"), scaffold.Fixture(), "Fixture", false})
+		entries = append(entries, scaffold.FileEntry{Path: filepath.Join(fixturesDir, "sample.py"), Label: "Fixture", Content: scaffold.Fixture()})
 	}
 
-	files = append(files,
-		fileEntry{filepath.Join(workflowDir, "eval.yml"), defaultCIWorkflow(skillName), "CI pipeline", false},
-		fileEntry{filepath.Join(rootDir, ".gitignore"), defaultGitignore(), "Build artifacts excluded", false},
-		fileEntry{filepath.Join(rootDir, "README.md"), defaultReadme(skillName), "Getting started guide", false},
+	entries = append(entries,
+		scaffold.FileEntry{Path: filepath.Join(workflowDir, "eval.yml"), Label: "CI pipeline", Content: defaultCIWorkflow(skillName)},
+		scaffold.FileEntry{Path: filepath.Join(rootDir, ".gitignore"), Label: "Build artifacts excluded", Content: defaultGitignore()},
+		scaffold.FileEntry{Path: filepath.Join(rootDir, "README.md"), Label: "Getting started guide", Content: defaultReadme(skillName)},
 	)
 
-	return writeFiles(cmd, files, skillName, existing, tasksDir, fixturesDir)
+	return writeScaffold(cmd, entries, skillName, existing, tasksDir, fixturesDir)
 }
 
-// fileEntry pairs a path with its content and display label for batch writing.
-type fileEntry struct {
-	path      string
-	content   string
-	label     string
-	overwrite bool // when true, overwrite existing file (e.g., malformed SKILL.md)
-}
+// writeScaffold uses the shared FileWriter to create missing files, then prints
+// the inventory with header and summary footer.
+func writeScaffold(cmd *cobra.Command, entries []scaffold.FileEntry, skillName string, existing bool, tasksDir, fixturesDir string) error {
+	out := cmd.OutOrStdout()
+	baseDir, _ := os.Getwd() //nolint:errcheck // best-effort for display paths
 
-// writeFiles writes each file, skipping any that already exist.
-// Prints grouped inventory output with header, section heading, and labels.
-// tasksDir and fixturesDir are used to show summary lines for user-owned content.
-func writeFiles(cmd *cobra.Command, files []fileEntry, skillName string, existing bool, tasksDir, fixturesDir string) error {
-	greenCheck := lipgloss.NewStyle().Foreground(lipgloss.Color("2")).Render("✓")
-	yellowPlus := lipgloss.NewStyle().Foreground(lipgloss.Color("3")).Render("+")
+	fw := scaffold.NewFileWriter(baseDir)
+	inv, err := fw.Write(entries)
+	if err != nil {
+		return err
+	}
 
 	if existing {
-		fmt.Fprintf(cmd.OutOrStdout(), "🔧 Checking skill: %s\n", skillName) //nolint:errcheck
+		fmt.Fprintf(out, "🔧 Checking skill: %s\n", skillName) //nolint:errcheck
 	} else {
-		fmt.Fprintf(cmd.OutOrStdout(), "🔧 Scaffolding skill: %s\n", skillName) //nolint:errcheck
+		fmt.Fprintf(out, "🔧 Scaffolding skill: %s\n", skillName) //nolint:errcheck
 	}
-	fmt.Fprintf(cmd.OutOrStdout(), "\nSkill structure:\n\n") //nolint:errcheck
+	fmt.Fprintf(out, "\nSkill structure:\n\n") //nolint:errcheck
 
-	baseDir, _ := os.Getwd() //nolint:errcheck // best-effort for display paths
-	created := 0
-	for _, f := range files {
-		relPath := f.path
-		if baseDir != "" {
-			if abs, absErr := filepath.Abs(f.path); absErr == nil {
-				if rel, relErr := filepath.Rel(baseDir, abs); relErr == nil {
-					relPath = rel
-				}
-			}
-		}
+	inv.Fprint(out)
 
-		if _, err := os.Stat(f.path); err == nil {
-			if f.overwrite {
-				// Overwrite existing file (e.g., malformed SKILL.md being repaired)
-				if err := os.WriteFile(f.path, []byte(f.content), 0o644); err != nil {
-					return fmt.Errorf("failed to write %s: %w", f.path, err)
-				}
-				fmt.Fprintf(cmd.OutOrStdout(), "  %s %-40s %s (updated)\n", yellowPlus, relPath, f.label) //nolint:errcheck
-				created++
-				continue
-			}
-			fmt.Fprintf(cmd.OutOrStdout(), "  %s %-40s %s\n", greenCheck, relPath, f.label) //nolint:errcheck
-			continue
-		}
+	// Show summary lines for user-owned tasks/fixtures directories
+	printDirSummary(out, inv, tasksDir, baseDir, "Tasks")
+	printDirSummary(out, inv, fixturesDir, baseDir, "Fixtures")
 
-		if err := os.WriteFile(f.path, []byte(f.content), 0o644); err != nil {
-			return fmt.Errorf("failed to write %s: %w", f.path, err)
-		}
-		fmt.Fprintf(cmd.OutOrStdout(), "  %s %-40s %s\n", yellowPlus, relPath, f.label) //nolint:errcheck
-		created++
+	created := inv.CreatedCount()
+
+	fmt.Fprintln(out) //nolint:errcheck
+	if created == 0 {
+		fmt.Fprintf(out, "✅ Project up to date.\n") //nolint:errcheck
+	} else if created == len(entries) {
+		fmt.Fprintf(out, "✅ Skill created — %d file(s) scaffolded.\n", created) //nolint:errcheck
+	} else {
+		fmt.Fprintf(out, "✅ Repaired — %d item(s) added.\n", created) //nolint:errcheck
 	}
 
-	// Show summary lines for user-owned tasks/fixtures directories
-	if taskCount := dirFileCount(tasksDir); taskCount > 0 {
-		hasDefaultTasks := false
-		for _, f := range files {
-			if filepath.Dir(f.path) == tasksDir {
-				hasDefaultTasks = true
-				break
-			}
-		}
-		if !hasDefaultTasks {
-			relDir := tasksDir
-			if abs, err := filepath.Abs(tasksDir); err == nil {
-				if rel, err := filepath.Rel(baseDir, abs); err == nil {
-					relDir = rel
-				}
-			}
-			fmt.Fprintf(cmd.OutOrStdout(), "  %s %-40s %s\n", greenCheck, relDir+string(filepath.Separator), fmt.Sprintf("Tasks (%d files)", taskCount)) //nolint:errcheck
-		}
+	return nil
+}
+
+// printDirSummary prints a summary line for a directory that has existing files
+// but wasn't part of the scaffolded entries.
+func printDirSummary(out io.Writer, inv *scaffold.Inventory, dir, baseDir, label string) {
+	count := dirFileCount(dir)
+	if count == 0 {
+		return
 	}
-	if fixtureCount := dirFileCount(fixturesDir); fixtureCount > 0 {
-		hasDefaultFixtures := false
-		for _, f := range files {
-			if filepath.Dir(f.path) == fixturesDir {
-				hasDefaultFixtures = true
-				break
-			}
-		}
-		if !hasDefaultFixtures {
-			relDir := fixturesDir
-			if abs, err := filepath.Abs(fixturesDir); err == nil {
-				if rel, err := filepath.Rel(baseDir, abs); err == nil {
-					relDir = rel
-				}
-			}
-			fmt.Fprintf(cmd.OutOrStdout(), "  %s %-40s %s\n", greenCheck, relDir+string(filepath.Separator), fmt.Sprintf("Fixtures (%d files)", fixtureCount)) //nolint:errcheck
+
+	for _, item := range inv.Items {
+		if filepath.Dir(item.Entry.Path) == dir {
+			return
 		}
 	}
 
-	fmt.Fprintln(cmd.OutOrStdout()) //nolint:errcheck
-	if created == 0 {
-		fmt.Fprintf(cmd.OutOrStdout(), "%s Project up to date.\n", greenCheck) //nolint:errcheck
-	} else if created == len(files) {
-		fmt.Fprintf(cmd.OutOrStdout(), "✅ Skill created — %d file(s) scaffolded.\n", created) //nolint:errcheck
-	} else {
-		fmt.Fprintf(cmd.OutOrStdout(), "✅ Repaired — %d item(s) added.\n", created) //nolint:errcheck
+	relDir := dir
+	if abs, err := filepath.Abs(dir); err == nil {
+		if rel, err := filepath.Rel(baseDir, abs); err == nil {
+			relDir = rel
+		}
 	}
-
-	return nil
+	fmt.Fprintf(out, "  ✅  %s  %s (%d files)\n", relDir+string(filepath.Separator), label, count) //nolint:errcheck
 }
 
 // taskLabel returns a descriptive label for a task file.

cmd/waza/cmd_new_test.go

@@ -127,8 +127,8 @@ func TestNewCommand_NoOverwriteSafety(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, customContent, string(data), "valid SKILL.md should not be overwritten")
 
-	// Output should mention ✓ for skipped file
-	assert.Contains(t, buf.String(), "✓")
+	// Output should mention ✅ for skipped file
+	assert.Contains(t, buf.String(), "✅")
 	assert.FileExists(t, filepath.Join(dir, "evals", "my-skill", "eval.yaml"))
 }
 
@@ -160,8 +160,8 @@ func TestNewCommand_IdempotentWithExistingSkillMD(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, validSkillMD, string(data), "existing SKILL.md should not be overwritten")
 
-	// Output should mention ✓ for skipped file
-	assert.Contains(t, buf.String(), "✓")
+	// Output should mention ✅ for skipped file
+	assert.Contains(t, buf.String(), "✅")
 
 	// Eval files should be created
 	assert.FileExists(t, filepath.Join(dir, "evals", "my-skill", "eval.yaml"))
@@ -192,7 +192,7 @@ func TestNewCommand_IdempotentRunTwice(t *testing.T) {
 	require.NoError(t, cmd2.Execute())
 
 	output := buf.String()
-	assert.Contains(t, output, "✓")
+	assert.Contains(t, output, "✅")
 	assert.Contains(t, output, "Project up to date")
 }
 
@@ -227,7 +227,7 @@ func TestNewCommand_EmptySkillMD_NonTTY_OverwritesWithDefaults(t *testing.T) {
 	// Warning should appear in output
 	output := buf.String()
 	assert.Contains(t, output, "empty or malformed")
-	assert.Contains(t, output, "updated")
+	assert.Contains(t, output, "➕")
 
 	// Other eval files should still be created
 	assert.FileExists(t, filepath.Join(dir, "evals", "my-skill", "eval.yaml"))
@@ -357,9 +357,9 @@ func TestNewCommand_EmptySkillMD_EvalFilesPreExist(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, "existing eval", string(evalData), "eval.yaml should not be overwritten")
 
-	// Output should show updated for SKILL.md, ✓ for eval.yaml
+	// Output should show ➕ for repaired SKILL.md, ✅ for existing eval.yaml
 	output := buf.String()
-	assert.Contains(t, output, "updated")
+	assert.Contains(t, output, "➕")
 }
 
 // ── Name Validation Tests ──────────────────────────────────────────────────────