fix(git): explain pull failures without exposing remote output

[TinBane]

Fixes the secondary bug in the maintainer triage of #11872: GitVcsDriver.pullCurrentBranch replaces Git's output with git pull failed, so Permission denied (publickey) never reaches the UI. #12485 fixed the fetch half of that; this PR is the pull half, built the same way. Supersedes #14702, which was closed because it did not name the model and harness used.

What Changed

pullCurrentBranch now explains a failed git pull --ff-only with the fixed diagnoses #12485 added for fetch. When Git's output matches a known case the detail says "Git could not authenticate with the remote…", "Git could not reach the remote…", "Git could not access the remote repository…" or the reference-lock message. Anything else keeps "git pull failed". The reason tag from #8645 is kept as it is.

Raw Git output still never enters the error; only the fixed messages do. To match them on any server, git pull now runs with LC_ALL=C, like the fetch path. The output cap guard for large fast-forwards (appendTruncationMarker) is unchanged.

Two small changes to the shared diagnosis, both found in review: the network case now also recognises macOS and unroutable ssh wording (Operation timed out, No route to host, Host is down), so an unreachable host on the main desktop platform is named; and the lock message says a lock "may be blocking Git" rather than "the fetch", since it now also covers pull's index.lock.

Why

Julius's triage of #11872 lists this as a defect of its own: Pull replaces Git's stderr with git pull failed, so when a desktop SSH remote loses its forwarded agent, the Permission denied (publickey) that explains the failure never reaches the UI. #12485 fixed the same defect for fetch; Pull was left on the generic message. Since #14702 was opened, #8645 added a reason tag, so main now shows a code rather than nothing, but still not an explanation:

	Message for a Pull rejected for a missing SSH key
main	Git command failed in GitVcsDriver.pullCurrentBranch.pull (<repo>): git pull failed (authentication_failed)
This PR	Git command failed in GitVcsDriver.pullCurrentBranch.pull (<repo>): Git could not authenticate with the remote. Check Git credentials or SSH access on the server, then retry. (authentication_failed)

The fix mirrors #12485: the same LC_ALL=C helper, the same fixed diagnoses, the same error shape, one call site, and no change to what Pull does or to any default. The agent-lifetime bug that #11872 is mainly about is a separate fix and stays open.

UI Changes

The toast text changes as in the table above. Screenshots from #14702, taken before #8645 added the trailing reason tag (so today's "before" also ends in (authentication_failed)):

Before:

After:

These were captured against a Linux host over SSH in the state #11872 describes; see #14702 for that setup.

Verification

• vp test run src/vcs/GitVcsDriverCore.test.ts from apps/server: 144 passed. New, all with real Git:
  • a stand-in for ssh prints OpenSSH's Permission denied (publickey) line only under the C locale, so the test also proves pull fixes the locale; the error has the authentication detail and reason: "authentication_failed", and a marker printed alongside never appears in the message;
  • a branch tracks a local bare remote whose URL is then pointed at a missing path; the pull fails with "could not access the remote repository" and reason: "remote_unreachable";
  • the existing "still fails a pull that Git rejects" test now also asserts that a non-fast-forward keeps exactly "git pull failed";
  • two table rows for the macOS and unroutable ssh wording.
• Red before green: with the source file from main and the new tests kept, both new pull tests fail (expected 'git pull failed' to include 'could not access the remote repository', … to include 'could not authenticate'). With the fix but without LC_ALL=C on pull, the SSH test fails the same way.
• vp exec tsc --noEmit -p . in apps/server: exit 0. vp lint and vp fmt --check on the two changed files: clean apart from two existing warnings on lines this PR does not touch.

Not checked in this rebuild: a fresh in-app run and the Linux/Windows test runs; #14702 did both for the same call-site change.

Review notes not acted on, deliberately out of scope: LC_ALL=C also reaches hooks run during the pull (post-merge), as it already does for fetch; and background auto-pull still runs without GIT_TERMINAL_PROMPT=0.

Models

• Authored by Claude Opus 5.5, in Claude Code (run from T3 Code).
• Reviewed by GPT-6.1 Sol (Codex CLI, high reasoning) and Claude Opus 5.5 (separate Claude Code review agent). Their findings were applied as described above.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This focused fix changes production handling of Git authentication failures and potentially credential-bearing remote stderr while adding locale-dependent diagnosis behavior. Although the existing pull flow is largely preserved and redaction is tested, the sensitive-data and authentication implications warrant human review.

^{You can add or adjust custom eligibility rules. Learn more.}

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

• Configuration used: Path: .coderabbit.config.ts
• Review profile: CHILL
• Plan: Advanced
• Run ID: e64a5c0d-d3f3-453d-ab0c-1dc9e4b822f2

---

📥 Commits

Reviewing files that changed from the base of the PR and between 75fca7d and db300c3.

---

📒 Files selected for processing (2)

• apps/server/src/vcs/GitVcsDriverCore.test.ts
• apps/server/src/vcs/GitVcsDriverCore.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 Git VCS driver recognizes more SSH connection failures and classifies errors from pullCurrentBranch. Pull failures use a recognized diagnosis when available, or the generic detail git pull failed otherwise. Tests cover the diagnoses and check that sensitive output is not exposed.

Changes

Git failure diagnostics

Layer / File(s)	Summary
Remote error classification apps/server/src/vcs/GitVcsDriverCore.ts, apps/server/src/vcs/GitVcsDriverCore.test.ts	The classifier recognizes SSH connection timeouts and unroutable hosts. Local-reference guidance now refers to another Git operation, not only fetch.
Pull failure handling apps/server/src/vcs/GitVcsDriverCore.ts, apps/server/src/vcs/GitVcsDriverCore.test.ts	pullCurrentBranch captures nonzero results and uses a recognized diagnosis or git pull failed. Tests cover missing remotes, rejected SSH keys, and checks against exposing paths or secret output.

Priority: ⬇️ Low

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

Change: Bug fix

Suggested reviewers: juliusmarminge

---

Merge Risk | ⚪ Minimal · up to db300

Merge Risk: ⚪ Minimal · up to db300

The pull diagnostics change is mergeable after normal checks; no actionable merge-blocking risk remains.

Security Architecture Review

Security architecture risk: 🔵 Low · up to db300

Pull errors continue to use fixed explanations rather than remote output, and existing access paths remain unchanged. No introduced security issue was established. Compatibility with locale-sensitive repository hooks remains unverified.

Retained concerns
No architecture-level concerns identified.

Security review details

Security Blast Radius

• observed — The affected failure reporting remains reachable through existing interactive and automatic pull callers. No new external caller or expanded error interface was identified in the base-to-head comparison.

Trust Boundaries and Controls

• observed — Potentially remote-controlled stderr is used to select a predefined diagnosis, not interpolated into the new error. The nonzero-exit branch stores output lengths rather than stdout or stderr contents and supplies no cause. Unrecognized diagnostics retain the generic detail, preserving the control against remote-output disclosure at this producer boundary.

---

Pre-merge checks | 4

✅ Passed checks (4 passed)

Check name	Status	Explanation
Title check		The title clearly and concisely describes the main change: explaining Git pull failures without exposing remote output. It uses an appropriate conventional commit format.
Description check		The description is mostly complete. It explains the problem, the implementation, scope, verification results, limitations, screenshots, and the model and harness used. The content maps to the required…
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

---

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create a new PR

---

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

---

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

[maria-rcks]

Note

Written by gpt-6.1-sol on behalf of Maria

Thanks for working on pull diagnostics. This changes the explanation of existing failures rather than repairing the failed pull, and right now we are only taking focused bug fixes from outside contributors under Read this first. Please keep the SSH-agent failure tracked in an issue and seek maintainer agreement on diagnostic changes before requesting reconsideration.