[saddlepaddle]

What broke

A user report: the desktop app showed "This view hit an error" as soon as a workspace opened, on every launch.

The Changes list had the same unstaged path twice. Opening the diff pane then threw CodeView.addItem: duplicate id "diff:unstaged:<path>". The diff pane is restored on launch and the git state is on disk, so the same workspace failed again every time.

Why

detectUnstagedRenames copies the index, marks untracked files intent-to-add, and diffs the whole worktree. It returned every rename in that diff. When the real index already has an intent-to-add file that git pairs with a deletion (git status shows R old -> new), that rename is already in unstaged. It came back a second time whenever the worktree also had any unrelated deletion and any untracked file. The merge in git-status.ts only drops consumed deleted/untracked entries, so the renamed entry was pushed twice.

Fix

Keep only renames onto the paths the detection marked itself.

Verification

• New integration test: an intent-to-add rename + an unrelated deletion + an untracked file gives one renamed row. It fails on main (new.txt twice) and passes here.
• Dev app over CDP, same git state: before the fix, two rows and the error screen, and both Reload and reopening the workspace fail again. After the fix, one row, the diff pane opens, and it still opens after a reload.
• git/utils tests: long converging sequence of mixed batches times out at 5 s on this machine on main as well; with --timeout 60000 that file passes 39/39 with and without this change.

Not in this PR: the per-pane error boundary that would stop one pane's throw from taking over the workspace.

---

Summary by cubic

Fixes a workspace crash loop by listing an intent-to-add rename once in git status instead of twice. The duplicate unstaged path made the restored diff pane throw on the duplicate id, so the same workspace failed on every launch.

detectUnstagedRenames copied the index, marked untracked files intent-to-add, and diffed the whole worktree, so it also returned renames git already reported for files intent-to-add in the real index. It now only returns renames onto the files it marked itself.

Bug Fixes

• Added an integration test with an intent-to-add rename, an unrelated deletion, and an untracked file that asserts the rename appears once.

^{Written for commit d7e849a. Summary will update on new commits.}

Summary by CodeRabbit

• Bug Fixes
  • Git status now reports renames involving untracked files without duplicating rename entries already detected by Git.
  • Files marked for addition and modified before staging are correctly included in rename detection.
• Tests
  • Added coverage for rename detection alongside deleted tracked files and other untracked files.

[coderabbitai]

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Advanced

Run ID: 4310e41f-6351-4061-bbdb-1fc0ad117243

📥 Commits

Reviewing files that changed from the base of the PR and between 0bfe99f and d7e849a.

📒 Files selected for processing (2)

• packages/host-service/src/trpc/router/git/utils/git-helpers.ts
• packages/host-service/src/trpc/router/git/utils/git-status.integration.test.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.

---

📝 Walkthrough

Walkthrough

The unstaged rename detector now filters temporary-index diff results by untracked destination path. An integration test covers rename detection when a replacement file is staged with intent-to-add.

Changes

Unstaged Rename Filtering

Layer / File(s)	Summary
Filter and verify unstaged renames packages/host-service/src/trpc/router/git/utils/git-helpers.ts, packages/host-service/src/trpc/router/git/utils/git-status.integration.test.ts	detectUnstagedRenames skips rename entries whose destination is not in untrackedPaths. An integration test checks the resulting snapshot and rename for an intent-to-add replacement.

Priority: ➖ Normal

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Suggested reviewers: kitenite

Merge Risk: ⚪ Minimal · up to d7e84

The intent-to-add rename remains in the snapshot, while the filter removes only its duplicate. No material merge risk was found.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title uses conventional commit format and clearly describes the primary fix for duplicate intent-to-add renames in host-service Git status.
Description check	✅ Passed	The description clearly explains the failure, cause, fix, and verification results. It does not include the required Checklist section or its checklist items, but the core description is complete and …
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches 💡 1

🛠️ Fix failing CI checks 💡

• Commit to this branch
• Create a new PR

📝 Generate docstrings

• Commit to this branch
• Create a new PR

🧪 Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Autopilot is currently an internal CodeRabbit preview.

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

🧹 Preview Cleanup Complete

The following preview resources have been cleaned up:

• ✅ Neon database branch

Thank you for your contribution! 🎉