Fix copilot and git related scripts execution#736
Conversation
… contain required libs Signed-off-by: Roman Nikitenko <rnikiten@redhat.com> Assisted-by: Cursor AI
… not contain required libs Signed-off-by: Roman Nikitenko <rnikiten@redhat.com> Assisted-by: Cursor AI
|
Click here to review and test in web IDE: |
&message=Dev%20cluster%20(for%20maintainers)&logo=eclipseche&color=525C86&labelColor=FDB940)
|
Hi! I'm che-ai-assistant — I help with your pull requests. Available commands:
|
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
|
Pull Request images published ✨ Editor amd64: quay.io/che-incubator-pull-requests/che-code:pr-736-amd64 |
1 similar comment
|
Pull Request images published ✨ Editor amd64: quay.io/che-incubator-pull-requests/che-code:pr-736-amd64 |
RomanNikitenko
requested review from
azatsarynnyy,
rgrunber and
vitaliy-guliy
as code owners
📝 WalkthroughWalkthroughGit and Copilot shell wrappers now prepend bundled ChangesBundled Node library path updates
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
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 @.rebase/CHANGELOG.md:
- Around line 5-13: The changelog entry under the contributor name is using a
fourth-level heading and skips the required heading hierarchy. Update the
heading in the referenced changelog section to an H2 so it stays consistent with
the surrounding markdown structure and avoids markdownlint failures; adjust the
heading for the entry that lists the affected scripts and copilot files.
In `@rebase.sh`:
- Around line 417-422: `resolve_conflicts()` is missing a branch for
`.rebase/CHANGELOG.md`, so that file falls through to the manual-conflict
fallback. Add a new `elif` in the conflict dispatch alongside the existing
file-specific handlers (for example near the `code/extensions/git/src/*` cases)
that routes `.rebase/CHANGELOG.md` to the appropriate resolution helper,
preventing the rebase flow from stopping on that file.
🪄 Autofix (Beta)
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: defaults
Review profile: CHILL
Plan: Pro
Run ID: 26beb3ec-28af-4146-9152-9382d44900dd
📒 Files selected for processing (12)
.rebase/CHANGELOG.md.rebase/replace/code/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLITerminalIntegration.ts.json.rebase/replace/code/extensions/copilot/src/extension/onboardDebug/vscode-node/copilotDebugCommandContribution.ts.json.rebase/replace/code/extensions/git/src/askpass.sh.json.rebase/replace/code/extensions/git/src/git-editor.sh.json.rebase/replace/code/extensions/git/src/ssh-askpass.sh.jsoncode/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLITerminalIntegration.tscode/extensions/copilot/src/extension/onboardDebug/vscode-node/copilotDebugCommandContribution.tscode/extensions/git/src/askpass.shcode/extensions/git/src/git-editor.shcode/extensions/git/src/ssh-askpass.shrebase.sh
| #### @RomanNikitenko | ||
| https://github.com/che-incubator/che-code/pull/736 | ||
|
|
||
| - code/extensions/git/src/askpass.sh | ||
| - code/extensions/git/src/ssh-askpass.sh | ||
| - code/extensions/git/src/git-editor.sh | ||
| - code/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLITerminalIntegration.ts | ||
| - code/extensions/copilot/src/extension/onboardDebug/vscode-node/copilotDebugCommandContribution.ts | ||
| --- |
There was a problem hiding this comment.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Use an H2 here to keep heading levels valid.
This new #### skips heading levels and is already tripping markdownlint on Line 5.
Suggested fix
-#### `@RomanNikitenko`
+## `@RomanNikitenko`📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| #### @RomanNikitenko | |
| https://github.com/che-incubator/che-code/pull/736 | |
| - code/extensions/git/src/askpass.sh | |
| - code/extensions/git/src/ssh-askpass.sh | |
| - code/extensions/git/src/git-editor.sh | |
| - code/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLITerminalIntegration.ts | |
| - code/extensions/copilot/src/extension/onboardDebug/vscode-node/copilotDebugCommandContribution.ts | |
| --- | |
| ## `@RomanNikitenko` | |
| https://github.com/che-incubator/che-code/pull/736 | |
| - code/extensions/git/src/askpass.sh | |
| - code/extensions/git/src/ssh-askpass.sh | |
| - code/extensions/git/src/git-editor.sh | |
| - code/extensions/copilot/src/extension/chatSessions/vscode-node/copilotCLITerminalIntegration.ts | |
| - code/extensions/copilot/src/extension/onboardDebug/vscode-node/copilotDebugCommandContribution.ts | |
| --- |
🧰 Tools
🪛 markdownlint-cli2 (0.22.1)
[warning] 5-5: Heading levels should only increment by one level at a time
Expected: h2; Actual: h4
(MD001, heading-increment)
🤖 Prompt for 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.
In @.rebase/CHANGELOG.md around lines 5 - 13, The changelog entry under the
contributor name is using a fourth-level heading and skips the required heading
hierarchy. Update the heading in the referenced changelog section to an H2 so it
stays consistent with the surrounding markdown structure and avoids markdownlint
failures; adjust the heading for the entry that lists the affected scripts and
copilot files.
Source: Linters/SAST tools
| elif [[ "$conflictingFile" == "code/extensions/git/src/askpass.sh" ]]; then | ||
| apply_changes_multi_line "$conflictingFile" | ||
| elif [[ "$conflictingFile" == "code/extensions/git/src/ssh-askpass.sh" ]]; then | ||
| apply_changes_multi_line "$conflictingFile" | ||
| elif [[ "$conflictingFile" == "code/extensions/git/src/git-editor.sh" ]]; then | ||
| apply_changes_multi_line "$conflictingFile" |
There was a problem hiding this comment.
🩺 Stability & Availability | 🟠 Major | ⚡ Quick win
Add a resolver for .rebase/CHANGELOG.md.
This PR updates .rebase/CHANGELOG.md, but resolve_conflicts() still has no branch for it. If that file conflicts, the fallback at Lines 521-536 exits on che-specific files with no rule, so the automated rebase flow still stops manually.
Also applies to: 501-504
🤖 Prompt for 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.
In `@rebase.sh` around lines 417 - 422, `resolve_conflicts()` is missing a branch
for `.rebase/CHANGELOG.md`, so that file falls through to the manual-conflict
fallback. Add a new `elif` in the conflict dispatch alongside the existing
file-specific handlers (for example near the `code/extensions/git/src/*` cases)
that routes `.rebase/CHANGELOG.md` to the appropriate resolution helper,
preventing the rebase flow from stopping on that file.
3 participants
What does this PR do?
copilotproblem in a terminal:Git clonefor a private repoWhat issues does this PR fix?
https://redhat.atlassian.net/browse/CRW-11371
How to test this PR?
copilotuse casecopilotExpected behavior:
git.terminalGitEditortotruein VS Code settingsecho test >> file.txt && git add file.txtgit commit(without-m)Expected behavior:
Git clonefor a private repogit clone https://github.com/RomanNikitenko/private-test-repo.gitExpected behavior:
Device Auth flow is triggered
Private repo cloned successfully
Does this PR contain changes that override default upstream Code-OSS behavior?
git rebasewere added to the .rebase folderSummary by CodeRabbit