Session window: merge to local

[osortega]

No description provided.

[Copilot]

Pull request overview

Updates the Sessions window “apply” workflow by replacing per-file copy/delete with a git-merge based “apply changes to parent repo” action, and reorganizing related toolbar actions into a dedicated apply submenu.

Changes:

• Adds a new ChatEditingSessionApplySubmenu menu and wires GitHub PR actions into it.
• Replaces Apply to Parent Repo with Apply Changes to Parent Repo that merges the session worktree branch into the parent repository.
• Extends the Git extension with internal commands used by the sessions window (_git.revParseAbbrevRef, _git.mergeBranch, _git.applyPatch) and tweaks error hint extraction.

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
src/vs/workbench/services/actions/common/menusExtensionPoint.ts	Registers a new chat/input/editing/sessionApplyActions menu key for the apply-actions submenu.
src/vs/workbench/contrib/chat/browser/chatRepoInfo.ts	Exports generateUnifiedDiff (now part of module exports).
src/vs/sessions/sessions.desktop.main.ts	Switches sessions startup wiring to load the new apply-to-parent-repo implementation.
src/vs/sessions/contrib/changesView/browser/media/changesView.css	Adjusts toolbar button/dropdown flex styling for the new submenu UI.
src/vs/sessions/contrib/changesView/browser/changesView.ts	Updates toolbar button config now that apply/PR actions are reorganized.
src/vs/sessions/contrib/applyToParentRepo/browser/applyToParentRepo.contribution.ts	Removes the previous per-file apply implementation (copy/delete).
src/vs/sessions/contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.ts	Adds new contribution/action that merges the session worktree branch into the parent repo and registers the apply submenu entry.
src/vs/platform/actions/common/actions.ts	Introduces MenuId.ChatEditingSessionApplySubmenu.
extensions/github/package.json	Moves GitHub PR actions from the old session toolbar menu to the new apply-actions submenu.
extensions/git/src/commands.ts	Adds internal git commands for merge/apply operations and adjusts default error hint parsing.

Comments suppressed due to low confidence (2)

src/vs/sessions/contrib/applyCommitsToParentRepo/browser/applyChangesToParentRepo.ts:95

• The action precondition only checks agentSessionHasWorktreeAndRepository. Since the implementation performs a git merge of the worktree branch, consider also gating on agentSessionHasAheadCommits so the action isn’t offered when there are no commits to merge.

			precondition: ContextKeyExpr.and(
				IsSessionsWindowContext,
				hasWorktreeAndRepositoryContextKey,
			),
			menu: [

src/vs/workbench/contrib/chat/browser/chatRepoInfo.ts:116

• generateUnifiedDiff is now exported, but there are no imports/usages outside this module. If this isn’t intended for cross-module reuse, keep it non-exported to avoid expanding the module surface area; if it is intended, consider moving it to a shared utility location (e.g. a common/ module) rather than exporting from a browser/ file.

export async function generateUnifiedDiff(
	fileService: IFileService,
	relPath: string,
	originalUri: URI | undefined,
	modifiedUri: URI,

[vs-code-engineering]

📬 CODENOTIFY

The following users are being notified based on files changed in this PR:

@lszomoru

Matched files:

• extensions/git/src/commands.ts
• extensions/github/package.json