feat: agentic git commit planner feature for improving commit quality by matbmoser · Pull Request #335291 · microsoft/vscode

Mathias Moser (matbmoser) · 2026-09-09T15:57:51Z

WHY

This PR is a proposal on how to include a git commit planner to visual studio code. The main idea is to allow the user instead of just generating a "message" for the commit, also allow copilot to "group" the files into different commits.

This is a problem which I am seeing specially on younger developers which are using AI and producing multiple changes and committing everything in one single commit, since "VS Code" only supports to generate "messages" for the commits (which is great!) but I believe it can even do more.

HOW

So I proposed to add one dropdown to the sparkle icon in the git extension:

Which allows copilot to:

Propose to use a commit plan (which you can accept, edit and delete) if you dont want
or in Agent mode organize your commits and commit for you (so you dont need to think)

I have tested in local and it works very well, more details are found in the issue.

WHAT

I have added a agenticCommitPlanner module which will basically iterate over the files and make a prompt for copilot to generate a JSON which we can show in the changes ui tool.
Also added commands to automatically execute this feature in the git extension.
Added some tools to accept/edit/delete the planned commits and the commit plan.

Feel free to add more, rename or close this PR, it should be just a proposal.

Copilot (Claude Opus 5) has assisted me on creating part of the code.

Closes #334943

…proposal resolution

Mathias Moser (matbmoser) · 2026-09-09T15:59:19Z

@microsoft-github-policy-service agree

Mathias Moser (matbmoser) · 2026-09-09T16:00:10Z

I am doing this for personal reasons, I have watched your documentary (very cool) and it inspired me to contribute features which may help me, my developers and others to be more effective with their commits.

I am currently active in Open Source projects from the Eclipse Foundation, so I am aware on how to work on open source. Hope I am supporting you on making this great product even better!

Copilot

🟡 Changes recommended

It includes unrelated/risky repo changes (settings + lockfiles) and the new planner flow needs fixes for cancellation/justification, plan lifecycle edge cases, and safer handling of staged/partially-staged state.

Once you've addressed the issues Copilot identified, you can request another Copilot review.

Pull request overview

This PR proposes an agentic commit planning feature in the Git extension: Copilot can generate a multi-commit plan (grouping changed files into logical commits) and preview it as a dedicated SCM provider, with commands to edit/rearrange and optionally create the commits.

Changes:

Add AgenticCommitPlanner / agenticCommitPlanner.ts to request a Copilot-generated commit plan, render it as SCM resource groups, and provide actions (edit message, move/remove files, view changes, create commits).
Wire new Git commands and SCM menus for generating a plan and acting on it.
Update localization strings for the new commands.

File summaries

File	Description
`extensions/git/src/commands.ts`	Registers new commands that delegate to `AgenticCommitPlanner`.
`extensions/git/src/agenticCommitPlanner.ts`	Implements commit-plan generation via `vscode.lm`, SCM preview UI, and commit creation workflow.
`extensions/git/package.json`	Contributes the new commands + SCM title/input/context menus.
`extensions/git/package.nls.json`	Adds localized titles for the new commands.
`.vscode/settings.json`	Adds a terminal auto-approve rule (appears unrelated to feature).
`package-lock.json`	Removes several `libc` constraints for linux platform packages (appears unrelated/risky).
`scripts/package-lock.json`	Adds an empty lockfile for `scripts/` (appears accidental).

Review details

Files not reviewed (1)

scripts/package-lock.json: Generated file

Files reviewed: 5/7 changed files
Comments generated: 11
Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

+	private async create(commits: readonly PlannedCommit[]): Promise<void> {
+		if (commits.length === 0) {
+			return;
+		}
+
+		this._creating = true;
+		this.render();
+


+	private renderOrClose(): void {
+		this._commits = this._commits.filter(commit => commit.files.length > 0);
+
+		if (this._commits.length === 0) {
+			this.close();
+			return;
+		}
+
+		this.render();
+	}


+async function requestCommitPlan(repository: Repository): Promise<ProposedCommit[] | undefined> {
+	const changedUris = changedResourceUris(repository);
+
+	if (changedUris.length === 0) {
+		window.showInformationMessage(l10n.t('There are no changes to plan commits from.'));
+		return undefined;
+	}


+	const tokenSource = new CancellationTokenSource();
+
+	try {
+		const proposals = await window.withProgress({
+			location: ProgressLocation.SourceControl,
+			title: l10n.t('Planning commits with Copilot...'),
+		}, async () => {
+			// Build a compact description of each change (path + truncated diff).
+			const diffs = await collectDiffs(repository, changedUris);
+			return await requestProposals(model, diffs, tokenSource);
+		});


+	"command.agenticCommitPlannerRemoveCommit": "Remove Commit From Plan",
+	"command.agenticCommitPlannerViewChanges": "View Commit Changes",
+	"command.agenticCommitPlannerMoveResources": "Move to Commit...",
+	"command.agenticCommitPlannerRemoveResources": "Remove From Plan",


+		this._sourceControl.count = this._commits.reduce((count, commit) => count + commit.files.length, 0);
+		this._sourceControl.actionButton = {
+			command: {
+				command: 'git.agenticCommitPlannerCreateAll',
+				title: this._commits.length === 1
+					? l10n.t('{0} Create Commit', '$(check)')
+					: l10n.t('{0} Create {1} Commits', '$(check)', this._commits.length),
+				arguments: [this._sourceControl]
+			},
+			secondaryCommands: [[
+				{ command: 'git.agenticCommitPlannerRegenerate', title: l10n.t('Regenerate Plan'), arguments: [this._sourceControl] },
+				{ command: 'git.agenticCommitPlannerDiscard', title: l10n.t('Discard Plan'), arguments: [this._sourceControl] }
+			]],
+			enabled: !this._creating
+		};


+async function requestCommitPlan(repository: Repository): Promise<ProposedCommit[] | undefined> {
+	const changedUris = changedResourceUris(repository);
+
+	if (changedUris.length === 0) {
+		window.showInformationMessage(l10n.t('There are no changes to plan commits from.'));
+		return undefined;
+	}


+		LanguageModelChatMessage.User(`Here are the changes:\n\n${changes}`),
+	];
+
+	const response = await model.sendRequest(prompt, {}, tokenSource.token);


+{
+	"name": "scripts",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {}
+}


Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Mathias Moser (matbmoser) · 2026-09-09T16:21:05Z

I will be taking a look on what copilot has reviewed :)

Mathias Moser (matbmoser) added 5 commits September 9, 2026 15:46

feat: added git composer functionality with copilot

35e8b4d

fix: fixed import from langauge model chat

dd5e40b

feat: enhance commit composition with user confirmation and improved …

1dabebc

…proposal resolution

Merge branch 'microsoft:main' into feat/git-composer-copilot

c2f79ae

feat: created git commit plan view

63e913a

Copilot AI balanced review requested due to automatic review settings September 9, 2026 15:57

Mathias Moser (matbmoser) marked this pull request as draft September 9, 2026 15:57

Copilot started reviewing on behalf of Mathias Moser (matbmoser) September 9, 2026 15:58 View session

Mathias Moser (matbmoser) mentioned this pull request Sep 9, 2026

[Source Control/Copilot] Allow copilot to group/organize files by change context and create multiple commits for you #334943

Open

Merge branch 'main' into feat/git-composer-copilot

5365a6e

Copilot AI reviewed Sep 9, 2026

View reviewed changes

Fix test-integration.sh entry in settings.json

88e5382

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

chore: Delete scripts/package-lock.json

eb5b567

vs-code-engineering Bot assigned Ladislau Szomoru (lszomoru) Sep 9, 2026

Navigation Menu

Uh oh!

feat: agentic git commit planner feature for improving commit quality - #335291

feat: agentic git commit planner feature for improving commit quality#335291
Mathias Moser (matbmoser) wants to merge 8 commits into
microsoft:mainfrom
matbmoser:feat/git-composer-copilot

Mathias Moser (matbmoser) commented Sep 9, 2026

Uh oh!

Mathias Moser (matbmoser) commented Sep 9, 2026

Uh oh!

Mathias Moser (matbmoser) commented Sep 9, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Mathias Moser (matbmoser) commented Sep 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

Mathias Moser (matbmoser) commented Sep 9, 2026

WHY

HOW

WHAT

Uh oh!

Mathias Moser (matbmoser) commented Sep 9, 2026

Uh oh!

Mathias Moser (matbmoser) commented Sep 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Files not reviewed (1)

Uh oh!

Uh oh!

Mathias Moser (matbmoser) commented Sep 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Mathias Moser (matbmoser) commented Sep 9, 2026 •

edited

Loading