feat(init): Plan 22 Phase 3 — Vessel + Soil stages (real input) (#49)

Replace the Phase-2 Vessel and Soil stubs in `internal/tui/initflow/` with
real input stages. Vessel collects NAME/DESCRIPTION/STATION via three
composed bubbles/textinput models on a single page; Soil is a hand-rolled
multi-select over scaffolding options with ◆/◇ glyphs, pinned REQUIRED
badges, and focus highlighting. Branches and Observe remain stubs until
Phases 4–5.

Also fixes the user-reported header bug: `RenderHeader` no longer renders
`station/` in its right block. The station subdir doesn't exist until the
Phase 5 generate runs — showing it earlier claimed the path existed when
it did not. `RenderHeader`'s signature drops the `stationSubdir` parameter
and the `Stage.stationDir` field stays on Stage/StageContext for Phase 5
Planted to consume.

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>

Author: LastStep

cmd/init_redesign.go

@@ -15,11 +15,11 @@ import (
 	"github.com/LastStep/Bonsai/internal/tui/initflow"
 )
 
-// runInitRedesign is the Phase-2 stub entry point for Plan 22's cinematic
+// runInitRedesign is the Phase-3 entry point for Plan 22's cinematic
 // `bonsai init` flow. It renders the persistent chrome (header + enso rail
-// + footer) around four placeholder stages that advance on Enter and pop
-// on Esc. No files are written — the generate + planted pipeline lands in
-// Phases 3–5.
+// + footer) around four stages — Vessel and Soil are real input stages;
+// Branches and Observe remain stubs until Phases 4–5. No files are written
+// yet; the generate + planted pipeline lands in Phase 5.
 //
 // Routing: runInit at cmd/init.go:121 branches here when BONSAI_REDESIGN=1.
 // Without the env flag, the legacy flow runs unchanged.
@@ -56,7 +56,9 @@ func runInitRedesign(cmd *cobra.Command, args []string) error {
 	}
 
 	// Shared context stamped on every stage. Station defaults to "station/"
-	// until Phase 3's VesselStage captures a user-entered value.
+	// until VesselStage captures a user-entered value; Phase 5's Planted
+	// stage will read the post-Vessel value out of prev[0] when rendering
+	// the generated file tree.
 	ctx := initflow.StageContext{
 		Version:      Version,
 		ProjectDir:   cwd,
@@ -65,9 +67,14 @@ func runInitRedesign(cmd *cobra.Command, args []string) error {
 		StartedAt:    startedAt,
 	}
 
+	// Phase 3 wires real Vessel + Soil stages; Branches + Observe remain
+	// stubs until Phases 4–5 land. Legacy generate / conflict tail is still
+	// skipped — runInitRedesign does NOT write files yet.
+	soilOptions := scaffoldingToSoilOptions(cat)
+
 	steps := []harness.Step{
-		initflow.NewStubStage(0, ctx.Version, ctx.ProjectDir, ctx.StationDir, ctx.AgentDisplay, ctx),
-		initflow.NewStubStage(1, ctx.Version, ctx.ProjectDir, ctx.StationDir, ctx.AgentDisplay, ctx),
+		initflow.NewVesselStage(ctx),
+		initflow.NewSoilStage(ctx, soilOptions),
 		initflow.NewStubStage(2, ctx.Version, ctx.ProjectDir, ctx.StationDir, ctx.AgentDisplay, ctx),
 		initflow.NewStubStage(3, ctx.Version, ctx.ProjectDir, ctx.StationDir, ctx.AgentDisplay, ctx),
 	}
@@ -80,7 +87,7 @@ func runInitRedesign(cmd *cobra.Command, args []string) error {
 	_, err := harness.Run(bannerLine, "Initializing new project (redesign)", steps)
 	if err != nil {
 		if errors.Is(err, harness.ErrAborted) {
-			// Ctrl-C — no config / files written in Phase 2 either way.
+			// Ctrl-C — no config / files written in Phase 3 either way.
 			return nil
 		}
 		var bpe *harness.BuilderPanicError
@@ -93,8 +100,30 @@ func runInitRedesign(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	// Phase 2 does not write files, save config, or run a conflict picker —
-	// those wire up in Phases 3–5. Returning cleanly after the flow exits
-	// AltScreen is the expected behaviour for this phase.
+	// Phase 3 does not write files, save config, or run a conflict picker —
+	// the generate + planted pipeline wires up in Phases 4–5. Returning
+	// cleanly after the flow exits AltScreen is the expected behaviour.
 	return nil
 }
+
+// scaffoldingToSoilOptions maps catalog scaffolding entries into the
+// initflow.ScaffoldingOption shape consumed by SoilStage. Parallels the
+// legacy `scaffoldingOptions` helper (which returns tui.ItemOption for the
+// MultiSelectStep) but keeps the redesign path decoupled from the tui
+// package's option type.
+func scaffoldingToSoilOptions(cat *catalog.Catalog) []initflow.ScaffoldingOption {
+	out := make([]initflow.ScaffoldingOption, 0, len(cat.Scaffolding))
+	for _, item := range cat.Scaffolding {
+		desc := item.Description
+		if !item.Required && item.Affects != "" {
+			desc += " · if removed: " + item.Affects
+		}
+		out = append(out, initflow.ScaffoldingOption{
+			Name:        item.Name,
+			DisplayName: item.DisplayName,
+			Description: desc,
+			Required:    item.Required,
+		})
+	}
+	return out
+}

internal/tui/initflow/chrome.go

@@ -21,21 +21,22 @@ type KeyHint struct {
 //
 //	Left:  [盆] BONSAI · INITIALIZE · v<version>
 //	Right: PLANTING INTO
-//	       ~/.../<project>/<station>
+//	       ~/.../<project>/
 //
 // version "dev" / "" hides the version segment. projectDir is the absolute
-// path to the project root; stationSubdir is the subdir under it (e.g.
-// "station/"). safe gates the single wide-char glyph so ASCII-only terminals
-// get a safe substitute.
-func RenderHeader(version, projectDir, stationSubdir string, width int, safe bool) string {
+// path to the project root — the only path segment rendered in the right
+// block; earlier iterations also rendered a "station/" suffix, but the
+// station subdir doesn't exist yet at any point before the Generate stage,
+// so showing it was misleading. safe gates the single wide-char glyph so
+// ASCII-only terminals get a safe substitute.
+func RenderHeader(version, projectDir string, width int, safe bool) string {
 	if width <= 0 {
 		width = 80
 	}
 
 	primary := lipgloss.NewStyle().Foreground(tui.ColorPrimary).Bold(true)
 	muted := lipgloss.NewStyle().Foreground(tui.ColorMuted)
 	bark := lipgloss.NewStyle().Foreground(tui.ColorSecondary)
-	leaf := lipgloss.NewStyle().Foreground(tui.ColorPrimary)
 
 	// ── Left block ───────────────────────────────────────────────────
 	mark := "盆"
@@ -57,21 +58,17 @@ func RenderHeader(version, projectDir, stationSubdir string, width int, safe boo
 	left := strings.Join(leftParts, " ")
 
 	// ── Right block ──────────────────────────────────────────────────
-	// "PLANTING INTO" headline above "~/path/<project>/<station>"
+	// "PLANTING INTO" headline above "~/path/<project>/".
 	projectDisplay := collapseHome(projectDir)
 	projectName := filepath.Base(projectDir)
 	parent := filepath.Dir(projectDisplay)
-	// Render parent muted, project name bark, station leaf.
-	station := stationSubdir
-	if station != "" && !strings.HasSuffix(station, "/") {
-		station += "/"
-	}
+	// Render parent muted, project name bark, trailing slash muted.
 	if parent == "." || parent == "" {
 		parent = ""
 	} else if !strings.HasSuffix(parent, "/") {
 		parent += "/"
 	}
-	pathRow := muted.Render(parent) + bark.Render(projectName) + muted.Render("/") + leaf.Render(station)
+	pathRow := muted.Render(parent) + bark.Render(projectName) + muted.Render("/")
 	rightRow1 := muted.Render("PLANTING INTO")
 
 	// ── Compose two-row layout with left-padded right block ─────────

internal/tui/initflow/chrome_test.go

@@ -0,0 +1,65 @@
+package initflow
+
+import (
+	"strings"
+	"testing"
+)
+
+// TestRenderHeader_CollapsesHome verifies that a project path rooted under
+// $HOME is rendered with the tilde-collapsed prefix (~/...) rather than the
+// full absolute path.
+func TestRenderHeader_CollapsesHome(t *testing.T) {
+	t.Setenv("HOME", "/home/alice")
+
+	out := RenderHeader("0.1.2", "/home/alice/voyager-api", 120, true)
+
+	if !strings.Contains(out, "~/voyager-api") {
+		t.Fatalf("expected tilde-collapsed project path in header, got:\n%s", out)
+	}
+	// The project name itself must appear.
+	if !strings.Contains(out, "voyager-api") {
+		t.Fatalf("expected project name to appear in header, got:\n%s", out)
+	}
+}
+
+// TestRenderHeader_AbsolutePathOutsideHome verifies that a project path that
+// is not under $HOME is rendered verbatim (no spurious ~ substitution).
+func TestRenderHeader_AbsolutePathOutsideHome(t *testing.T) {
+	t.Setenv("HOME", "/home/bob")
+
+	out := RenderHeader("0.1.2", "/tmp/p", 120, true)
+
+	if !strings.Contains(out, "/tmp/p") {
+		t.Fatalf("expected absolute project path in header, got:\n%s", out)
+	}
+	if strings.Contains(out, "~/") {
+		t.Fatalf("expected no tilde substitution for path outside HOME, got:\n%s", out)
+	}
+}
+
+// TestRenderHeader_NoStationSegment is the regression guard for the Phase-3
+// bug fix — the station subdir doesn't exist until Phase 5 generate runs, so
+// the header must not claim "station/" in its path row. Covers both safe and
+// ASCII-fallback rendering modes.
+func TestRenderHeader_NoStationSegment(t *testing.T) {
+	t.Setenv("HOME", "/home/alice")
+
+	for _, safe := range []bool{true, false} {
+		out := RenderHeader("0.1.2", "/home/alice/voyager-api", 120, safe)
+		if strings.Contains(out, "station") {
+			t.Fatalf("safe=%v: header must not contain \"station\" substring, got:\n%s", safe, out)
+		}
+	}
+}
+
+// TestRenderHeader_TrailingSlash verifies the project row renders a trailing
+// slash after the project name so the path reads as a directory.
+func TestRenderHeader_TrailingSlash(t *testing.T) {
+	t.Setenv("HOME", "/home/alice")
+
+	out := RenderHeader("0.1.2", "/home/alice/voyager-api", 120, true)
+
+	if !strings.Contains(out, "voyager-api/") {
+		t.Fatalf("expected trailing slash after project name, got:\n%s", out)
+	}
+}