Fix gh auth persistence inside sprite

Author: mtremsal

cmd/seven/integration_test.go

@@ -162,6 +162,67 @@ func TestIntegrationInitNormalizesForbiddenDirName(t *testing.T) {
 	}
 }
 
+func TestIntegrationGhAuthPersistsInSprite(t *testing.T) {
+	if os.Getenv("SEVEN_INTEGRATION") != "1" {
+		t.Skip("set SEVEN_INTEGRATION=1 to run integration tests")
+	}
+
+	if _, err := exec.LookPath("sprite"); err != nil {
+		t.Skip("sprite CLI not found in PATH")
+	}
+	if err := exec.Command("sprite", "list").Run(); err != nil {
+		t.Skip("sprite list failed; ensure you are logged in")
+	}
+	if _, err := exec.LookPath("gh"); err != nil {
+		t.Skip("gh CLI not found in PATH")
+	}
+	if _, err := exec.LookPath("git"); err != nil {
+		t.Skip("git not available")
+	}
+
+	tokenOut, err := exec.Command("gh", "auth", "token").CombinedOutput()
+	if err != nil || strings.TrimSpace(string(tokenOut)) == "" {
+		t.Skip("gh auth token not available on host")
+	}
+
+	repo := t.TempDir()
+	if err := initGitRepo(repo, "https://github.com/1to10partners/seven.git"); err != nil {
+		t.Fatalf("git setup failed: %v", err)
+	}
+
+	cmdInit := exec.Command(testSevenBin, "init", "--assume-logged-in")
+	cmdInit.Dir = repo
+	cmdInit.Stdout = os.Stdout
+	cmdInit.Stderr = os.Stderr
+	cmdInit.Env = os.Environ()
+	if err := cmdInit.Run(); err != nil {
+		t.Fatalf("seven init failed: %v", err)
+	}
+
+	spriteFile := filepath.Join(repo, ".sprite")
+	data, err := os.ReadFile(spriteFile)
+	if err != nil {
+		t.Fatalf("expected .sprite file: %v", err)
+	}
+	name := strings.TrimSpace(string(data))
+	if name == "" {
+		t.Fatalf(".sprite should contain a name")
+	}
+
+	defer destroySprite(t, repo)
+
+	if err := exec.Command("sprite", "exec", "-s", name, "gh", "--version").Run(); err != nil {
+		t.Skip("gh not available in sprite")
+	}
+
+	auth := exec.Command("sprite", "exec", "-s", name, "gh", "auth", "status", "-h", "github.com")
+	auth.Stdout = os.Stdout
+	auth.Stderr = os.Stderr
+	if err := auth.Run(); err != nil {
+		t.Fatalf("expected gh auth status to succeed in sprite: %v", err)
+	}
+}
+
 func spriteListed(name string) bool {
 	out, err := exec.Command("sprite", "list").CombinedOutput()
 	if err != nil {

cmd/seven/main.go

@@ -642,10 +642,19 @@ func ensureGhAuthInSprite(spriteName, ghToken string, opts upOptions) error {
 	if err := spriteExec(spriteName, env, opts.QuietExternal, "sh", "-lc", "command -v gh >/dev/null 2>&1"); err != nil {
 		return fmt.Errorf("gh not found in sprite: %w", err)
 	}
-	if err := spriteExec(spriteName, env, opts.QuietExternal, "sh", "-lc", "printf '%s' \"$GH_TOKEN\" | gh auth login --with-token"); err != nil {
+	loginCmd := "token=\"$GH_TOKEN\"; unset GH_TOKEN; printf '%s' \"$token\" | gh auth login --with-token -h github.com"
+	if out, err := spriteExecOutput(spriteName, env, "sh", "-lc", loginCmd); err != nil {
+		msg := strings.TrimSpace(out)
+		if msg != "" {
+			return fmt.Errorf("gh auth login failed: %w (%s)", err, msg)
+		}
 		return fmt.Errorf("gh auth login failed: %w", err)
 	}
-	if err := spriteExec(spriteName, env, opts.QuietExternal, "gh", "auth", "setup-git"); err != nil {
+	if out, err := spriteExecOutput(spriteName, env, "gh", "auth", "setup-git"); err != nil {
+		msg := strings.TrimSpace(out)
+		if msg != "" {
+			return fmt.Errorf("gh auth setup-git failed: %w (%s)", err, msg)
+		}
 		return fmt.Errorf("gh auth setup-git failed: %w", err)
 	}
 	return nil
@@ -729,6 +738,18 @@ func spriteExec(spriteName string, env []string, quiet bool, args ...string) err
 	return runCmd(spriteBin(), nil, cmdArgs...)
 }
 
+func spriteExecOutput(spriteName string, env []string, args ...string) (string, error) {
+	if spriteName == "" {
+		return "", errors.New("sprite name is empty")
+	}
+	cmdArgs := []string{"exec", "-s", spriteName}
+	for _, kv := range env {
+		cmdArgs = append(cmdArgs, "-env", kv)
+	}
+	cmdArgs = append(cmdArgs, args...)
+	return runCmdOutput(spriteBin(), nil, cmdArgs...)
+}
+
 func spriteBin() string {
 	if spritePath == "" {
 		return "sprite"

cmd/seven/main_test.go

@@ -295,7 +295,7 @@ exit 0
 		t.Fatalf("expected sprite log: %v", err)
 	}
 	log := string(logData)
-	if !strings.Contains(log, "gh auth login --with-token") {
+	if !strings.Contains(log, "gh auth login --with-token -h github.com") {
 		t.Fatalf("expected gh auth login in sprite, got: %s", log)
 	}
 	if !strings.Contains(log, "gh auth setup-git") {