Skip to content

Adds AI powered rebase and explain feature of a branch #4522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Adds AI powered rebase and explain feature of a branch #4522

wants to merge 12 commits into from
+447 −14

Conversation

sergeibbb
Copy link
Member

@sergeibbb sergeibbb commented Aug 6, 2025 •
edited
Loading

Description

Resolves #4443

image

Checklist

  • I have followed the guidelines in the Contributing document
  • My changes follow the coding style of this project
  • My changes build without any errors or warnings
  • My changes have been formatted and linted
  • My changes include any required corresponding changes to the documentation (including CHANGELOG.md and README.md)
  • My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
  • My changes have a descriptive commit message with a short title, including a Fixes $XXX - or Closes #XXX - prefix to auto-close the issue that your PR addresses

@sergeibbb sergeibbb marked this pull request as draft August 6, 2025 22:38
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Prepares space for future AI-powered recompose actions for a branch
a69f523 
Introduces new AI-assisted commands to recompose all branch commits
and specifically unpushed commits via the graph webview.

(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Shows AI rebase option only for recomposable branches
b464bb0 
Updates branch context detection to add a '+recomposable' flag for branches that have commits eligible for recomposition, determined by checking recent merge bases against stored targets. Adjusts menu conditions so the AI rebase command is shown only when a branch can be recomposed, preventing unnecessary options for branches without suitable commits.

(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Triggers an AI-powered rebase over target branch
df99cc2 
(#4443, #4522)
@sergeibbb sergeibbb force-pushed the feature/4443-ai-rebase-on-branch branch from 3fe767e to 7de9ae3 Compare August 7, 2025 23:23
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Triggers an AI-powered rebase for unpushed changes
ddb6ee3 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Rebases branch over its target rather than over common commit.
c1be061 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Includes remote flag in merge base branch context
980d12a 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Falls back to default branch in graph.getMergeBase
d20239d 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Adds storedMergeTargetBranch in merge target search util function
1f0d833 
This uses the user defined value first and only when it's not set we
fall back to other possible values.
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Add AI-powered explanation for unpushed branch changes.
568e4be 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 7, 2025
@sergeibbb
Add AI explain and recompose branch actions to Branch Views
7de9ae3 
Introduces AI-powered branch actions ("Recompose" and "Explain") directly into the branches view, enabling context menu options when branches are recomposable or have unpushed commits. Refactors and centralizes branch recomposability detection to ensure consistent logic across graph and views, improving maintainability and user experience. Enhances discoverability and workflow integration for AI-assisted Git operations.

(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Prepares space for future AI-powered recompose actions for a branch
f778e23 
Introduces new AI-assisted commands to recompose all branch commits
and specifically unpushed commits via the graph webview.

(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Shows AI rebase option only for recomposable branches
7a06e5e 
Updates branch context detection to add a '+recomposable' flag for branches that have commits eligible for recomposition, determined by checking recent merge bases against stored targets. Adjusts menu conditions so the AI rebase command is shown only when a branch can be recomposed, preventing unnecessary options for branches without suitable commits.

(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Triggers an AI-powered rebase over target branch
2f9254f 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Triggers an AI-powered rebase for unpushed changes
3aff869 
(#4443, #4522)
@sergeibbb sergeibbb force-pushed the feature/4443-ai-rebase-on-branch branch from 7de9ae3 to 5153fa9 Compare August 8, 2025 00:14
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Rebases branch over its target rather than over common commit.
92c34aa 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Includes remote flag in merge base branch context
4b85982 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Falls back to default branch in graph.getMergeBase
a6a23eb 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Adds storedMergeTargetBranch in merge target search util function
4c5d20f 
This uses the user defined value first and only when it's not set we
fall back to other possible values.
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Add AI-powered explanation for unpushed branch changes.
bd9cbc5 
(#4443, #4522)
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Add AI explain and recompose branch actions to Branch Views
5153fa9 
Introduces AI-powered branch actions ("Recompose" and "Explain") directly into the branches view, enabling context menu options when branches are recomposable or have unpushed commits. Refactors and centralizes branch recomposability detection to ensure consistent logic across graph and views, improving maintainability and user experience. Enhances discoverability and workflow integration for AI-assisted Git operations.

(#4443, #4522)
@sergeibbb sergeibbb marked this pull request as ready for review August 8, 2025 00:18
@sergeibbb
Prepares space for future AI-powered recompose actions for a branch
21e1a05 
Introduces new AI-assisted commands to recompose all branch commits
and specifically unpushed commits via the graph webview.

(#4443, #4522)
@sergeibbb
Shows AI rebase option only for recomposable branches
f8512e3 
Updates branch context detection to add a '+recomposable' flag for branches that have commits eligible for recomposition, determined by checking recent merge bases against stored targets. Adjusts menu conditions so the AI rebase command is shown only when a branch can be recomposed, preventing unnecessary options for branches without suitable commits.

(#4443, #4522)
@sergeibbb
Triggers an AI-powered rebase over target branch
4acc49e 
(#4443, #4522)
@sergeibbb
Triggers an AI-powered rebase for unpushed changes
1431f91 
(#4443, #4522)
@sergeibbb
Rebases branch over its target rather than over common commit.
d346e11 
(#4443, #4522)
@sergeibbb
Includes remote flag in merge base branch context
90d0ecf 
(#4443, #4522)
@sergeibbb
Falls back to default branch in graph.getMergeBase
905948a 
(#4443, #4522)
@sergeibbb
Adds storedMergeTargetBranch in merge target search util function
9c04c31 
This uses the user defined value first and only when it's not set we
fall back to other possible values.
(#4443, #4522)
@sergeibbb
Add AI-powered explanation for unpushed branch changes.
f5a5a4e 
(#4443, #4522)
@sergeibbb
Add AI explain and recompose branch actions to Branch Views
2094d32 
Introduces AI-powered branch actions ("Recompose" and "Explain") directly into the branches view, enabling context menu options when branches are recomposable or have unpushed commits. Refactors and centralizes branch recomposability detection to ensure consistent logic across graph and views, improving maintainability and user experience. Enhances discoverability and workflow integration for AI-assisted Git operations.

(#4443, #4522)
@sergeibbb sergeibbb force-pushed the feature/4443-ai-rebase-on-branch branch from 5153fa9 to 2094d32 Compare August 8, 2025 00:19
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Clarifies Git merge base and target config key semantics
4a7643e 
(#4443, #4522)
@sergeibbb sergeibbb force-pushed the feature/4443-ai-rebase-on-branch branch from 4a7643e to 9d3487c Compare August 8, 2025 14:10
sergeibbb added a commit that referenced this pull request Aug 8, 2025
@sergeibbb
Clarifies Git merge base and target config key semantics
9d3487c 
(#4443, #4522)
@sergeibbb sergeibbb force-pushed the feature/4443-ai-rebase-on-branch branch from 9d3487c to 0c7d889 Compare August 8, 2025 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@axosoft-ramint axosoft-ramint Awaiting requested review from axosoft-ramint

@d13 d13 Awaiting requested review from d13

@eamodio eamodio Awaiting requested review from eamodio

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add an option to generate commits from all changes on a branch
1 participant
@sergeibbb