Skip to content

Fix entire cli hanging on prepare-commit-msg git hook #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sbalay wants to merge 1 commit into from
Closed

Fix entire cli hanging on prepare-commit-msg git hook #561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions cmd/entire/cli/strategy/manual_commit_hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"
"log/slog"
"os"
"os/exec"
"path/filepath"
"strings"

Expand Down Expand Up @@ -1165,7 +1166,7 @@ func (s *ManualCommitStrategy) sessionHasNewContent(ctx context.Context, repo *g
if len(state.FilesTouched) > 0 {
// Shadow branch has files from carry-forward - check if staged files overlap
// AND have matching content (content-aware check).
stagedFiles := getStagedFiles(repo)
stagedFiles := getStagedFiles(ctx)
if len(stagedFiles) > 0 {
// PrepareCommitMsg context: check staged files overlap with content
result := stagedFilesOverlapWithContent(ctx, repo, tree, stagedFiles, state.FilesTouched)
Expand Down Expand Up @@ -1218,7 +1219,7 @@ func (s *ManualCommitStrategy) sessionHasNewContent(ctx context.Context, repo *g

// Check if staged files overlap with session's files with content-aware matching.
// This is primarily for PrepareCommitMsg; in PostCommit, stagedFiles is empty.
stagedFiles := getStagedFiles(repo)
stagedFiles := getStagedFiles(ctx)
if len(stagedFiles) > 0 {
result := stagedFilesOverlapWithContent(ctx, repo, tree, stagedFiles, state.FilesTouched)
logging.Debug(logCtx, "sessionHasNewContent: staged files overlap check",
Expand Down Expand Up @@ -1270,7 +1271,7 @@ func (s *ManualCommitStrategy) sessionHasNewContentFromLiveTranscript(ctx contex
// Check if any modified files overlap with currently staged files
// This ensures we only add checkpoint trailers to commits that include
// files the agent actually modified
stagedFiles := getStagedFiles(repo)
stagedFiles := getStagedFiles(ctx)

logging.Debug(logCtx, "live transcript check: comparing staged vs modified",
slog.String("session_id", state.SessionID),
Expand Down Expand Up @@ -1815,23 +1816,21 @@ func (s *ManualCommitStrategy) calculatePromptAttributionAtStart(
return result
}

// getStagedFiles returns a list of files staged for commit.
func getStagedFiles(repo *git.Repository) []string {
worktree, err := repo.Worktree()
if err != nil {
return nil
}

status, err := worktree.Status()
// getStagedFiles returns a list of files staged for commit using native git CLI.
// Uses git diff --cached which is much faster than go-git's worktree.Status()
// on large repositories (O(staged files) vs O(all files in working tree)).
func getStagedFiles(ctx context.Context) []string {
cmd := exec.CommandContext(ctx, "git", "diff", "--cached", "--name-only")
output, err := cmd.Output()
if err != nil {
return nil
}

lines := strings.Split(strings.TrimSpace(string(output)), "\n")
var staged []string
for path, fileStatus := range status {
// Check if file is staged (in index)
if fileStatus.Staging != git.Unmodified && fileStatus.Staging != git.Untracked {
staged = append(staged, path)
for _, line := range lines {
if line != "" {
staged = append(staged, line)
}
}
return staged
Expand Down