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

Introduces new AI-assisted commands to recompose all branch commits
and specifically unpushed commits via the graph webview.

(#4443, #4522)

Author: sergeibbb

contributions.json

@@ -23,6 +23,32 @@
 				]
 			}
 		},
+		"gitlens.ai.aiRebaseBranch:graph": {
+			"label": "AI Recompose branch commits (Preview)...",
+			"icon": "$(sparkle)",
+			"menus": {
+				"webview/context": [
+					{
+						"when": "webviewItem =~ /gitlens:branch\\b/ && !listMultiSelection",
+						"group": "1_gitlens_actions",
+						"order": 6
+					}
+				]
+			}
+		},
+		"gitlens.ai.aiRebaseUnpushed:graph": {
+			"label": "AI Recompose unpushed commits (Preview)...",
+			"icon": "$(sparkle)",
+			"menus": {
+				"webview/context": [
+					{
+						"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
+						"group": "1_gitlens_actions",
+						"order": 7
+					}
+				]
+			}
+		},
 		"gitlens.ai.explainBranch": {
 			"label": "Explain Branch Changes (Preview)...",
 			"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"

docs/telemetry-events.md

@@ -6147,6 +6147,16 @@
 				"category": "GitLens",
 				"icon": "$(person-add)"
 			},
+			{
+				"command": "gitlens.ai.aiRebaseBranch:graph",
+				"title": "AI Recompose branch commits (Preview)...",
+				"icon": "$(sparkle)"
+			},
+			{
+				"command": "gitlens.ai.aiRebaseUnpushed:graph",
+				"title": "AI Recompose unpushed commits (Preview)...",
+				"icon": "$(sparkle)"
+			},
 			{
 				"command": "gitlens.ai.explainBranch",
 				"title": "Explain Branch Changes (Preview)...",
@@ -10796,6 +10806,14 @@
 					"command": "gitlens.addAuthors",
 					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders"
 				},
+				{
+					"command": "gitlens.ai.aiRebaseBranch:graph",
+					"when": "false"
+				},
+				{
+					"command": "gitlens.ai.aiRebaseUnpushed:graph",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.ai.explainBranch",
 					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
@@ -22832,6 +22850,16 @@
 					"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(remote|tracking)\\b)(?!.*?\\b\\+closed\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:repos:withRemotes",
 					"group": "1_gitlens_actions@3"
 				},
+				{
+					"command": "gitlens.ai.aiRebaseBranch:graph",
+					"when": "webviewItem =~ /gitlens:branch\\b/ && !listMultiSelection",
+					"group": "1_gitlens_actions@6"
+				},
+				{
+					"command": "gitlens.ai.aiRebaseUnpushed:graph",
+					"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
+					"group": "1_gitlens_actions@7"
+				},
 				{
 					"command": "gitlens.graph.mergeBranchInto",
 					"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",

package.json

@@ -4,6 +4,8 @@
 export type ContributedCommands =
 	| ContributedKeybindingCommands
 	| ContributedPaletteCommands
+	| 'gitlens.ai.aiRebaseBranch:graph'
+	| 'gitlens.ai.aiRebaseUnpushed:graph'
 	| 'gitlens.ai.explainBranch:graph'
 	| 'gitlens.ai.explainBranch:views'
 	| 'gitlens.ai.explainCommit:graph'

src/constants.commands.generated.ts

@@ -31,6 +31,8 @@ export type GlCommandsDeprecated =
 	| 'gitlens.showFileHistoryInView';
 
 type InternalGraphWebviewCommands =
+	| 'gitlens.ai.aiRebaseBranch:graph'
+	| 'gitlens.ai.aiRebaseUnpushed:graph'
 	| 'gitlens.graph.abortPausedOperation'
 	| 'gitlens.graph.continuePausedOperation'
 	| 'gitlens.graph.openRebaseEditor'

src/constants.commands.ts

@@ -356,7 +356,9 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 										: branchIdOfMainWorktree === branchId
 											? '+checkedout'
 											: ''
-								}${branch?.starred ? '+starred' : ''}`,
+								}${branch?.starred ? '+starred' : ''}${branch?.upstream?.state.ahead ? '+ahead' : ''}${
+									branch?.upstream?.state.behind ? '+behind' : ''
+								}`,
 								webviewItemValue: {
 									type: 'branch',
 									ref: createReference(tip, repoPath, {

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

@@ -525,6 +525,8 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			this.host.registerWebviewCommand('gitlens.graph.rebaseOntoUpstream', this.rebaseToRemote),
 			this.host.registerWebviewCommand('gitlens.graph.renameBranch', this.renameBranch),
 			this.host.registerWebviewCommand('gitlens.graph.associateIssueWithBranch', this.associateIssueWithBranch),
+			this.host.registerWebviewCommand('gitlens.ai.aiRebaseBranch:graph', this.aiRebaseBranch),
+			this.host.registerWebviewCommand('gitlens.ai.aiRebaseUnpushed:graph', this.aiRebaseUnpushed),
 
 			this.host.registerWebviewCommand('gitlens.graph.switchToBranch', this.switchTo),
 
@@ -3242,6 +3244,23 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		return Promise.resolve();
 	}
 
+	@log()
+	private aiRebaseBranch(item?: GraphItemContext) {
+		if (isGraphItemRefContext(item, 'branch')) {
+		}
+
+		return Promise.resolve();
+	}
+
+	@log()
+	private aiRebaseUnpushed(item?: GraphItemContext) {
+		if (isGraphItemRefContext(item, 'branch')) {
+			const { ref } = item.webviewItemValue;
+		}
+
+		return Promise.resolve();
+	}
+
 	@log()
 	private cherryPick(item?: GraphItemContext) {
 		const { selection } = this.getGraphItemRefs(item, 'revision');