fix(git): include untracked files in diffs by 404-Page-Found · Pull Request #250 · 404-PF/commit-echo

404-Page-Found · 2026-07-28T08:15:57Z

Summary

Ensures the single-repository suggestion flow recognizes and analyzes untracked files when no staged changes exist.

Changes

Discover non-ignored untracked files with Git.
Generate no-index diffs for those files.
Combine them with ordinary unstaged changes.
Add regression coverage for an untracked-only working tree.

Testing

npm run build
node --test tests/git-diff.test.mjs

Summary by CodeRabbit

Bug Fixes
- Unstaged diffs now include untracked files and embedded Git repositories.
- Git operations are more reliable across platforms and handle repository checks consistently.
- Improved cleanup and error handling during diff generation.
Tests
- Added coverage for untracked files and embedded repositories in unstaged diff results.

Generate no-index diffs for untracked files during unstaged detection. Closes #198

coderabbitai · 2026-07-28T08:16:06Z

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

@coderabbitai resume to resume automatic reviews.
@coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

▶️ Resume reviews
🔍 Trigger review

📝 Walkthrough

Walkthrough

Git operations now use a cached, platform-specific executable path and explicit argument arrays. Unstaged diffs now include untracked files and nested Git repositories through temporary-index handling. Tests cover file content and Gitlink mode output.

Changes

Git diff execution and untracked-file handling

Layer / File(s)	Summary
Git executable resolution and invocation `src/git/diff.ts`	Git commands resolve an executable across platform-specific locations and use explicit argument arrays. Existing repository, diff, commit, and metadata operations retain their behavior.
Untracked file diff generation `src/git/diff.ts`	Unstaged diff generation uses a temporary index with intent-to-add entries, combines tracked and untracked changes, and cleans up temporary resources.
Untracked diff validation `tests/git-diff.test.mjs`	Tests verify untracked file content and nested Git repositories with Gitlink mode `160000`.

Estimated code review effort: 4 (Complex) | ~45 minutes

Sequence Diagram(s)

sequenceDiagram
  participant Caller
  participant getUnstagedDiff
  participant GitExecutable
  participant TemporaryIndex
  Caller->>getUnstagedDiff: request unstaged diff
  getUnstagedDiff->>TemporaryIndex: create temporary index
  getUnstagedDiff->>GitExecutable: add untracked paths and generate diff
  GitExecutable-->>getUnstagedDiff: tracked and untracked diff
  getUnstagedDiff->>TemporaryIndex: clean up temporary resources
  getUnstagedDiff-->>Caller: return diff result

Possibly related PRs

404-PF/commit-echo#190: Modifies Git executable handling and repository error behavior in src/git/diff.ts.
404-PF/commit-echo#137: Uses getUnstagedDiff in the suggestion flow.
404-PF/commit-echo#128: Modifies getStagedDiff and getUnstagedDiff behavior.

Suggested reviewers: nightcityblade, peter7896, mohammadyusif

Poem

I’m a rabbit with Git in my paws,
New files now show without hidden flaws.
Temporary indexes hop, then depart,
Nested repos leave their mode in the chart.
Safe paths guide each command through,
And tests prove the diff is true.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Out of Scope Changes check	⚠️ Warning	The Git executable discovery, caching, and command-execution refactor is not required by issue `#198`.	Separate the executable-resolution and command-execution refactor, or document its direct necessity for untracked-file diff detection.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly describes the main change: including untracked files in Git diffs.
Linked Issues check	✅ Passed	The implementation includes untracked files and embedded repositories in unstaged diffs, satisfying issue `#198`.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

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

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

404-Page-Found · 2026-07-28T08:20:24Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 23a1bbfe08

ℹ️ 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".

404-Page-Found · 2026-08-04T08:33:13Z

@cubic-dev-ai

cubic-dev-ai · 2026-08-04T08:33:19Z

@cubic-dev-ai

@404-Page-Found I have started the AI code review. It will take a few minutes to complete.

cubic-dev-ai

All reported issues were addressed across 2 files

_{Reply with feedback, questions, or to request a fix.

Fix all with cubic | Re-trigger cubic}

Use a temporary index to generate untracked diffs in one Git pass, including embedded repositories without mutating the real index. Resolve Git to an absolute executable path before running commands. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

coderabbitai

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/git/diff.ts`:
- Around line 41-84: The resolveGitExecutable function has cognitive complexity
of 17, exceeding the limit of 15. Extract the Windows-specific candidate
collection logic (the if (process.platform === 'win32') block that handles
programFiles and localAppData) into a separate helper function, and extract the
Unix-specific candidate collection logic (the else block with hardcoded paths)
into another separate helper function. Replace these blocks in
resolveGitExecutable with calls to these new helpers that return arrays of
candidates, reducing the nested conditionals and loops in the main function.
- Around line 173-214: Update the untracked-diff aggregation around the
temporary-index diff helper and getUnstagedDiff so the diff produced by git diff
with the temporary index is treated as the complete result when untracked
pathspecs exist, without appending trackedDiff again. Add a regression test
covering one tracked modification plus one untracked file and verify each
tracked hunk appears only once.

🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

Push a commit to this branch (recommended)
Create a new PR with the fixes

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 213286cb-3ccd-4cb8-9892-7850065425e2

📥 Commits

Reviewing files that changed from the base of the PR and between 76c6e18 and e6a96ac.

📒 Files selected for processing (2)

src/git/diff.ts
tests/git-diff.test.mjs

📜 Review details

⏰ Context from checks skipped due to timeout. (1)

GitHub Check: cubic · AI code reviewer

🧰 Additional context used

📓 Path-based instructions (3)

tests/**/*.mjs

📄 CodeRabbit inference engine (AGENTS.md)

tests/**/*.mjs: Use Node.js built-in node:test for test files in tests/ and tests/e2e/; do not use Jest or Mocha.
Write test assertions with node:assert/strict in test files under tests/ and tests/e2e/.

Files:

tests/git-diff.test.mjs

src/**/*.ts

📄 CodeRabbit inference engine (AGENTS.md)

The project is ESM-only: use .js extensions in local imports and keep verbatimModuleSyntax-compatible TypeScript imports (for example, import type for type-only imports).

Files:

src/git/diff.ts

src/git/**/*.ts

📄 CodeRabbit inference engine (AGENTS.md)

Git operations should use execSync/spawnSync rather than simple-git; diff buffering must stay within the 100MB limit, and commits should use temp files via git commit -F.

Files:

src/git/diff.ts

🪛 ast-grep (0.45.0)

src/git/diff.ts

[warning] Importing child_process exposes a command-execution surface; ensure any command/argument built from input is validated, and prefer execFile/spawn with an argument array over exec.
Context: import { execFileSync, spawnSync } from 'node:child_process';
Note: [CWE-78] Improper Neutralization of Special Elements used in an OS Command ('OS Command Injection').