fixes

Author: mohammeds1992

cmd/push-validator/cmd_snapshot.go

@@ -51,8 +51,12 @@ Examples:
 			noCache, _ := cmd.Flags().GetBool("no-cache")
 
 			if flagOutput != "json" {
-				fmt.Printf("     Source: %s\n", snapshotURL)
-				fmt.Printf("     Cache: %s/%s\n", cfg.HomeDir, snapshot.CacheDir)
+				dim, reset := "\033[2m", "\033[0m"
+				if os.Getenv("NO_COLOR") != "" {
+					dim, reset = "", ""
+				}
+				fmt.Printf("  %s%-12s %s%s\n", dim, "Source:", ui.ShortenPath(snapshotURL), reset)
+				fmt.Printf("  %s%-12s %s%s\n", dim, "Cache:", ui.ShortenPath(cfg.HomeDir+"/"+snapshot.CacheDir), reset)
 			}
 
 			// Create progress bar callback
@@ -69,7 +73,7 @@ Examples:
 				case snapshot.PhaseDownload:
 					if bar == nil && total > 0 {
 						bar = ui.NewProgressBar(os.Stdout, total)
-						bar.SetIndent("     ") // 5-space indent to align with Source/Cache
+						bar.SetIndent("  ") // 2-space indent to align with Source/Cache
 					}
 					if bar != nil {
 						bar.Update(current)
@@ -138,8 +142,12 @@ Examples:
 			}
 
 			if flagOutput != "json" {
-				fmt.Printf("     Cache: %s/%s\n", cfg.HomeDir, snapshot.CacheDir)
-				fmt.Printf("     Destination: %s\n", targetDir)
+				dim, reset := "\033[2m", "\033[0m"
+				if os.Getenv("NO_COLOR") != "" {
+					dim, reset = "", ""
+				}
+				fmt.Printf("  %s%-12s %s%s\n", dim, "Cache:", ui.ShortenPath(cfg.HomeDir+"/"+snapshot.CacheDir), reset)
+				fmt.Printf("  %s%-12s %s%s\n", dim, "Destination:", ui.ShortenPath(targetDir), reset)
 			}
 
 			// Create progress callback
@@ -148,7 +156,7 @@ Examples:
 					return
 				}
 				if phase == snapshot.PhaseExtract && message != "" {
-					fmt.Printf("\r     → Extracting: %-60s", truncate(message, 60))
+					fmt.Printf("\r  → Extracting: %-60s", truncate(message, 60))
 				}
 			}
 

cmd/push-validator/main.go

@@ -1,3 +1,12 @@
 package main
 
-func main() { Execute() }
+import "github.com/pushchain/push-validator-cli/internal/ui"
+
+func main() {
+	// Initialize terminal FIRST, before any charmbracelet imports are used.
+	// This prevents OSC 11 background color queries and focus events from
+	// polluting the output stream.
+	ui.InitTerminal()
+
+	Execute()
+}

cmd/push-validator/root_cobra.go

@@ -308,7 +308,9 @@ func init() {
 				})
 				return err
 			}
-			if flagOutput != "json" {
+			// Only show success message when NOT in scripted mode (--skip-snapshot)
+			// install.sh calls with --skip-snapshot and handles its own "Node initialized" message
+			if flagOutput != "json" && !initSkipSnapshot {
 				p.Success("Initialization complete")
 			}
 			return nil

install.sh

@@ -25,6 +25,11 @@ if [[ -n "$NO_COLOR" ]] || [[ ! -t 1 ]]; then
     CYAN=''; GREEN=''; YELLOW=''; RED=''; BOLD=''; DIM=''; NC=''
 fi
 
+# Prevent terminal background color queries from polluting output
+# This tells charmbracelet/termenv libraries the background color,
+# avoiding OSC 11 queries that cause ^[]11;rgb:... responses in iTerm2
+export COLORFGBG="${COLORFGBG:-0;15}"
+
 status() { echo -e "${CYAN}$*${NC}"; }
 ok()     {
     if [[ $PHASE_START_TIME -gt 0 ]]; then
@@ -41,12 +46,17 @@ ok()     {
         echo -e "  ${GREEN}✓ $*${NC}"
     fi
 }
+ok_sub() { echo -e "    ${GREEN}✓ $*${NC}"; }  # 4-space indent for nested sub-items
 warn()   { echo -e "  ${YELLOW}⚠ $*${NC}"; }
 err()    { echo -e "  ${RED}✗ $*${NC}"; }
 phase()  { echo -e "\n${BOLD}${CYAN}▸ $*${NC}"; }
 step()   { echo -e "  ${DIM}→${NC} $*"; }
+step_sub() { echo -e "    ${DIM}→${NC} $*"; }  # 4-space indent for nested sub-steps
 verbose() { [[ "$VERBOSE" = "yes" ]] && echo -e "  ${DIM}$*${NC}" || true; }
 
+# Helper: Shorten path for display (replace $HOME with ~)
+short_path() { echo "${1/#$HOME/\~}"; }
+
 # Helper: Indent output lines (adds 2-space prefix)
 indent_output() {
     while IFS= read -r line; do

internal/sync/monitor.go

@@ -150,10 +150,10 @@ func Run(ctx context.Context, opts Options) error {
 					if tty {
 						extra := ""
 						if lastPeers > 0 {
-							extra += fmt.Sprintf(" | peers: %d", lastPeers)
+							extra += fmt.Sprintf("  peers: %d", lastPeers)
 						}
 						if lastLatency > 0 {
-							extra += fmt.Sprintf(" | rtt: %dms", lastLatency)
+							extra += fmt.Sprintf("  rtt: %dms", lastLatency)
 						}
 						fmt.Fprintf(opts.Out, "\r\033[K  %s%s", lineWithETA, extra)
 					} else {
@@ -236,10 +236,10 @@ func Run(ctx context.Context, opts Options) error {
 			if tty {
 				extra := ""
 				if lastPeers > 0 {
-					extra += fmt.Sprintf(" | peers: %d", lastPeers)
+					extra += fmt.Sprintf("  peers: %d", lastPeers)
 				}
 				if lastLatency > 0 {
-					extra += fmt.Sprintf(" | rtt: %dms", lastLatency)
+					extra += fmt.Sprintf("  rtt: %dms", lastLatency)
 				}
 				fmt.Fprintf(opts.Out, "\r\033[K  %s%s", lineWithETA, extra)
 			} else {
@@ -307,10 +307,10 @@ func Run(ctx context.Context, opts Options) error {
 					if tty {
 						extra := ""
 						if lastPeers > 0 {
-							extra += fmt.Sprintf(" | peers: %d", lastPeers)
+							extra += fmt.Sprintf("  peers: %d", lastPeers)
 						}
 						if lastLatency > 0 {
-							extra += fmt.Sprintf(" | rtt: %dms", lastLatency)
+							extra += fmt.Sprintf("  rtt: %dms", lastLatency)
 						}
 						fmt.Fprintf(opts.Out, "\r\033[K  %s%s", lineWithETA, extra)
 					} else {
@@ -368,10 +368,10 @@ func Run(ctx context.Context, opts Options) error {
 						if tty {
 							extra := ""
 							if lastPeers > 0 {
-								extra += fmt.Sprintf(" | peers: %d", lastPeers)
+								extra += fmt.Sprintf("  peers: %d", lastPeers)
 							}
 							if lastLatency > 0 {
-								extra += fmt.Sprintf(" | rtt: %dms", lastLatency)
+								extra += fmt.Sprintf("  rtt: %dms", lastLatency)
 							}
 							fmt.Fprintf(opts.Out, "\r\033[K  %s%s", lineWithETA, extra)
 						} else {
@@ -413,10 +413,10 @@ func Run(ctx context.Context, opts Options) error {
 					if tty {
 						extra := ""
 						if lastPeers > 0 {
-							extra += fmt.Sprintf(" | peers: %d", lastPeers)
+							extra += fmt.Sprintf("  peers: %d", lastPeers)
 						}
 						if lastLatency > 0 {
-							extra += fmt.Sprintf(" | rtt: %dms", lastLatency)
+							extra += fmt.Sprintf("  rtt: %dms", lastLatency)
 						}
 						fmt.Fprintf(opts.Out, "\r\033[K  %s%s", lineWithETA, extra)
 					} else {
@@ -455,10 +455,10 @@ func Run(ctx context.Context, opts Options) error {
 					if tty {
 						extra := ""
 						if lastPeers > 0 {
-							extra += fmt.Sprintf(" | peers: %d", lastPeers)
+							extra += fmt.Sprintf("  peers: %d", lastPeers)
 						}
 						if lastLatency > 0 {
-							extra += fmt.Sprintf(" | rtt: %dms", lastLatency)
+							extra += fmt.Sprintf("  rtt: %dms", lastLatency)
 						}
 						fmt.Fprintf(opts.Out, "\r\033[K  %s%s\n", lineWithETA, extra)
 					} else {
@@ -685,9 +685,9 @@ func progressRateAndETA(buf []pt, cur, remote int64) (float64, string) {
 		if rem < 0 {
 			rem = 0
 		}
-		eta = fmt.Sprintf(" | ETA: %s", (time.Duration(rem * float64(time.Second))).Round(time.Second))
+		eta = fmt.Sprintf("  ETA %s", (time.Duration(rem * float64(time.Second))).Round(time.Second))
 	} else if remote > 0 {
-		eta = " | ETA: 0s"
+		eta = "  ETA 0s"
 	}
 	return rate, eta
 }
@@ -705,7 +705,7 @@ func renderProgress(percent float64, cur, remote int64) string {
 		filled = width
 	}
 	bar := strings.Repeat("█", filled) + strings.Repeat("░", width-filled)
-	return fmt.Sprintf("→ Syncing [%s] %.2f%% | %d/%d blocks", bar, percent, cur, remote)
+	return fmt.Sprintf("→ Syncing [%s] %.2f%%  %d/%d blocks", bar, percent, cur, remote)
 }
 
 func renderProgressWithQuiet(percent float64, cur, remote int64, quiet bool) string {
@@ -725,7 +725,7 @@ func renderProgressWithQuiet(percent float64, cur, remote int64, quiet bool) str
 			filled = width
 		}
 		bar := strings.Repeat("#", filled) + strings.Repeat("-", width-filled)
-		return fmt.Sprintf("[%s] %.2f%% | %d/%d", bar, percent, cur, remote)
+		return fmt.Sprintf("[%s] %.2f%%  %d/%d", bar, percent, cur, remote)
 	}
 	return renderProgress(percent, cur, remote)
 }
@@ -740,11 +740,15 @@ func isTTY() bool {
 
 func hideCursor(w io.Writer, tty bool) {
 	if tty {
+		// Disable focus reporting (prevents ^[[I/^[[O sequences)
+		fmt.Fprint(w, "\x1b[?1004l")
+		// Hide cursor
 		fmt.Fprint(w, "\x1b[?25l")
 	}
 }
 func showCursor(w io.Writer, tty bool) {
 	if tty {
+		// Show cursor (don't re-enable focus reporting as it wasn't necessarily on before)
 		fmt.Fprint(w, "\x1b[?25h")
 	}
 }

internal/ui/format.go

@@ -2,6 +2,7 @@ package ui
 
 import (
 	"fmt"
+	"os"
 	"strings"
 )
 
@@ -71,3 +72,16 @@ func FormatSpeed(bytesPerSec float64) string {
 		return fmt.Sprintf("%.0fB/s", bytesPerSec)
 	}
 }
+
+// ShortenPath replaces the home directory with ~ for cleaner display.
+// Example: /Users/john/.pchain/data -> ~/.pchain/data
+func ShortenPath(path string) string {
+	home, err := os.UserHomeDir()
+	if err != nil || home == "" {
+		return path
+	}
+	if strings.HasPrefix(path, home) {
+		return "~" + path[len(home):]
+	}
+	return path
+}

internal/ui/progress.go

@@ -9,6 +9,14 @@ import (
 	"golang.org/x/term"
 )
 
+// flushStdin discards any pending input from stdin to prevent
+// terminal response sequences (like cursor position reports, focus events)
+// from corrupting the output. Uses timeout-based flushing to catch
+// asynchronous terminal responses.
+func flushStdin() {
+	FlushStdinWithTimeout(30 * time.Millisecond)
+}
+
 // Spinner is a tiny terminal spinner helper.
 type Spinner struct {
     frames []rune
@@ -74,6 +82,17 @@ func NewProgressBar(out io.Writer, total int64) *ProgressBar {
 		isTTY = term.IsTerminal(int(f.Fd()))
 	}
 
+	// Disable terminal focus reporting to prevent ^[[I/^[[O sequences
+	// and flush any pending terminal responses that could corrupt output
+	if isTTY {
+		// Disable focus reporting (CSI ? 1004 l)
+		fmt.Fprint(out, "\033[?1004l")
+		// Small delay to allow any pending terminal responses to arrive
+		time.Sleep(10 * time.Millisecond)
+		// Flush any pending terminal responses from stdin
+		flushStdin()
+	}
+
 	return &ProgressBar{
 		out:        out,
 		total:      total,
@@ -181,7 +200,7 @@ func (p *ProgressBar) renderTTY(pct float64) {
 
 	// Format output with ANSI escape to clear rest of line (fixes /s/s bug)
 	// \033[K clears from cursor to end of line
-	fmt.Fprintf(p.out, "\r%s[%s] %5.1f%%  %s/%s  %s  ETA %s\033[K",
+	fmt.Fprintf(p.out, "\r%s[%s] %5.1f%%   %s/%s   %s   ETA %s\033[K",
 		p.indent,
 		bar,
 		pct,
@@ -218,6 +237,8 @@ func (p *ProgressBar) Finish() {
 			p.renderTTY(100)
 		}
 		fmt.Fprintln(p.out)
+		// Flush any pending terminal responses that accumulated during progress updates
+		flushStdin()
 	} else if p.total > 0 && p.lastPct < 100 {
 		// Ensure we print 100% for non-TTY
 		fmt.Fprintf(p.out, "%sDownloading... 100%%\n", p.indent)

internal/ui/terminal_init.go

@@ -0,0 +1,71 @@
+package ui
+
+import (
+	"fmt"
+	"os"
+	"syscall"
+	"time"
+
+	"golang.org/x/term"
+)
+
+var terminalInitialized bool
+
+// InitTerminal configures the terminal to prevent escape sequence pollution.
+// This MUST be called before any charmbracelet library (lipgloss, bubbletea) usage
+// to prevent OSC 11 background color queries from polluting the output.
+//
+// The issue: muesli/termenv (used by lipgloss) queries terminal background color
+// via OSC 11, and the terminal response (\033]11;rgb:...\033\\) gets mixed into stdout.
+// Setting COLORFGBG tells termenv the background color, skipping the query.
+func InitTerminal() {
+	if terminalInitialized {
+		return
+	}
+	terminalInitialized = true
+
+	// 1. Prevent OSC 11 background color query by pre-setting COLORFGBG
+	// Format: "foreground;background" where values indicate color indices
+	// Setting "0;15" indicates dark foreground on light background area
+	// This prevents termenv from sending OSC 11 query to detect background
+	if os.Getenv("COLORFGBG") == "" {
+		os.Setenv("COLORFGBG", "0;15")
+	}
+
+	// 2. For TTY output, disable focus reporting and flush stale responses
+	// iTerm2 and other terminals can send focus in/out events (^[[I/^[[O])
+	// which pollute the output stream
+	if term.IsTerminal(int(os.Stdout.Fd())) {
+		// Disable focus reporting (CSI ? 1004 l)
+		fmt.Fprint(os.Stdout, "\033[?1004l")
+		// Small delay to allow any pending responses to arrive
+		time.Sleep(20 * time.Millisecond)
+		// Flush any pending terminal responses from stdin
+		FlushStdinWithTimeout(50 * time.Millisecond)
+	}
+}
+
+// FlushStdinWithTimeout reads and discards stdin for the specified duration.
+// This catches asynchronous terminal responses (cursor position reports,
+// OSC responses, focus events) that arrive after queries are sent.
+func FlushStdinWithTimeout(timeout time.Duration) {
+	fd := int(os.Stdin.Fd())
+
+	// Set non-blocking mode to read without waiting
+	if err := syscall.SetNonblock(fd, true); err != nil {
+		return
+	}
+	defer syscall.SetNonblock(fd, false)
+
+	buf := make([]byte, 256)
+	deadline := time.Now().Add(timeout)
+
+	for time.Now().Before(deadline) {
+		n, _ := os.Stdin.Read(buf)
+		if n <= 0 {
+			// No data available, wait briefly before checking again
+			time.Sleep(5 * time.Millisecond)
+		}
+		// If we read data, continue the loop to catch more
+	}
+}