fix(server): changed files keep their real paths for renames and non-ASCII names

[Atharvsinh-codez]

Problem

Git status used display-oriented path parsing, which misread quoted, non-ASCII and renamed files. Selective commits and editor actions also used the wrong directory when the project was nested inside a repository.

Change

Use NUL-delimited Git status and numstat records, reuse the existing numstat parser, and stage selected repository-relative paths with literal top-level pathspecs. Return the repository root with local status so file actions resolve against the same snapshot; keep the root optional for older servers and disable the editor action when it is unavailable. Preserve significant trailing whitespace when decoding the root path.

Thanks @Atharvsinh-codez for the original fix and regression cases in #20175.

Scope and approval

This covers Git path decoding, nested selective commits, and the shared web/desktop file action. It does not change provider behavior or introduce a new Git workflow. The existing mobile selection path continues to submit repository-relative paths. Maintainer takeover and original-branch publication are authorized; no merge is requested.

Verification

At local head ad93c17, incorporating main c274a25:

• The trailing-space root regression failed with the previous decoder and passed with the correction. The driver suite passed 168 tests before and after integration. Manager/status suites passed 197 tests before integration; the browser command-boundary suite passed 16 after integration. Scoped lint, formatting and server/contracts/web typechecks passed. An independent Sol review ran another 69 focused cases successfully.
• A real local web client verified tracked and untracked file targets in normal nested and space-suffixed-root projects. All four targets matched existing files. An explicit-message selective commit included the Unicode file and rename while leaving both unchecked files uncommitted. Full path evidence.

Before — prior local head f7de77f, same space-root fixture and action; the requested root lost its space:

After — current local head, preserving the space:

Selective commit — Unicode and rename selected, unrelated files excluded:

Mixed versions: a new client connected to an older server disables this editor action when the root is unavailable. An older client connected to a new server can still resolve nested editor targets incorrectly; upgrading both sides is needed for that fix. Commit selection remains compatible.

Limits: no editor is installed, so the client error and full DOM target establish path resolution, not successful editor launch. This pass exercised local web, not a native shell, mobile, relay or tunnel. The before capture is retained from the earlier exact head. The proof worker accidentally triggered automatic commit-message generation once in the disposable fixture, preserved and reversed that commit, then performed the explicit-message selective test; no conversational provider run, source change or live user-state write occurred. Owned servers were stopped afterward.

Implementation: Claude Fable 5.1 through T3 Code. Fresh full cumulative reviews by Claude Opus 5.5 and GPT-6.1 Sol through T3 Code both found no substantive defects at this head; Opus independently passed all 168 driver tests.

[chatgpt-codex-connector]

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-16T06:37:21.131791Z	3450b0b	PR opened

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

[macroscopeapp]

Approvability

Verdict: Approved at 3450b0b

Macroscope's review found this PR approvable — This is a focused, test-covered server bug fix that makes Git status paths reliable for renames, spaces, and non-ASCII names. Its runtime impact is confined to changed-file reporting and selective commit staging, with no schema, default, deployment, or static-analysis changes.

^{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: 7964f9ee-a2d7-4190-8b0d-55c9b47a50c4

📥 Commits

Reviewing files that changed from the base of the PR and between 86680b5 and f21194c.

📒 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

Git status now parses NUL-delimited porcelain and numstat output. It tracks rename paths and accumulates repeated file statistics. Selected-file staging uses repository-relative paths from nested directories.

Changes: Git status and selected-file commits

Layer / File(s)	Summary
NUL-delimited status and numstat parsing apps/server/src/vcs/GitVcsDriverCore.ts, apps/server/src/vcs/GitVcsDriverCore.test.ts	Status commands request NUL-delimited output. The parser reads porcelain records and numstat data, tracks both paths for renames, and accumulates repeated file statistics. Tests cover committing a renamed file and a modified file with a non-ASCII name.
Selected-file staging from nested directories apps/server/src/vcs/GitVcsDriverCore.ts, apps/server/src/vcs/GitVcsDriverCore.test.ts	Selected paths use top-anchored literal pathspecs. A test checks that a nested-directory commit leaves an unselected root-level change uncommitted.

Priority: ➖ Normal

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

Change: Bug fix

Suggested reviewers: juliusmarminge

Merge Risk: ⚪ Minimal · up to f2119

No actionable issue remains in the reviewed status and selected-file commit changes; the PR is mergeable after normal checks.

### Architecture Summary

Architecture risk: 🔵 Low · up to f2119

The change affects 1 system.

Changed systems: apps/server

Architecture concerns
No architecture-level concerns identified.

Review details

Systems and components

• observed — apps/server (service) was modified; 2 changed files map to changed impact.

Before / after behavior

• observed — Modified behavior in apps/server/src/vcs/GitVcsDriverCore.test.ts: The expected status command arguments now include -z; the previous expectation omitted the NUL-delimited output option.
• observed — Modified behavior in apps/server/src/vcs/GitVcsDriverCore.test.ts: Adds a test covering a modified non-ASCII filename and an edited rename. It checks the reported paths, stages those paths through commit, and expects the working tree to be clean afterward.
• observed — Modified behavior in apps/server/src/vcs/GitVcsDriverCore.test.ts: Adds a nested-directory commit-selection test. It checks that status reports repository-relative paths, commits two selected nested files, and leaves the unselected root README modification present.
• observed — Modified behavior in apps/server/src/vcs/GitVcsDriverCore.ts: Removed parseNumstatEntries, which parsed newline-separated numstat output and normalized rename paths by taking the text after =>. The status flow now uses NUL-delimited review numstat parsing.

Pre-merge checks: 4

Check name	Status	Explanation
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.
Title check		The title clearly identifies the main fix: preserving real paths for renamed and non-ASCII files. It is concise and follows the repository's conventional commit format.
Description check		The description includes all required sections and provides clear problem details, implementation scope, approval context, focused verification results, limitations, and test evidence. It is sufficien…

Full details: Description check

Explanation

The description includes all required sections and provides clear problem details, implementation scope, approval context, focused verification results, limitations, and test evidence. It is sufficiently complete for review.

✨ 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.}

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3450b0b878

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[chatgpt-codex-connector]

Stage NUL status paths from the worktree root

When cwd is a repository subdirectory (the supported nested-project case in GitVcsDriverCore.test.ts:1531), this added -z changes porcelain-v2 names from cwd-relative to repository-relative. After checking git status -h (-z, --[no-]null is documented as “terminate entries with NUL”), I reproduced from /repo/nested that the line form reports ? new.ts while this command reports ? nested/new.ts\0. stageCommitChanges still invokes git --literal-pathspecs add in /repo/nested, so once the user unchecks any file, the selected path resolves to /repo/nested/nested/new.ts and the commit fails with an unmatched pathspec; use a top-anchored literal pathspec (as diffCheckpoints does) or stage from the worktree root.

Useful? React with 👍 / 👎.

[Atharvsinh-codez]

Good catch, confirmed. From /repo/nested, git status --porcelain=2 prints ? new.ts but -z prints ? nested/new.ts. Numstat was already root-relative before this PR, so tracked edits in a nested project were already failing this way. The -z change would have made untracked files fail too.

Fixed in f21194c. Selected files are now staged with :(top,literal) pathspecs, the same way diffCheckpoints does it. I also added commits selected files from a nested project directory, which fails without the staging change and passes with it.

[juliusmarminge]

Taking over this one. I’ll reduce the tests to the useful coverage, update the implementation against current main, and verify it before publishing the changes.