Skip to content

fix(agent): list deleted files under their own path in the change list #1680

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

Merged
lizhengfeng101 merged 2 commits into from
Oct 12, 2026
Merged

fix(agent): list deleted files under their own path in the change list #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a8d222
fix(agent): list deleted files under their own path in the change list
Trainingcqy Oct 8, 2026
648640a
Merge branch 'main' into fix/deleted-path-in-change-list
lizhengfeng101 Oct 10, 2026
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
2 changes: 1 addition & 1 deletion internal/agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@ func formatDiffEntry(d model.Diff) string {
case d.IsRenamed:
status = "RENAMED"
}
return fmt.Sprintf("%s %s (+%d/-%d)", status, d.NewPath, d.Insertions, d.Deletions)
return fmt.Sprintf("%s %s (+%d/-%d)", status, effectivePath(d), d.Insertions, d.Deletions)
}

// buildChangeFilesExceptGroup returns a formatted list of changed files excluding all group members.
Expand Down
7 changes: 6 additions & 1 deletion internal/agent/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,9 @@ func TestBuildChangeFilesExceptGroup(t *testing.T) {
{NewPath: "main.go", OldPath: "main.go", Insertions: 4, Deletions: 2},
{NewPath: "moved_new.go", OldPath: "moved_old.go", IsRenamed: true},
{NewPath: "helper.go", OldPath: "helper.go", IsNew: true, Insertions: 12},
{NewPath: "removed.go", OldPath: "removed.go", IsDeleted: true, Deletions: 30},
// A deletion as ParseDiffText produces it: NewPath is the sentinel and
// the name is in OldPath.
{NewPath: "/dev/null", OldPath: "removed.go", IsDeleted: true, Deletions: 30},
{NewPath: "renamed.go", OldPath: "old_name.go", IsRenamed: true, Insertions: 5, Deletions: 5},
{NewPath: "bin.dat", OldPath: "bin.dat", IsBinary: true},
}
Expand Down Expand Up @@ -953,6 +955,9 @@ func TestBuildChangeFilesExceptGroup(t *testing.T) {
if strings.Contains(got, "bin.dat") {
t.Error("binary files should be skipped")
}
if strings.Contains(got, "/dev/null") {
t.Errorf("a deletion must be listed under its own path, not the /dev/null sentinel; got:\n%s", got)
}

// The separator is emitted before each entry, so a skipped final diff cannot
// leave a trailing newline behind. Excluding an entire group (plus binaries)
Expand Down
Loading