From 854bc9f5051390334d6dd99bf46aec3bdf6d0535 Mon Sep 17 00:00:00 2001
From: Mark Wylde <mark@wylde.net>
Date: Sun, 5 Jul 2026 20:53:03 +0100
Subject: [PATCH 1/2] feat(git): group push menu by branch target

---
 e2e/file-explorer-sidebar.spec.ts     |  15 ++-
 electron/fileViewer/gitDiffService.ts |  37 +++++++
 src/App.css                           |  10 ++
 src/App.tsx                           | 145 +++++++++++++++++++-------
 src/components/ContextMenu.tsx        |  11 +-
 src/components/QuickPushModal.tsx     |   4 +-
 src/terminalSettings.ts               |   3 +-
 src/types/terminay.ts                 |   1 +
 8 files changed, 184 insertions(+), 42 deletions(-)

diff --git a/e2e/file-explorer-sidebar.spec.ts b/e2e/file-explorer-sidebar.spec.ts
index ce953f6..09d7c27 100644
--- a/e2e/file-explorer-sidebar.spec.ts
+++ b/e2e/file-explorer-sidebar.spec.ts
@@ -351,6 +351,11 @@ test('git sidebar pane renders a nested tree and offers a push menu', async ({
   await execFileAsync('git', ['config', 'user.email', 'terminay@example.com'], { cwd: workspace.rootDir })
   await execFileAsync('git', ['add', '.'], { cwd: workspace.rootDir })
   await execFileAsync('git', ['commit', '-m', 'initial'], { cwd: workspace.rootDir })
+  const defaultBranch = (
+    await execFileAsync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { cwd: workspace.rootDir })
+  ).stdout.trim()
+  const featureBranch = 'feature/push-menu'
+  await execFileAsync('git', ['checkout', '-b', featureBranch], { cwd: workspace.rootDir })
 
   await workspace.writeText('src/lib/util.ts', 'export const x = 2\n')
   await workspace.writeText('src/lib/new.ts', 'export const y = 3\n')
@@ -390,10 +395,16 @@ test('git sidebar pane renders a nested tree and offers a push menu', async ({
   await pushButton.click()
 
   const pushMenu = mainWindow.locator('.context-menu')
+  const pushMenuHeadings = pushMenu.locator('.context-menu__heading')
+  await expect(pushMenuHeadings.getByText(`Current Branch (${featureBranch})`, { exact: true })).toBeVisible()
   await expect(pushMenu.getByText('Push to current branch', { exact: true })).toBeVisible()
-  await expect(pushMenu.getByText('Push to current branch + PR')).toBeVisible()
+  await expect(pushMenu.getByText('Push to current branch + create PR')).toBeVisible()
+  await expect(pushMenuHeadings.getByText('New Branch', { exact: true })).toBeVisible()
   await expect(pushMenu.getByText('Push to new branch', { exact: true })).toBeVisible()
-  await expect(pushMenu.getByText('Push to new branch + PR')).toBeVisible()
+  await expect(pushMenu.getByText('Push to new branch + create PR')).toBeVisible()
+  await expect(pushMenuHeadings.getByText(`Default Branch (${defaultBranch})`, { exact: true })).toBeVisible()
+  await expect(pushMenu.getByText('Push to default branch')).toBeVisible()
+  await expect(pushMenu.locator('.context-menu__trailing')).toHaveCount(4)
 
   await mainWindow.keyboard.press('Escape')
   await expect(pushMenu).toHaveCount(0)
diff --git a/electron/fileViewer/gitDiffService.ts b/electron/fileViewer/gitDiffService.ts
index 6187889..c571cf3 100644
--- a/electron/fileViewer/gitDiffService.ts
+++ b/electron/fileViewer/gitDiffService.ts
@@ -152,6 +152,7 @@ export class GitDiffService {
         return {
           gitAvailable: false,
           repoRoot: null,
+          defaultBranch: null,
           worktrees: [],
         }
       }
@@ -159,6 +160,7 @@ export class GitDiffService {
       return {
         gitAvailable: true,
         repoRoot: null,
+        defaultBranch: null,
         worktrees: [],
       }
     }
@@ -167,6 +169,7 @@ export class GitDiffService {
       return {
         gitAvailable: true,
         repoRoot: null,
+        defaultBranch: null,
         worktrees: [],
       }
     }
@@ -176,6 +179,7 @@ export class GitDiffService {
     })
 
     const worktrees = parseWorktreeList(stdout, repoRoot)
+    const defaultBranch = await this.resolveDefaultBranch(workingDirectory)
 
     const withEntries = await Promise.all(
       worktrees.map(async (worktree): Promise<GitWorktreeStatus> => {
@@ -234,6 +238,7 @@ export class GitDiffService {
     return {
       gitAvailable: true,
       repoRoot,
+      defaultBranch,
       worktrees: withEntries,
     }
   }
@@ -278,6 +283,38 @@ export class GitDiffService {
     }
   }
 
+  private async resolveDefaultBranch(cwd: string): Promise<string | null> {
+    try {
+      const result = await execFileAsync('git', ['symbolic-ref', '--quiet', '--short', 'refs/remotes/origin/HEAD'], {
+        cwd,
+      })
+      const remoteHead = result.stdout.trim()
+      if (remoteHead.startsWith('origin/')) {
+        return remoteHead.slice('origin/'.length)
+      }
+      if (remoteHead) {
+        return remoteHead
+      }
+    } catch {}
+
+    for (const branch of ['main', 'master']) {
+      try {
+        await execFileAsync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${branch}`], { cwd })
+        return branch
+      } catch {}
+    }
+
+    try {
+      const result = await execFileAsync('git', ['branch', '--format=%(refname:short)'], { cwd })
+      return result.stdout
+        .split(/\r?\n/)
+        .map((branch) => branch.trim())
+        .find((branch) => branch.length > 0) ?? null
+    } catch {
+      return null
+    }
+  }
+
   private async getAheadOfMainCount(cwd: string): Promise<number | null> {
     try {
       const result = await execFileAsync('git', ['rev-list', '--count', 'main..HEAD'], { cwd })
diff --git a/src/App.css b/src/App.css
index 71655ba..d27e91e 100644
--- a/src/App.css
+++ b/src/App.css
@@ -2855,6 +2855,16 @@
   box-shadow: 0 10px 30px rgba(0, 0, 0, 0.5);
 }
 
+.context-menu__heading {
+  padding: 8px 10px 4px;
+  color: #8d96a6;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 1.2;
+  text-transform: uppercase;
+  white-space: nowrap;
+}
+
 .context-menu__item {
   all: unset;
   display: flex;
diff --git a/src/App.tsx b/src/App.tsx
index 52e91c4..9647ee1 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -105,6 +105,7 @@ import type {
 	GitChangeEntry,
 	GitWorktreeStatus,
 	RemoteAccessStatus,
+	QuickPushAction,
 	TerminalRecordingStartMetadata,
 	TerminalRecordingState,
 	WorktreePanelStatus,
@@ -312,51 +313,138 @@ function formatDictationTranscriptForTerminal(text: string): string {
 	return /[\r\n]/.test(text) ? formatBracketedPaste(text) : text;
 }
 
-type GitPushAgentAction = 'current' | 'current-pr' | 'new' | 'new-pr';
+type GitPushAgentAction = QuickPushAction | 'default';
+type GitPushAgentActionGroup = 'current' | 'new' | 'default';
 
 const GIT_PUSH_AGENT_ACTIONS: Array<{
 	action: GitPushAgentAction;
+	group: GitPushAgentActionGroup;
 	label: string;
 	task: string;
+	quickPush?: boolean;
 }> = [
 	{
 		action: 'current',
+		group: 'current',
 		label: 'Push to current branch',
 		task: 'Commit all of my current changes and push them to the current branch.',
+		quickPush: true,
 	},
 	{
 		action: 'current-pr',
-		label: 'Push to current branch + PR',
+		group: 'current',
+		label: 'Push to current branch + create PR',
 		task: 'Commit all of my current changes, push them to the current branch, and open a pull request.',
+		quickPush: true,
 	},
 	{
 		action: 'new',
+		group: 'new',
 		label: 'Push to new branch',
 		task: 'Commit all of my current changes onto a new, descriptively named branch and push it.',
+		quickPush: true,
 	},
 	{
 		action: 'new-pr',
-		label: 'Push to new branch + PR',
+		group: 'new',
+		label: 'Push to new branch + create PR',
 		task: 'Commit all of my current changes onto a new, descriptively named branch, push it, and open a pull request.',
+		quickPush: true,
+	},
+	{
+		action: 'default',
+		group: 'default',
+		label: 'Push to default branch',
+		task: 'Commit all of my current changes onto the default branch and push it.',
 	},
 ];
 
 type GitPushMenuTarget = {
 	branch: string | null | undefined;
 	cwd: string;
+	defaultBranch?: string | null;
 	worktreePath?: string;
 };
 
+function formatGitPushBranchLabel(branch: string | null | undefined): string {
+	return branch?.trim() || 'unknown';
+}
+
+function getGitPushActionIcon(action: GitPushAgentAction): ReactNode {
+	if (action === 'new') {
+		return <GitBranchPlus size={14} aria-hidden="true" />;
+	}
+
+	if (action === 'current-pr' || action === 'new-pr') {
+		return <GitPullRequestArrow size={14} aria-hidden="true" />;
+	}
+
+	return <GitBranch size={14} aria-hidden="true" />;
+}
+
+function buildGitPushMenuItems(options: {
+	target: GitPushMenuTarget;
+	onLaunchAgent: (action: GitPushAgentAction, target: GitPushMenuTarget) => void;
+	onLaunchQuickPush: (action: QuickPushAction, target: GitPushMenuTarget) => void;
+}): ContextMenuItem[] {
+	const { target, onLaunchAgent, onLaunchQuickPush } = options;
+	const currentBranch = formatGitPushBranchLabel(target.branch);
+	const defaultBranch = formatGitPushBranchLabel(target.defaultBranch ?? 'main');
+
+	const headings: Record<GitPushAgentActionGroup, string> = {
+		current: `Current Branch (${currentBranch})`,
+		new: 'New Branch',
+		default: `Default Branch (${defaultBranch})`,
+	};
+	const items: ContextMenuItem[] = [];
+
+	for (const group of [
+		'current',
+		'new',
+		'default',
+	] as GitPushAgentActionGroup[]) {
+		if (items.length > 0) {
+			items.push({ key: `${group}-separator`, label: '', separator: true });
+		}
+		items.push({ key: `${group}-heading`, label: headings[group], heading: true });
+
+		for (const entry of GIT_PUSH_AGENT_ACTIONS.filter(
+			(action) => action.group === group,
+		)) {
+			items.push({
+				key: entry.action,
+				label: entry.label,
+				icon: getGitPushActionIcon(entry.action),
+				onClick: () => onLaunchAgent(entry.action, target),
+				trailingAction: entry.quickPush
+					? {
+							icon: <Zap size={14} aria-hidden="true" />,
+							label: `${entry.label} (quick mode)`,
+							onClick: () =>
+								onLaunchQuickPush(entry.action as QuickPushAction, target),
+						}
+					: undefined,
+			});
+		}
+	}
+
+	return items;
+}
+
 function buildGitPushAgentPrompt(
 	template: string,
 	task: string,
 	branch: string | null | undefined,
+	defaultBranch: string | null | undefined,
 ): string {
 	const safeBranch = branch?.trim() ? branch.trim() : 'the current branch';
+	const safeDefaultBranch = defaultBranch?.trim() ? defaultBranch.trim() : 'the default branch';
 	const withTask = template.includes('{{task}}')
 		? template.replace(/\{\{task\}\}/g, () => task)
 		: `${template.trim()}\n\nTask: ${task}`;
-	return withTask.replace(/\{\{branch\}\}/g, () => safeBranch);
+	return withTask
+		.replace(/\{\{branch\}\}/g, () => safeBranch)
+		.replace(/\{\{defaultBranch\}\}/g, () => safeDefaultBranch);
 }
 
 function buildGitPushAgentCommand(
@@ -1955,7 +2043,8 @@ const ProjectWorkspace = forwardRef<
 		x: number;
 		y: number;
 	} | null>(null);
-	const [quickPushAction, setQuickPushAction] = useState<GitPushAgentAction | null>(null);
+	const [quickPushAction, setQuickPushAction] =
+		useState<QuickPushAction | null>(null);
 	const [quickPushCwd, setQuickPushCwd] = useState<string | null>(null);
 	const [loadingPaths, setLoadingPaths] = useState<Record<string, boolean>>({});
 	const [runningMacroRunsBySession, setRunningMacroRunsBySession] = useState<
@@ -3690,6 +3779,7 @@ const ProjectWorkspace = forwardRef<
 
 	const handleOpenWorktreePushMenu = useCallback(
 		(worktree: GitWorktreeStatus, anchor: { x: number; y: number }) => {
+			const defaultBranch = worktreePanelStatus?.defaultBranch ?? 'main';
 			setGitPushMenuPosition((current) =>
 				current?.target?.worktreePath === worktree.path
 					? null
@@ -3699,12 +3789,13 @@ const ProjectWorkspace = forwardRef<
 							target: {
 								branch: worktree.branch,
 								cwd: worktree.path,
+								defaultBranch,
 								worktreePath: worktree.path,
 							},
 						},
 			);
 		},
-		[],
+		[worktreePanelStatus],
 	);
 
 	const handleOpenGitEntry = useCallback(
@@ -4812,14 +4903,19 @@ const ProjectWorkspace = forwardRef<
 				return;
 			}
 
+			const task =
+				actionMeta.action === 'default'
+					? `Commit all of my current changes onto the default branch "${formatGitPushBranchLabel(target.defaultBranch ?? 'main')}" and push it.`
+					: actionMeta.task;
 			const model =
 				config.provider === 'claudeCode'
 					? config.claudeCodeModel
 					: config.codexModel;
 			const prompt = buildGitPushAgentPrompt(
 				config.prompt,
-				actionMeta.task,
+				task,
 				target.branch,
+				target.defaultBranch,
 			);
 			const command = buildGitPushAgentCommand(
 				config.provider,
@@ -4837,7 +4933,7 @@ const ProjectWorkspace = forwardRef<
 	);
 
 	const launchQuickPush = useCallback(
-		async (action: GitPushAgentAction, target: GitPushMenuTarget) => {
+		async (action: QuickPushAction, target: GitPushMenuTarget) => {
 			setGitPushMenuPosition(null);
 
 			if (settings.gitPushAgent.provider === 'disabled') {
@@ -7064,33 +7160,12 @@ const ProjectWorkspace = forwardRef<
 								x={gitPushMenuPosition.x}
 								y={gitPushMenuPosition.y}
 								onClose={() => setGitPushMenuPosition(null)}
-								items={GIT_PUSH_AGENT_ACTIONS.map((entry) => ({
-									key: entry.action,
-									label: entry.label,
-									separator: false,
-									icon:
-										entry.action === 'current' ? (
-											<GitBranch size={14} aria-hidden="true" />
-										) : entry.action === 'new' ? (
-											<GitBranchPlus size={14} aria-hidden="true" />
-										) : (
-											<GitPullRequestArrow size={14} aria-hidden="true" />
-										),
-									onClick: () =>
-										launchGitPushAgent(
-											entry.action,
-											gitPushMenuPosition.target,
-										),
-									trailingAction: {
-										icon: <Zap size={14} aria-hidden="true" />,
-										label: `${entry.label} (quick mode)`,
-										onClick: () =>
-											void launchQuickPush(
-												entry.action,
-												gitPushMenuPosition.target,
-											),
-									},
-								}))}
+								items={buildGitPushMenuItems({
+									target: gitPushMenuPosition.target,
+									onLaunchAgent: launchGitPushAgent,
+									onLaunchQuickPush: (action, target) =>
+										void launchQuickPush(action, target),
+								})}
 							/>
 						) : null}
 
diff --git a/src/components/ContextMenu.tsx b/src/components/ContextMenu.tsx
index c320f9a..1dfffdf 100644
--- a/src/components/ContextMenu.tsx
+++ b/src/components/ContextMenu.tsx
@@ -10,11 +10,12 @@ export type ContextMenuTrailingAction = {
 
 export type ContextMenuItem = {
 	label: string;
-	onClick: () => void;
+	onClick?: () => void;
 	icon?: ReactNode;
 	danger?: boolean;
 	disabled?: boolean;
 	separator?: boolean;
+	heading?: boolean;
 	key?: string;
 	/** Optional secondary action rendered as a button on the right edge of the row. */
 	trailingAction?: ContextMenuTrailingAction;
@@ -37,6 +38,10 @@ export function ContextMenu({ x, y, items, onClose, portalContainer }: ContextMe
 			return item.key;
 		}
 
+		if (item.heading) {
+			return `heading-${item.label}`;
+		}
+
 		if (!item.separator) {
 			return item.label;
 		}
@@ -88,6 +93,8 @@ export function ContextMenu({ x, y, items, onClose, portalContainer }: ContextMe
 				<div key={getItemKey(item, index)}>
 					{item.separator ? (
 						<div className="context-menu__separator" />
+					) : item.heading ? (
+						<div className="context-menu__heading">{item.label}</div>
 					) : (
 						<div
 							className={`context-menu__row${item.trailingAction ? ' context-menu__row--has-trailing' : ''}`}
@@ -100,7 +107,7 @@ export function ContextMenu({ x, y, items, onClose, portalContainer }: ContextMe
 									if (item.disabled) {
 										return;
 									}
-									item.onClick();
+									item.onClick?.();
 									onClose();
 								}}
 							>
diff --git a/src/components/QuickPushModal.tsx b/src/components/QuickPushModal.tsx
index 0390f8f..57137b1 100644
--- a/src/components/QuickPushModal.tsx
+++ b/src/components/QuickPushModal.tsx
@@ -30,9 +30,9 @@ type Phase = 'generating' | 'review' | 'applying' | 'done' | 'error';
 
 const ACTION_LABELS: Record<QuickPushAction, string> = {
 	current: 'Push to current branch',
-	'current-pr': 'Push to current branch + PR',
+	'current-pr': 'Push to current branch + create PR',
 	new: 'Push to new branch',
-	'new-pr': 'Push to new branch + PR',
+	'new-pr': 'Push to new branch + create PR',
 };
 
 export function QuickPushModal({
diff --git a/src/terminalSettings.ts b/src/terminalSettings.ts
index ec86615..b590619 100644
--- a/src/terminalSettings.ts
+++ b/src/terminalSettings.ts
@@ -265,6 +265,7 @@ export const DEFAULT_GIT_PUSH_AGENT_PROMPT = `You are helping me commit and push
 Task: {{task}}
 
 Current branch: {{branch}}
+Default branch: {{defaultBranch}}
 
 Please:
 1. Run \`git status\` and \`git diff\` to understand what has changed.
@@ -602,7 +603,7 @@ export const terminalSettingsSections: SettingsSectionDefinition[] = [
 				key: 'gitPushAgent.prompt',
 				label: 'Agent prompt',
 				description:
-					'Prompt sent to the agent. Use {{task}} for the chosen push action and {{branch}} for the current branch.',
+					'Prompt sent to the agent. Use {{task}} for the chosen push action, {{branch}} for the current branch, and {{defaultBranch}} for the default branch.',
 				sectionId: 'git-push-agent',
 				categoryId: 'ai',
 				input: 'textarea',
diff --git a/src/types/terminay.ts b/src/types/terminay.ts
index f6c54c8..3f470a6 100644
--- a/src/types/terminay.ts
+++ b/src/types/terminay.ts
@@ -332,6 +332,7 @@ export type GitWorktreeStatus = {
 export type WorktreePanelStatus = {
   gitAvailable: boolean
   repoRoot: string | null
+  defaultBranch: string | null
   worktrees: GitWorktreeStatus[]
 }
 

From af54610ed10eba1311f23692317e26b4c2eacb87 Mon Sep 17 00:00:00 2001
From: Mark Wylde <mark@wylde.net>
Date: Sun, 5 Jul 2026 20:54:19 +0100
Subject: [PATCH 2/2] feat(git): quick push to default branch

---
 e2e/file-explorer-sidebar.spec.ts |  2 +-
 electron/quickPush/service.ts     | 52 +++++++++++++++++++++++++++++--
 src/App.tsx                       |  3 +-
 src/components/QuickPushModal.tsx |  1 +
 src/types/terminay.ts             |  2 +-
 5 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/e2e/file-explorer-sidebar.spec.ts b/e2e/file-explorer-sidebar.spec.ts
index 09d7c27..83d6d59 100644
--- a/e2e/file-explorer-sidebar.spec.ts
+++ b/e2e/file-explorer-sidebar.spec.ts
@@ -404,7 +404,7 @@ test('git sidebar pane renders a nested tree and offers a push menu', async ({
   await expect(pushMenu.getByText('Push to new branch + create PR')).toBeVisible()
   await expect(pushMenuHeadings.getByText(`Default Branch (${defaultBranch})`, { exact: true })).toBeVisible()
   await expect(pushMenu.getByText('Push to default branch')).toBeVisible()
-  await expect(pushMenu.locator('.context-menu__trailing')).toHaveCount(4)
+  await expect(pushMenu.locator('.context-menu__trailing')).toHaveCount(5)
 
   await mainWindow.keyboard.press('Escape')
   await expect(pushMenu).toHaveCount(0)
diff --git a/electron/quickPush/service.ts b/electron/quickPush/service.ts
index 9c80c4f..5990abd 100644
--- a/electron/quickPush/service.ts
+++ b/electron/quickPush/service.ts
@@ -32,6 +32,7 @@ type PorcelainEntry = {
 type QuickPushContext = {
   repoRoot: string
   branch: string
+  defaultBranch: string
   changedFiles: string[]
   statusText: string
   diffText: string
@@ -105,6 +106,36 @@ function actionNeedsPullRequest(action: QuickPushAction): boolean {
   return action === 'current-pr' || action === 'new-pr'
 }
 
+async function resolveDefaultBranch(cwd: string): Promise<string | null> {
+  try {
+    const result = await runGit(['symbolic-ref', '--quiet', '--short', 'refs/remotes/origin/HEAD'], cwd)
+    const remoteHead = result.trim()
+    if (remoteHead.startsWith('origin/')) {
+      return remoteHead.slice('origin/'.length)
+    }
+    if (remoteHead) {
+      return remoteHead
+    }
+  } catch {}
+
+  for (const branch of ['main', 'master']) {
+    try {
+      await runGit(['show-ref', '--verify', '--quiet', `refs/heads/${branch}`], cwd)
+      return branch
+    } catch {}
+  }
+
+  try {
+    const result = await runGit(['branch', '--format=%(refname:short)'], cwd)
+    return result
+      .split(/\r?\n/)
+      .map((branch) => branch.trim())
+      .find((branch) => branch.length > 0) ?? null
+  } catch {
+    return null
+  }
+}
+
 /**
  * Extract the first balanced top-level JSON object from raw model output and
  * repair the mistakes models commonly make: code fences, raw control characters
@@ -287,7 +318,7 @@ export function parseQuickPushPlan(
   return { branchName, pullRequest, commits, uncoveredFiles, warnings }
 }
 
-function describeAction(action: QuickPushAction, branch: string): string {
+function describeAction(action: QuickPushAction, branch: string, defaultBranch: string): string {
   switch (action) {
     case 'current':
       return `Commit all of the changes onto the current branch "${branch}". Do not set "branchName" or "pullRequest".`
@@ -297,6 +328,8 @@ function describeAction(action: QuickPushAction, branch: string): string {
       return `Commit all of the changes onto a new, descriptively named branch. Set "branchName" to a short kebab-case branch name (you may include a "feat/" or "fix/" style prefix). Do not set "pullRequest".`
     case 'new-pr':
       return `Commit all of the changes onto a new, descriptively named branch, then open a pull request. Set "branchName" to a short kebab-case branch name and set "pullRequest" with a title and body.`
+    case 'default':
+      return `Commit all of the changes onto the default branch "${defaultBranch}". Do not set "branchName" or "pullRequest".`
     default:
       return 'Commit all of the changes.'
   }
@@ -321,7 +354,10 @@ function buildPrompt(context: QuickPushContext, action: QuickPushAction): string
     '- Use the file paths EXACTLY as shown under "Changed files" (relative to the repo root).',
     '- Group related changes together; split unrelated changes into separate commits.',
     '',
-    `Task: ${describeAction(action, context.branch)}`,
+    `Task: ${describeAction(action, context.branch, context.defaultBranch)}`,
+    '',
+    `Current branch: ${context.branch}`,
+    `Default branch: ${context.defaultBranch}`,
     '',
     'Changed files:',
     context.changedFiles.length > 0 ? context.changedFiles.map((file) => `- ${file}`).join('\n') : '(none)',
@@ -400,6 +436,7 @@ async function gatherContext(cwd: string): Promise<QuickPushContext> {
   if (!branch || branch === 'HEAD') {
     branch = 'the current branch'
   }
+  const defaultBranch = (await resolveDefaultBranch(repoRoot)) ?? 'main'
 
   const porcelain = await runGit(
     ['status', '--porcelain=v1', '-z', '--untracked-files=all', '--ignored=no'],
@@ -432,6 +469,7 @@ async function gatherContext(cwd: string): Promise<QuickPushContext> {
   return {
     repoRoot,
     branch,
+    defaultBranch,
     changedFiles,
     statusText: statusTextRaw,
     diffText,
@@ -608,6 +646,16 @@ export class QuickPushService {
         }
         await run(`Create branch ${branchName}`, ['checkout', '-b', branchName])
         branch = branchName
+      } else if (request.action === 'default') {
+        const defaultBranch = await resolveDefaultBranch(repoRoot)
+        if (!defaultBranch) {
+          throw new Error('Unable to resolve the repository default branch.')
+        }
+        const currentBranch = (await runGit(['rev-parse', '--abbrev-ref', 'HEAD'], repoRoot)).trim()
+        if (currentBranch !== defaultBranch) {
+          await run(`Checkout default branch ${defaultBranch}`, ['checkout', defaultBranch])
+        }
+        branch = defaultBranch
       } else {
         branch = (await runGit(['rev-parse', '--abbrev-ref', 'HEAD'], repoRoot)).trim()
       }
diff --git a/src/App.tsx b/src/App.tsx
index 9647ee1..bcd63d5 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -313,7 +313,7 @@ function formatDictationTranscriptForTerminal(text: string): string {
 	return /[\r\n]/.test(text) ? formatBracketedPaste(text) : text;
 }
 
-type GitPushAgentAction = QuickPushAction | 'default';
+type GitPushAgentAction = QuickPushAction;
 type GitPushAgentActionGroup = 'current' | 'new' | 'default';
 
 const GIT_PUSH_AGENT_ACTIONS: Array<{
@@ -356,6 +356,7 @@ const GIT_PUSH_AGENT_ACTIONS: Array<{
 		group: 'default',
 		label: 'Push to default branch',
 		task: 'Commit all of my current changes onto the default branch and push it.',
+		quickPush: true,
 	},
 ];
 
diff --git a/src/components/QuickPushModal.tsx b/src/components/QuickPushModal.tsx
index 57137b1..f0d61cb 100644
--- a/src/components/QuickPushModal.tsx
+++ b/src/components/QuickPushModal.tsx
@@ -33,6 +33,7 @@ const ACTION_LABELS: Record<QuickPushAction, string> = {
 	'current-pr': 'Push to current branch + create PR',
 	new: 'Push to new branch',
 	'new-pr': 'Push to new branch + create PR',
+	default: 'Push to default branch',
 };
 
 export function QuickPushModal({
diff --git a/src/types/terminay.ts b/src/types/terminay.ts
index 3f470a6..a7b87ec 100644
--- a/src/types/terminay.ts
+++ b/src/types/terminay.ts
@@ -456,7 +456,7 @@ export type AiTabMetadataGenerateResult = {
   text: string
 }
 
-export type QuickPushAction = 'current' | 'current-pr' | 'new' | 'new-pr'
+export type QuickPushAction = 'current' | 'current-pr' | 'new' | 'new-pr' | 'default'
 
 export type QuickPushCommit = {
   message: string