Adds AI powered explain feature of a branch by sergeibbb · Pull Request #4522 · gitkraken/vscode-gitlens

sergeibbb · 2025-08-06T22:37:26Z

Description

Resolves #4443

Graph:

Panel:

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

Introduces new AI-assisted commands to recompose all branch commits and specifically unpushed commits via the graph webview. (#4443, #4522)

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)

(#4443, #4522)

This uses the user defined value first and only when it's not set we fall back to other possible values. (#4443, #4522)

(#4443, #4522)

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)

Introduces new AI-assisted commands to recompose all branch commits and specifically unpushed commits via the graph webview. (#4443, #4522)

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)

(#4443, #4522)

This uses the user defined value first and only when it's not set we fall back to other possible values. (#4443, #4522)

(#4443, #4522)

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)

Introduces new AI-assisted commands to recompose all branch commits and specifically unpushed commits via the graph webview. (#4443, #4522)

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)

(#4443, #4522)

This uses the user defined value first and only when it's not set we fall back to other possible values. (#4443, #4522)

(#4443, #4522)

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)

(#4443, #4522)

Introduces new AI-assisted commands to recompose all branch commits and specifically unpushed commits via the graph webview. (#4443, #4522)

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)

(#4443, #4522)

This uses the user defined value first and only when it's not set we fall back to other possible values. (#4443, #4522)

(#4443, #4522)

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)

(#4443, #4522)

ramin-t · 2025-09-08T16:32:00Z

src/constants.commands.ts

+	| 'gitlens.ai.aiRebaseBranch:graph'
+	| 'gitlens.ai.aiRebaseUnpushed:graph'


Why are these listed under InternalGraphWebviewCommands? In contributions it looks like they are fully exposed graph commands?

src/constants.ts

ramin-t · 2025-09-08T16:38:23Z

src/git/utils/-webview/branch.utils.ts

+/**
+ * Selects the most recent merge base from multiple target branches.
+ * This is the same logic used in graph.ts selectMostRecentMergeBase method.
+ */
+async function selectMostRecentMergeBase(
+	branchName: string,
+	targets: string[],
+	svc: ReturnType<typeof Container.prototype.git.getRepositoryService>,
+): Promise<{ commit: string; branch: string } | undefined> {
+	const mergeBaseResults = await Promise.allSettled(
+		targets.map(async target => {
+			const commit = await svc.refs.getMergeBase(branchName, target);
+			return {
+				commit: commit,
+				branch: target,
+			};
+		}),
+	);
+	const mergeBases = mergeBaseResults
+		.map(result => getSettledValue(result))
+		.filter((r): r is { commit: string; branch: string } => r?.commit != null);
+
+	if (mergeBases.length === 0) return undefined;
+
+	let mostRecentMergeBase = mergeBases[0];
+	for (let i = 1; i < mergeBases.length; i++) {
+		const isCurrentMoreRecent = await svc.commits.isAncestorOf(mostRecentMergeBase?.commit, mergeBases[i].commit);
+		if (isCurrentMoreRecent) {
+			mostRecentMergeBase = mergeBases[i];
+		}
+	}
+
+	return mostRecentMergeBase;
+}


Can I get a more detailed rundown of what this function is doing? Also, if it already exists in graph.ts, can we just have that import from here so we aren't duplicating logic?

@axosoft-ramint
I've added to the explanation and removed the obsolete sentence about the duplication:

/** * Selects the most recent merge base from multiple target branches. * * It gets the merge base for each target, then uses isAncestorOf() to find which one is newest. */

The story was that I've implemented originally in graph, then created the dupe here and marked it in the comment. But eventually I refactored to re-use this function everywhere so it's stopped being duplicated, but the explanation phrase has left.

@axosoft-ramint

I've updated the code according to your notes above. Also I've refreshed the branch and fixed the conflicts.

The question now is the following: should I actually call "Rebase" action, or is it better to try to launch the Commit Composer?

cc @justinrobots

sergeibbb · 2025-10-02T12:50:32Z

@axosoft-ramint , @ericf-axosoft

I've moved "recompose" related part of requirements and the code to another PR draft: #4644

All other review notes has been attended.

cc @justinrobots

ramin-t

The context calculations are tanking graph performance. We need to find a lighter way to get that context included.

ramin-t · 2025-10-03T17:21:11Z

src/env/node/git/sub-providers/graph.ts

+							const mergeBaseResult =
+								branch && (await getBranchMergeBaseAndCommonCommit(this.container, branch));
+							const isRecomposable = Boolean(mergeBaseResult && mergeBaseResult.commit !== branch?.sha);
+							const mergeBase = isRecomposable ? mergeBaseResult : undefined;


It seems these calculations are expensive in some cases, especially when placed in the main graph loop.

Without these operations (commented out and left out of context), I can load the graph for my test repo (not a very large one) in about 5 seconds:

Same repo, same graph, with these operations, takes nearly 2 minutes to load:

Let me know if you need any details about my repo/branches/commits that would help with reproducing this.

@axosoft-ramint I've moved more changes out to rebase related branch. So, the problem can be handled in a future PR. Now this PR only contains Explain related changes that are not bring new calculations to rendering.

Also adds more item context for new AI-assisted commands to explain unpushed changes (#4443, #4522)

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)

(#4443, #4522)

sergeibbb marked this pull request as draft August 6, 2025 22:38

sergeibbb added a commit that referenced this pull request Aug 7, 2025

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

Triggers an AI-powered rebase over target branch

df99cc2

(#4443, #4522)

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

Triggers an AI-powered rebase for unpushed changes

ddb6ee3

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 7, 2025

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

Includes remote flag in merge base branch context

980d12a

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 7, 2025

Falls back to default branch in graph.getMergeBase

d20239d

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 7, 2025

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

Add AI-powered explanation for unpushed branch changes.

568e4be

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 8, 2025

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

Triggers an AI-powered rebase over target branch

2f9254f

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 8, 2025

Triggers an AI-powered rebase for unpushed changes

3aff869

(#4443, #4522)

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

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

Includes remote flag in merge base branch context

4b85982

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 8, 2025

Falls back to default branch in graph.getMergeBase

a6a23eb

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 8, 2025

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

Add AI-powered explanation for unpushed branch changes.

bd9cbc5

(#4443, #4522)

sergeibbb marked this pull request as ready for review August 8, 2025 00:18

sergeibbb added a commit that referenced this pull request Aug 8, 2025

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 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

Triggers an AI-powered rebase over target branch

4acc49e

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 8, 2025

Triggers an AI-powered rebase for unpushed changes

1431f91

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 8, 2025

Rebases branch over its target rather than over common commit.

d346e11

(#4443, #4522)

sergeibbb force-pushed the feature/4443-ai-rebase-on-branch branch from 0c7d889 to 61a93c6 Compare August 19, 2025 12:48

sergeibbb added a commit that referenced this pull request Aug 19, 2025

Triggers an AI-powered rebase for unpushed changes

fb4e98b

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 19, 2025

Rebases branch over its target rather than over common commit.

fd54b72

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 19, 2025

Includes remote flag in merge base branch context

9e4ea47

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 19, 2025

Falls back to default branch in graph.getMergeBase

31f72c3

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 19, 2025

Adds storedMergeTargetBranch in merge target search util function

6091397

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 19, 2025

Add AI-powered explanation for unpushed branch changes.

511cc8b

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 19, 2025

Clarifies Git merge base and target config key semantics

358b279

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Aug 19, 2025

Updates CHANGELOG by describing new AI powered actions on a branch

61a93c6

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Sep 3, 2025

Prepares space for future AI-powered recompose actions for a branch

4704936

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 Sep 3, 2025

Triggers an AI-powered rebase over target branch

9d08446

(#4443, #4522)

sergeibbb force-pushed the feature/4443-ai-rebase-on-branch branch from 61a93c6 to aceac5f Compare September 3, 2025 10:41

sergeibbb added a commit that referenced this pull request Sep 3, 2025

Triggers an AI-powered rebase for unpushed changes

9d0349b

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Sep 3, 2025

Rebases branch over its target rather than over common commit.

17c2915

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Sep 3, 2025

Includes remote flag in merge base branch context

4de2bfb

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Sep 3, 2025

Falls back to default branch in graph.getMergeBase

de01bab

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Sep 3, 2025

Adds storedMergeTargetBranch in merge target search util function

ea8a734

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 Sep 3, 2025

Add AI-powered explanation for unpushed branch changes.

176dfd2

(#4443, #4522)

sergeibbb added a commit that referenced this pull request Sep 3, 2025

Clarifies Git merge base and target config key semantics

ce96329

(#4443, #4522)

ramin-t reviewed Sep 8, 2025

View reviewed changes

ramin-t requested changes Oct 3, 2025

View reviewed changes

d13 approved these changes Oct 17, 2025

View reviewed changes

sergeibbb added 4 commits November 4, 2025 15:30

Adds AI-powered explanation for unpushed branch changes on Graph View

b235339

Also adds more item context for new AI-assisted commands to explain unpushed changes (#4443, #4522)

Clarifies Git merge base and target config key semantics

84fed4f

(#4443, #4522)

Updates CHANGELOG by describing new AI powered actions on a branch

d532af2

(#4443, #4522)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds AI powered explain feature of a branch#4522

Adds AI powered explain feature of a branch#4522
sergeibbb merged 4 commits intomainfrom
feature/4443-ai-rebase-on-branch

sergeibbb commented Aug 6, 2025 •

edited

Loading

Uh oh!

ramin-t Sep 8, 2025

Uh oh!

sergeibbb Sep 9, 2025

Uh oh!

Uh oh!

ramin-t Sep 8, 2025

Uh oh!

sergeibbb Sep 9, 2025

Uh oh!

sergeibbb Oct 1, 2025

Uh oh!

sergeibbb commented Oct 2, 2025

Uh oh!

ramin-t left a comment

Uh oh!

ramin-t Oct 3, 2025 •

edited

Loading

Uh oh!

ramin-t Oct 3, 2025

Uh oh!

sergeibbb Oct 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		\| 'gitlens.ai.aiRebaseBranch:graph'
		\| 'gitlens.ai.aiRebaseUnpushed:graph'

Conversation

sergeibbb commented Aug 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Uh oh!

ramin-t Sep 8, 2025

Choose a reason for hiding this comment

Uh oh!

sergeibbb Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ramin-t Sep 8, 2025

Choose a reason for hiding this comment

Uh oh!

sergeibbb Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

sergeibbb Oct 1, 2025

Choose a reason for hiding this comment

Uh oh!

sergeibbb commented Oct 2, 2025

Uh oh!

ramin-t left a comment

Choose a reason for hiding this comment

Uh oh!

ramin-t Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ramin-t Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

sergeibbb Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

sergeibbb commented Aug 6, 2025 •

edited

Loading

ramin-t Oct 3, 2025 •

edited

Loading