Merge remote-tracking branch 'origin/main' into cursor/setup-dev-environment-0d13

Author: bschellenberger2600

.github/workflows/release.yml

@@ -153,25 +153,25 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           HOMEBREW_TAP_TOKEN: ${{ secrets.HOMEBREW_TAP_TOKEN }}
 
-      - name: Verify Homebrew formula publish
+      - name: Verify Homebrew cask publish
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RELEASE_TAG: ${{ steps.release_meta.outputs.release_tag }}
         run: |
           set -euo pipefail
           RELEASE_VERSION="${RELEASE_TAG#v}"
           for attempt in $(seq 1 18); do
-            FORMULA_B64="$(gh api repos/git-fire/homebrew-tap/contents/Formula/git-rain.rb --jq '.content' 2>/dev/null || true)"
-            if [ -n "$FORMULA_B64" ]; then
-              FORMULA_CONTENT="$(printf '%s' "$FORMULA_B64" | tr -d '\n' | base64 -d)"
-              if printf '%s' "$FORMULA_CONTENT" | grep -q "version \"${RELEASE_VERSION}\"" && \
-                 printf '%s' "$FORMULA_CONTENT" | grep -q "/download/${RELEASE_TAG}/"; then
-                echo "Homebrew formula updated for ${RELEASE_TAG}."
+            CASK_B64="$(gh api repos/git-fire/homebrew-tap/contents/Casks/git-rain.rb --jq '.content' 2>/dev/null || true)"
+            if [ -n "$CASK_B64" ]; then
+              CASK_CONTENT="$(printf '%s' "$CASK_B64" | tr -d '\n' | base64 -d)"
+              if printf '%s' "$CASK_CONTENT" | grep -q "version \"${RELEASE_VERSION}\"" && \
+                 printf '%s' "$CASK_CONTENT" | grep -q "/download/${RELEASE_TAG}/"; then
+                echo "Homebrew cask updated for ${RELEASE_TAG}."
                 exit 0
               fi
             fi
-            echo "Homebrew formula not updated for ${RELEASE_TAG} yet (attempt ${attempt}/18)."
+            echo "Homebrew cask not updated for ${RELEASE_TAG} yet (attempt ${attempt}/18)."
             sleep 10
           done
-          echo "Homebrew formula did not update for ${RELEASE_TAG}; failing release gate."
+          echo "Homebrew cask did not update for ${RELEASE_TAG}; failing release gate."
           exit 1

.goreleaser.stable.yaml

@@ -97,24 +97,29 @@ changelog:
     - title: Other
       order: 999
 
-brews:
+homebrew_casks:
   - name: git-rain
     repository:
       owner: git-fire
       name: homebrew-tap
       token: "{{ .Env.HOMEBREW_TAP_TOKEN }}"
       pull_request:
         enabled: false
-    directory: Formula
     commit_author:
       name: goreleaserbot
       email: bot@goreleaser.com
     commit_msg_template: "chore: update git-rain to {{ .Tag }}"
     homepage: "https://github.com/git-fire/git-rain"
     description: "Sync local git repositories from their remotes — the reverse of git-fire"
     license: MIT
-    install: bin.install "git-rain"
-    test: system "#{bin}/git-rain", "--version"
+    binaries:
+      - git-rain
+    hooks:
+      post:
+        install: |
+          if OS.mac?
+            system_command "/usr/bin/xattr", args: ["-dr", "com.apple.quarantine", "#{staged_path}/git-rain"]
+          end
 
 release:
   github:

cmd/root.go

@@ -22,7 +22,7 @@ import (
 	"github.com/git-rain/git-rain/internal/config"
 	"github.com/git-rain/git-rain/internal/git"
 	"github.com/git-rain/git-rain/internal/registry"
-	"github.com/git-rain/git-rain/internal/safety"
+	"github.com/git-fire/git-harness/safety"
 	"github.com/git-rain/git-rain/internal/sessionlog"
 	"github.com/git-rain/git-rain/internal/ui"
 )
@@ -888,6 +888,7 @@ func fetchOnly(repoPath string, opts git.RainOptions) error {
 	}
 	cmd := exec.Command("git", fetchArgs...)
 	cmd.Dir = repoPath
+	git.PrepareNetworkGit(cmd)
 	if out, err := cmd.CombinedOutput(); err != nil {
 		return fmt.Errorf("%s: %w (output: %s)", strings.Join(append([]string{"git"}, fetchArgs...), " "), err, strings.TrimSpace(string(out)))
 	}

cmd/root_test.go

@@ -487,6 +487,7 @@ func TestFetchFailureMessage(t *testing.T) {
 		{"authentication", "Authentication failed for git@github.com", "could not authenticate with remote — check your credentials and try again"},
 		{"permission denied", "git@github.com: Permission denied (publickey)", "could not authenticate with remote — check your credentials and try again"},
 		{"could not read", "fatal: could not read from remote", "could not authenticate with remote — check your credentials and try again"},
+		{"terminal prompts disabled", "fatal: could not read Username for 'https://github.com': terminal prompts disabled", "could not authenticate with remote — check your credentials and try again"},
 		{"401", "fatal: HTTP 401: Unauthorized", "could not authenticate with remote — check your credentials and try again"},
 		{"403", "fatal: HTTP 403 forbidden", "could not authenticate with remote — check your credentials and try again"},
 		{"could not resolve", "fatal: unable to access ...: Could not resolve host", "could not reach remote — check your network and try again"},

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/charmbracelet/bubbles v1.0.0
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/git-fire/git-harness v0.3.1
 	github.com/git-fire/git-testkit v0.2.0
 	github.com/gofrs/flock v0.12.1
 	github.com/mattn/go-runewidth v0.0.19

go.sum

@@ -29,6 +29,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/git-fire/git-harness v0.3.1 h1:+fCQ9nMS3YI7r9iVGrU95oefH8N86XjxcYSqsin/1aE=
+github.com/git-fire/git-harness v0.3.1/go.mod h1:cNvjYdbowpoO/KdJwtGenhySx+EkgoQJujuANJpRpj4=
 github.com/git-fire/git-testkit v0.2.0 h1:IFzOxMdNTE5A4lnzbFz62h2R44+3qVy27Xj1KWyGi1Y=
 github.com/git-fire/git-testkit v0.2.0/go.mod h1:YlJlkY9JfGdYTe9o9W3l+gv9BPj05FGu6HK36Z5jwVA=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=

internal/git/command.go

@@ -0,0 +1,13 @@
+package git
+
+import (
+	"os/exec"
+
+	harnessgit "github.com/git-fire/git-harness/git"
+)
+
+// PrepareNetworkGit configures cmd for fetch/push operations that may contact
+// a remote. Delegates to git-harness so credential behavior stays aligned with git-fire.
+func PrepareNetworkGit(cmd *exec.Cmd) {
+	harnessgit.PrepareNetworkGit(cmd)
+}

internal/git/command_test.go

@@ -0,0 +1,39 @@
+package git
+
+import (
+	"os/exec"
+	"strings"
+	"testing"
+
+	testutil "github.com/git-fire/git-testkit"
+)
+
+func TestFetchFailureReason_TerminalPromptsDisabled(t *testing.T) {
+	got := fetchFailureReason([]byte("fatal: could not read Username for 'https://github.com': terminal prompts disabled"))
+	want := "could not authenticate with remote — check your credentials and try again"
+	if got != want {
+		t.Fatalf("fetchFailureReason() = %q, want %q", got, want)
+	}
+}
+
+func TestNetworkFetch_UnauthenticatedHTTPSFailsWithoutPrompt(t *testing.T) {
+	repo := testutil.CreateTestRepo(t, testutil.RepoOptions{
+		Name: "https-fetch-repo",
+		Remotes: map[string]string{
+			"origin": "https://github.com/git-rain/nonexistent-repo-auth-test.git",
+		},
+	})
+
+	cmd := exec.Command("git", "fetch", "--all")
+	cmd.Dir = repo
+	PrepareNetworkGit(cmd)
+	output, err := cmd.CombinedOutput()
+	if err == nil {
+		t.Fatal("expected fetch to fail without credentials")
+	}
+	msg := strings.ToLower(string(output) + " " + err.Error())
+	if !strings.Contains(msg, "terminal prompts disabled") &&
+		!strings.Contains(msg, "could not read username") {
+		t.Fatalf("expected non-interactive auth failure, got output=%q err=%v", strings.TrimSpace(string(output)), err)
+	}
+}

internal/git/fetch_mainline.go

@@ -146,6 +146,7 @@ func MainlineFetchRemotes(repoPath string, opts RainOptions) (RainResult, error)
 		}
 		cmd := exec.Command("git", args...)
 		cmd.Dir = repoPath
+		PrepareNetworkGit(cmd)
 		if output, err := cmd.CombinedOutput(); err != nil {
 			failedReason[remote] = fetchFailureReason(output)
 		}

internal/git/operations.go

@@ -2,158 +2,48 @@ package git
 
 import (
 	"fmt"
-	"os/exec"
 	"strings"
 
-	"github.com/git-rain/git-rain/internal/safety"
+	harnessgit "github.com/git-fire/git-harness/git"
+	harnessafety "github.com/git-fire/git-harness/safety"
 )
 
-// Worktree represents a git worktree
-type Worktree struct {
-	Path   string // Absolute path to worktree
-	Branch string // Current branch in this worktree
-	Head   string // Current HEAD SHA
-	IsMain bool   // True if this is the main worktree
-}
+// Worktree is a git worktree (delegates to git-harness).
+type Worktree = harnessgit.Worktree
 
-// getCommitSHA returns the SHA of a commit ref
 func getCommitSHA(repoPath, ref string) (string, error) {
-	cmd := exec.Command("git", "rev-parse", ref)
-	cmd.Dir = repoPath
-
-	output, err := cmd.Output()
-	if err != nil {
-		return "", fmt.Errorf("git rev-parse failed for %s: %w", ref, err)
-	}
-
-	sha := strings.TrimSpace(string(output))
-	return sha, nil
+	return harnessgit.GetCommitSHA(repoPath, ref)
 }
 
 // GetCommitSHA returns the SHA for a ref in the repository.
 func GetCommitSHA(repoPath, ref string) (string, error) {
-	return getCommitSHA(repoPath, ref)
+	return harnessgit.GetCommitSHA(repoPath, ref)
 }
 
-// GetCurrentBranch returns the currently checked out branch
+// GetCurrentBranch returns the currently checked out branch.
 func GetCurrentBranch(repoPath string) (string, error) {
-	cmd := exec.Command("git", "branch", "--show-current")
-	cmd.Dir = repoPath
-
-	output, err := cmd.Output()
-	if err != nil {
-		return "", fmt.Errorf("git branch --show-current failed: %w", err)
-	}
-
-	branch := strings.TrimSpace(string(output))
-	if branch == "" {
-		return "", fmt.Errorf("not on any branch (detached HEAD?)")
-	}
-
-	return branch, nil
+	return harnessgit.GetCurrentBranch(repoPath)
 }
 
-// HasStagedChanges checks if there are staged changes
+// HasStagedChanges checks if there are staged changes.
 func HasStagedChanges(repoPath string) (bool, error) {
-	cmd := exec.Command("git", "diff", "--cached", "--quiet")
-	cmd.Dir = repoPath
-
-	err := cmd.Run()
-	if err != nil {
-		if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 1 {
-			return true, nil
-		}
-		return false, fmt.Errorf("git diff --cached --quiet failed: %w", err)
-	}
-
-	return false, nil
+	return harnessgit.HasStagedChanges(repoPath)
 }
 
-// HasUnstagedChanges checks if there are unstaged changes (including untracked files)
+// HasUnstagedChanges checks if there are unstaged changes (including untracked files).
 func HasUnstagedChanges(repoPath string) (bool, error) {
-	cmd := exec.Command("git", "diff", "--quiet")
-	cmd.Dir = repoPath
-
-	err := cmd.Run()
-	hasModified := false
-	if err != nil {
-		if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 1 {
-			hasModified = true
-		} else {
-			return false, fmt.Errorf("git diff --quiet failed: %w", err)
-		}
-	}
-
-	cmd = exec.Command("git", "ls-files", "--others", "--exclude-standard")
-	cmd.Dir = repoPath
-	output, err := cmd.Output()
-	if err != nil {
-		return false, fmt.Errorf("git ls-files failed: %w", err)
-	}
-
-	hasUntracked := len(strings.TrimSpace(string(output))) > 0
-
-	return hasModified || hasUntracked, nil
+	return harnessgit.HasUnstagedChanges(repoPath)
 }
 
-// ListWorktrees returns all worktrees for a repository
+// ListWorktrees returns all worktrees for a repository.
 func ListWorktrees(repoPath string) ([]Worktree, error) {
-	cmd := exec.Command("git", "worktree", "list", "--porcelain")
-	cmd.Dir = repoPath
-
-	output, err := cmd.Output()
-	if err != nil {
-		return nil, fmt.Errorf("git worktree list failed: %w", err)
-	}
-
-	lines := strings.Split(string(output), "\n")
-	var worktrees []Worktree
-	var current Worktree
-	isFirst := true
-
-	for _, line := range lines {
-		line = strings.TrimSpace(line)
-		if line == "" {
-			if current.Path != "" {
-				current.IsMain = isFirst
-				worktrees = append(worktrees, current)
-				current = Worktree{}
-				isFirst = false
-			}
-			continue
-		}
-
-		parts := strings.SplitN(line, " ", 2)
-		if len(parts) < 2 {
-			continue
-		}
-
-		key := parts[0]
-		value := parts[1]
-
-		switch key {
-		case "worktree":
-			current.Path = value
-		case "HEAD":
-			current.Head = value
-		case "branch":
-			branch := strings.TrimPrefix(value, "refs/heads/")
-			current.Branch = branch
-		}
-	}
-
-	if current.Path != "" {
-		current.IsMain = isFirst
-		worktrees = append(worktrees, current)
-	}
-
-	return worktrees, nil
+	return harnessgit.ListWorktrees(repoPath)
 }
 
 func commandError(action string, err error, output []byte) error {
 	out := strings.TrimSpace(string(output))
 	if out == "" {
 		return fmt.Errorf("%s failed: %w", action, err)
 	}
-	return fmt.Errorf("%s failed: %w (stderr: %s)", action, err, safety.SanitizeText(out))
+	return fmt.Errorf("%s failed: %w (stderr: %s)", action, err, harnessafety.SanitizeText(out))
 }