[codex] fix add case-renamed tracked paths by genedna · Pull Request #435 · libra-tools/libra

genedna · 2026-07-07T02:18:21Z

Summary

handle case-renamed tracked paths as aliases during libra add instead of reporting a false LBR-CASE-001 collision
keep real case-fold twins protected by comparing same-file identity before suppressing a collision
update status/untracked scanning so a case-renamed tracked directory does not continue to appear as ?? Slides/
add docs/development/experience/pr.md as a development note for the future libra pr command workflow; this is documentation-only and is kept here because the PR/review follow-up surfaced the workflow gap while validating this fix
align the GitHub Actions Corepack pnpm version with web/package.json (pnpm@11.10.0) because compat-web-check failed when the workflow prepared pnpm@11.1.0 against the repo-pinned package manager

Root Cause

On case-insensitive filesystems, a directory renamed from tracked slides/... to on-disk Slides/... resolves to the same files. libra add Slides matched those working-tree entries, but the add collision guard compared only folded path strings against the index and treated Slides/... as a new case-fold twin of tracked slides/....

The later compat-web-check failure was a CI/tooling mismatch, not a filesystem case-sensitivity failure: the workflow installed pnpm@11.1.0 while the web project pins pnpm@11.10.0.

Validation

cargo +nightly fmt --all --check
LIBRA_SKIP_WEB_BUILD=1 cargo test --lib
LIBRA_SKIP_WEB_BUILD=1 cargo test --lib utils::path_case::tests -- --nocapture
LIBRA_SKIP_WEB_BUILD=1 cargo test --lib utils::ignore::tests -- --nocapture
LIBRA_SKIP_WEB_BUILD=1 cargo test --lib command::status_untracked_paths::tests -- --nocapture
LIBRA_SKIP_WEB_BUILD=1 cargo test --test command_test case_handling_test -- --nocapture
LIBRA_SKIP_WEB_BUILD=1 cargo clippy --all-targets --all-features -- -D warnings
pnpm --dir web install --frozen-lockfile
pnpm --dir web lint
pnpm --dir web build
manual CLI repro in a temp repo: tracked slides/a.txt, renamed directory to Slides, then libra add Slides staged slides/a.txt as modified and status --short no longer reported ?? Slides/

Signed-off-by: Eli Ma <eli@patch.sh>

Signed-off-by: Quanyi Ma <eli@patch.sh>

Copilot

Pull request overview

This PR adjusts Libra’s case-handling on case-insensitive filesystems so that case-only renames of already-tracked paths are treated as aliases (same underlying filesystem entry) instead of triggering false LBR-CASE-001 collisions during libra add, and so status/untracked scanning stops reporting the renamed directory as ?? Slides/.

Changes:

Add a “same underlying entry” alias check (is_same_file_case_alias) and use it to suppress false case-fold collisions during libra add.
Update status and untracked scanning to treat case-renamed tracked paths as tracked aliases (preventing ?? Slides/ from persisting).
Add integration + unit tests covering the directory-alias add flow and the alias identity requirement.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
tests/command/case_handling_test.rs	Adds an integration test that reproduces the case-renamed tracked directory scenario and asserts correct staging/status JSON behavior.
src/utils/path_case.rs	Introduces `is_same_file_case_alias` and a unit test ensuring aliasing requires same-file identity (not just fold equality).
src/command/add.rs	Computes `ignore_case` once, threads a match context through pathspec logic, and suppresses false collisions when the candidate is a same-entry case alias.
src/command/status.rs	Suppresses “new/untracked” classification for worktree entries that are case-only aliases of tracked paths.
src/command/status_untracked.rs	Passes tracked-path context into file scanning so case-only aliases are treated as tracked during untracked enumeration.
src/command/status_untracked_paths.rs	Adds case-fold-aware tracked descendant detection and same-entry alias checks to avoid collapsing/reporting case-renamed tracked dirs as untracked.

…07-07) Signed-off-by: Eli Ma <eli@patch.sh>

Signed-off-by: Eli Ma <eli@patch.sh>

Signed-off-by: Quanyi Ma <eli@patch.sh>

Signed-off-by: Eli Ma <eli@patch.sh>

Signed-off-by: Quanyi Ma <eli@patch.sh>

Copilot

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.

genedna · 2026-07-07T03:40:16Z

@codex review

genedna · 2026-07-07T03:40:35Z

@claude review

Signed-off-by: Eli Ma <eli@patch.sh>

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 3 comments.

Signed-off-by: Eli Ma <eli@patch.sh>

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 2 comments.

Signed-off-by: Eli Ma <eli@patch.sh>

Resolve conflicts with main (8daec68, tracing plan §11 closeout): - docs/development/tracing/plan.md: resolved to main's version (current repo baseline, per instruction). Main's §11 "代码复核补充 (2026-07-08)" supersedes the PR's older §11 "未完成功能项复核 (2026-07-07)" (baseline 0.18.20): several UF items it listed as unfinished (stderr_days GC, CHANGELOG release notes, etc.) are already implemented on main. - .github/workflows/release.yml: auto-merged (union) — keeps main's Homebrew sha256/tap job (#436) and the PR's pnpm@11.10.0 bump. fmt --all --check and cargo check --all-targets are clean on the merge. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Js9hoPMCWu9Zj1sZbTMPMU

Copilot

Pull request overview

Copilot reviewed 11 out of 11 changed files in this pull request and generated no new comments.

genedna and others added 6 commits July 6, 2026 11:46

Update sandbox gap analytic

6d65393

Signed-off-by: Eli Ma <eli@patch.sh>

Merge origin/main into main

b9ddcfb

Merge origin/main into main

c5addb7

Merge origin/main into main

17e9791

fix(add): handle case-renamed tracked paths

2b34956

Signed-off-by: Eli Ma <eli@patch.sh>

fix(add): handle case-renamed tracked paths

f5f7c76

Signed-off-by: Quanyi Ma <eli@patch.sh>

Copilot AI review requested due to automatic review settings July 7, 2026 02:18

Copilot started reviewing on behalf of genedna July 7, 2026 02:18 View session

Copilot AI reviewed Jul 7, 2026

View reviewed changes

Comment thread src/command/status.rs Outdated

Comment thread src/command/status_untracked_paths.rs Outdated

Comment thread src/command/status_untracked_paths.rs Outdated

genedna marked this pull request as ready for review July 7, 2026 02:24

genedna added 5 commits July 7, 2026 10:36

docs(tracing): add section 11 unfinished-item completion audit (2026-…

c9dba58

…07-07) Signed-off-by: Eli Ma <eli@patch.sh>

fix(status): honor ignorecase for case aliases

107474c

Signed-off-by: Eli Ma <eli@patch.sh>

fix(status): honor ignorecase for case aliases

ccb8ae4

Signed-off-by: Quanyi Ma <eli@patch.sh>

docs(pr): add long-term GitHub PR creation solution design

72a4770

Signed-off-by: Eli Ma <eli@patch.sh>

docs: add PR plan and tracing audit

31c1731

Signed-off-by: Quanyi Ma <eli@patch.sh>

Copilot AI review requested due to automatic review settings July 7, 2026 02:56

Copilot started reviewing on behalf of genedna July 7, 2026 02:56 View session

Copilot AI reviewed Jul 7, 2026

View reviewed changes

Comment thread src/command/status.rs

genedna and others added 3 commits July 7, 2026 16:19

fix(status): honor ignorecase override in wrappers

fb8b86b

Signed-off-by: Eli Ma <eli@patch.sh>

Merge origin/codex/fix-add-case-alias into codex/fix-add-case-alias

8d3e500

ci(web): align pnpm version with web package

7bf6990

Signed-off-by: Eli Ma <eli@patch.sh>

Copilot AI review requested due to automatic review settings July 7, 2026 08:36

Copilot started reviewing on behalf of genedna July 7, 2026 08:37 View session

Copilot AI reviewed Jul 7, 2026

View reviewed changes

Comment thread web/package.json

Comment thread src/command/add.rs Outdated

Comment thread src/command/status_untracked_paths.rs Outdated

fix(status): stabilize ignorecase sync lookup

36d5204

Signed-off-by: Eli Ma <eli@patch.sh>

genedna requested a review from Copilot July 7, 2026 16:14

Copilot started reviewing on behalf of genedna July 7, 2026 16:14 View session

Copilot AI reviewed Jul 7, 2026

View reviewed changes

Comment thread src/command/status_untracked_paths.rs

Comment thread docs/development/experience/pr.md

genedna and others added 2 commits July 8, 2026 08:48

test(status): avoid sha1-only hash fixture

2012b5e

Signed-off-by: Eli Ma <eli@patch.sh>

Copilot AI review requested due to automatic review settings July 8, 2026 01:37

Copilot started reviewing on behalf of genedna July 8, 2026 01:37 View session

Copilot AI reviewed Jul 8, 2026

View reviewed changes

genedna merged commit 5d78e8b into main Jul 8, 2026
11 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[codex] fix add case-renamed tracked paths#435

[codex] fix add case-renamed tracked paths#435
genedna merged 17 commits into
mainfrom
codex/fix-add-case-alias

genedna commented Jul 7, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

genedna commented Jul 7, 2026

Uh oh!

genedna commented Jul 7, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

genedna commented Jul 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Root Cause

Validation

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

genedna commented Jul 7, 2026

Uh oh!

genedna commented Jul 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

genedna commented Jul 7, 2026 •

edited

Loading