Polish TUI flow and login behavior

Author: mtremsal

README.md

@@ -81,49 +81,29 @@ goreleaser check
 goreleaser release --snapshot --clean
 ```
 
-## Implementation Plan
-The current fish scripts (`sprite_up`/`sprite_destroy`) define the baseline behavior. The plan below maps that flow into a robust, cross-platform CLI built with Bubble Tea.
-
-### Phase 1: CLI foundations
-- Initialize a Go CLI with a single `seven` binary.
-- Implement commands:
-  - `seven up` (create or reuse a sprite, open console)
-  - `seven destroy` (delete sprite, remove local marker file)
-  - `seven status` (show sprite existence + health)
-- Add a config/marker file (`.sprite`) to pin the sprite name for the repo.
-
-### Phase 2: Sprite lifecycle logic
-- Name resolution:
-  - Default to `basename(pwd)` unless `.sprite` overrides it.
-  - Validate names and provide helpful errors.
-- Create/reuse logic:
-  - If sprite exists, reuse and open console.
-  - If not, create with `sprite create --skip-console`.
-- Destroy logic:
-  - Remove local `.sprite` file.
-  - Destroy sprite if it exists.
-
-### Phase 3: Repo bootstrap
-- Detect git repo and `origin` remote.
-- If GitHub remote:
-  - Use `gh auth token` if available for faster clone.
-  - `gh repo clone <owner/repo> <sprite-name>`.
-- Else fallback to `git clone <repo-url> <sprite-name>`.
-
-### Phase 4: TUI experience (Bubble Tea)
-- Add a guided flow for `seven up`:
-  - status spinner, name confirm/override, progress logs.
-- Provide success/failure summary with next actions.
-- Make it easy to cancel safely (Ctrl+C).
-
-### Phase 5: polish + docs
-- Structured logging and clear error messages.
-- Extend README with examples, troubleshooting, and FAQ.
-- Add tests for name resolution, `.sprite` handling, and command invocation.
-- Document installation:
-  - **Primary:** prebuilt binaries per OS/arch (GitHub Releases).
-  - **Convenience:** package managers (Homebrew/Scoop/Winget) as optional wrappers.
-  - **POC focus:** a simple curl-based installer that fetches the correct release asset.
+## Implementation Plan (short)
+- **Core CLI:** `seven init`, `seven up`, `seven destroy`, `seven status`.
+- **Bootstrap:** resolve sprite name, create/reuse sprite, clone repo when possible.
+- **TUI:** minimal Bubble Tea flow with progress and clean status output.
+- **Packaging:** GitHub Releases + curl installer (primary), package managers later.
+
+## Upcoming: IDE + Networking Experience
+### 1) IDE connection (VS Code and others)
+Goal: open the sprite workspace in your local IDE without losing native tooling.
+
+Planned approach:
+- **Session-first UX:** `seven up` opens a shell via `sprite console`, while `seven exec` (and the CLI’s `sprite exec`) can run commands in the sprite with full TTY support. citeturn1view0
+- **IDE adapters:** add a `seven ide` flow that can:
+  - detect an SSH-capable endpoint if Sprites exposes one,
+  - or fall back to syncing + remote commands (git-based or file sync) when SSH isn’t available.
+
+### 2) Feedback loop + port forwarding
+Goal: run the app inside the sprite and access it locally as if it were running on your machine.
+
+Planned approach:
+- **Forwarding:** use `sprite proxy` to forward local ports to the sprite. citeturn1view1
+- **Auto-discovery:** detect ports by heuristics (common dev ports, package scripts, Docker compose, `.env`, or a user-specified list).
+- **Command surface:** add `seven forward` (and/or `seven dev`) to start the app in the sprite and wire up ports in one step.
 
 ## References
 - Fly.io Sprite docs: https://docs.sprites.dev/

cmd/seven/main.go

@@ -38,6 +38,9 @@ func main() {
 	}
 
 	switch os.Args[1] {
+	case "--version", "-v", "version":
+		printVersion()
+		return
 	case "init":
 		cmdInit(os.Args[2:])
 	case "up":
@@ -57,6 +60,7 @@ func main() {
 
 func usage() {
 	fmt.Println("seven - vagrant-style workflow backed by fly.io sprites")
+	fmt.Printf("version: %s\n", version)
 	fmt.Println()
 	fmt.Println("Usage:")
 	fmt.Println("  seven init [--assume-logged-in]")
@@ -65,12 +69,19 @@ func usage() {
 	fmt.Println("  seven status")
 	fmt.Println()
 	fmt.Println("Commands:")
+	fmt.Println("  version  Show version")
 	fmt.Println("  init     One-time setup (login, create sprite, clone repo)")
 	fmt.Println("  up       Create or reuse a sprite, bootstrap repo, open console")
 	fmt.Println("  destroy  Destroy the current sprite and remove .sprite file")
 	fmt.Println("  status   Show sprite status for this repo")
 }
 
+var version = "dev"
+
+func printVersion() {
+	fmt.Println(version)
+}
+
 func cmdUp(args []string) {
 	fs := flag.NewFlagSet("up", flag.ExitOnError)
 	noTUI := fs.Bool("no-tui", false, "disable TUI output")
@@ -293,7 +304,11 @@ func runInit(opts upOptions) (upResult, error) {
 	}
 
 	opts.Logger("[seven init] creating sprite")
-	if err := runCmdDevNull(spriteBin(), nil, "create", "--skip-console", name); err != nil {
+	if opts.QuietExternal {
+		if err := runCmdQuiet(spriteBin(), nil, "create", "--skip-console", name); err != nil {
+			return upResult{}, err
+		}
+	} else if err := runCmdDevNull(spriteBin(), nil, "create", "--skip-console", name); err != nil {
 		return upResult{}, err
 	}
 
@@ -340,6 +355,19 @@ func runInit(opts upOptions) (upResult, error) {
 }
 
 func runUpWithTUI(assumeLoggedIn bool, openConsole bool) (upResult, error) {
+	if !assumeLoggedIn {
+		if err := ensureSpriteCLI(); err != nil {
+			return upResult{}, err
+		}
+		if _, err := spriteList(); err != nil {
+			fmt.Println(formatStyledBulletLog("[seven init] logging in to sprite"))
+			if err := runCmd(spriteBin(), nil, "login"); err != nil {
+				return upResult{}, err
+			}
+		}
+		assumeLoggedIn = true
+	}
+
 	m := newUpModel()
 	p := tea.NewProgram(m)
 
@@ -646,6 +674,22 @@ func runCmdDevNull(name string, extraEnv []string, args ...string) error {
 	return cmd.Run()
 }
 
+func runCmdQuiet(name string, extraEnv []string, args ...string) error {
+	cmd := exec.Command(name, args...)
+	cmd.Stdout = nil
+	cmd.Stderr = nil
+	devNull, err := os.Open(os.DevNull)
+	if err != nil {
+		return err
+	}
+	defer devNull.Close()
+	cmd.Stdin = devNull
+	if len(extraEnv) > 0 {
+		cmd.Env = append(os.Environ(), extraEnv...)
+	}
+	return cmd.Run()
+}
+
 func runCmdOutput(name string, extraEnv []string, args ...string) (string, error) {
 	cmd := exec.Command(name, args...)
 	if len(extraEnv) > 0 {
@@ -719,7 +763,6 @@ func (m upModel) View() string {
 	}
 	fmt.Fprintf(b, "%s\n", headerStyle.Render(title))
 	if len(m.logs) > 0 {
-		fmt.Fprintln(b)
 		start := 0
 		if len(m.logs) > 6 {
 			start = len(m.logs) - 6
@@ -736,9 +779,6 @@ func (m upModel) View() string {
 	if m.err != nil {
 		fmt.Fprintf(b, "\n%s %v\n", errorStyle.Render("error:"), m.err)
 	}
-	if m.err == nil && m.res.Name != "" {
-		fmt.Fprintf(b, "\n%s %s\n", bulletStyle.Render("•"), subtleStyle.Render("sprite: "+m.res.Name))
-	}
 	return b.String()
 }
 

cmd/seven/main_test.go

@@ -91,6 +91,67 @@ func TestSevenUpCreatesSpriteAndWritesFile(t *testing.T) {
 	}
 }
 
+func TestSevenUpSkipsLoginWhenSpriteExists(t *testing.T) {
+	repo := t.TempDir()
+	state, logPath, cleanup := createFakeSprite(t)
+	defer cleanup()
+
+	spriteName := "existing-sprite"
+	if err := os.WriteFile(filepath.Join(repo, ".sprite"), []byte(spriteName+"\n"), 0o644); err != nil {
+		t.Fatalf("failed to write .sprite: %v", err)
+	}
+	if err := os.WriteFile(state, []byte(spriteName+"\n"), 0o644); err != nil {
+		t.Fatalf("failed to write state: %v", err)
+	}
+
+	cmd := exec.Command(testSevenBin, "up", "--no-tui")
+	cmd.Dir = repo
+	cmd.Env = append(os.Environ(),
+		"PATH="+filepath.Dir(state)+string(os.PathListSeparator)+os.Getenv("PATH"),
+		"SPRITE_STATE="+state,
+		"SPRITE_LOG="+logPath,
+	)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("seven up failed: %v\n%s", err, output)
+	}
+
+	logData, err := os.ReadFile(logPath)
+	if err != nil {
+		t.Fatalf("expected sprite log: %v", err)
+	}
+	if strings.Contains(string(logData), "login") {
+		t.Fatalf("expected no login when sprite exists, got: %s", logData)
+	}
+}
+
+func TestSevenUpLogsInWhenSpriteListFails(t *testing.T) {
+	repo := createTempRepo(t)
+	state, logPath, cleanup := createFakeSprite(t)
+	defer cleanup()
+
+	cmd := exec.Command(testSevenBin, "up", "--no-tui")
+	cmd.Dir = repo
+	cmd.Env = append(os.Environ(),
+		"PATH="+filepath.Dir(state)+string(os.PathListSeparator)+os.Getenv("PATH"),
+		"SPRITE_STATE="+state,
+		"SPRITE_LOG="+logPath,
+		"SPRITE_FAIL_LIST=once",
+	)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("seven up failed: %v\n%s", err, output)
+	}
+
+	logData, err := os.ReadFile(logPath)
+	if err != nil {
+		t.Fatalf("expected sprite log: %v", err)
+	}
+	if !strings.Contains(string(logData), "login") {
+		t.Fatalf("expected login when list fails, got: %s", logData)
+	}
+}
+
 func TestSevenInitSetsUpSpriteWithoutConsole(t *testing.T) {
 	repo := createTempRepo(t)
 	state, logPath, cleanup := createFakeSprite(t)
@@ -244,6 +305,18 @@ case "$cmd" in
     exit 0
     ;;
   list)
+    if [ "${SPRITE_FAIL_LIST:-}" = "1" ]; then
+      logit "list (fail)"
+      exit 1
+    fi
+    if [ "${SPRITE_FAIL_LIST:-}" = "once" ]; then
+      failflag="${state}.fail_once"
+      if [ ! -f "$failflag" ]; then
+        logit "list (fail)"
+        echo 1 > "$failflag"
+        exit 1
+      fi
+    fi
     logit "list"
     if [ -f "$state" ]; then
       cat "$state"