- {t('session.newWorktree.localBranches')}
+ {hasExistingBranchQuery ? t('session.newWorktree.otherLocalBranches') : t('session.newWorktree.localBranches')}
{existingBranchRankedGroups.otherLocal.map((branch) => (
@@ -1399,10 +1923,10 @@ export function NewWorktreeDialog({
)}
- {!hasExistingBranchQuery && existingBranchRankedGroups.otherRemote.length > 0 && (
+ {existingBranchRankedGroups.otherRemote.length > 0 && (
- {t('session.newWorktree.remoteBranches')}
+ {hasExistingBranchQuery ? t('session.newWorktree.otherRemoteBranches') : t('session.newWorktree.remoteBranches')}
{existingBranchRankedGroups.otherRemote.map((branch) => (
@@ -1437,11 +1961,47 @@ export function NewWorktreeDialog({
) : (
-
-
+
+
{t('session.newWorktree.branchName')}
- {startFromIssueButtons}
+ {mode === 'new-branch' && (showGitHubStartFrom || showGitLabStartFrom || showGiteaStartFrom) && (
+
+ {showGitHubStartFrom && (
+ setGithubDialogOpen(true)}
+ className="gap-1.5 h-7"
+ >
+
+ )}
+ {showGitLabStartFrom && (
+ setGitlabDialogOpen(true)}
+ className="gap-1.5 h-7"
+ >
+
+ )}
+ {showGiteaStartFrom && (
+ setGiteaDialogOpen(true)}
+ className="gap-1.5 h-7"
+ >
+
+ )}
+
+ )}
)}
+ {newBranchState.linkedGitLabMr && (
+
+
+ {t('session.newWorktree.usingMrBranch', { branch: newBranchState.linkedGitLabMr.sourceBranch })}
+
+
+ )}
+ {newBranchState.linkedGiteaPr && (
+
+
+ {t('session.newWorktree.usingPrBranch', { branch: newBranchState.linkedGiteaPr.sourceBranch })}
+
+
+ )}
{newBranchState.linkedIssue && !newBranchState.linkedPr && (
)}
- {newBranchState.linkedLinearIssue && (
+ {newBranchState.linkedGitLabIssue && !newBranchState.linkedGitLabMr && (
- {t('session.newWorktree.fromLinearIssue', {
- identifier: newBranchState.linkedLinearIssue.identifier,
- title: newBranchState.linkedLinearIssue.title,
- })}
+ {t('session.newWorktree.fromIssue', { number: newBranchState.linkedGitLabIssue.number, title: newBranchState.linkedGitLabIssue.title })}
+
+
+ )}
+ {newBranchState.linkedGiteaIssue && !newBranchState.linkedGiteaPr && (
+
+
+ {t('session.newWorktree.fromIssue', { number: newBranchState.linkedGiteaIssue.number, title: newBranchState.linkedGiteaIssue.title })}
)}
@@ -1549,8 +2133,8 @@ export function NewWorktreeDialog({
/>
- {/* Source Branch - Only for New Branch mode, hide when PR is selected */}
- {mode === 'new-branch' && !newBranchState.linkedPr && (
+ {/* Source Branch - Only for New Branch mode, hide when a linked PR/MR is selected */}
+ {mode === 'new-branch' && !newBranchState.linkedPr && !newBranchState.linkedGitLabMr && !newBranchState.linkedGiteaPr && (
{t('session.newWorktree.sourceBranch')}
@@ -1571,7 +2155,7 @@ export function NewWorktreeDialog({
{t('session.newWorktree.newBranchFromSource', { source: newBranchState.sourceBranch })}
)}
-
+
{/* Mobile Source Branch Picker Overlay */}
)}
- {!hasSourceBranchQuery && sourceBranchRankedGroups.otherLocal.length > 0 && (
+ {sourceBranchRankedGroups.otherLocal.length > 0 && (
- {t('session.newWorktree.localBranches')}
+ {hasSourceBranchQuery ? t('session.newWorktree.otherLocalBranches') : t('session.newWorktree.localBranches')}
{sourceBranchRankedGroups.otherLocal.map((branch) => (
@@ -1655,10 +2239,10 @@ export function NewWorktreeDialog({
)}
- {!hasSourceBranchQuery && sourceBranchRankedGroups.otherRemote.length > 0 && (
+ {sourceBranchRankedGroups.otherRemote.length > 0 && (
- {t('session.newWorktree.remoteBranches')}
+ {hasSourceBranchQuery ? t('session.newWorktree.otherRemoteBranches') : t('session.newWorktree.remoteBranches')}
{sourceBranchRankedGroups.otherRemote.map((branch) => (
@@ -1689,23 +2273,18 @@ export function NewWorktreeDialog({
)}
{/* Linked Item Preview - Two row minimal display */}
- {(newBranchState.linkedIssue || newBranchState.linkedPr || newBranchState.linkedLinearIssue) && mode === 'new-branch' && (
+ {(newBranchState.linkedIssue || newBranchState.linkedPr || newBranchState.linkedGitLabIssue || newBranchState.linkedGitLabMr || newBranchState.linkedGiteaIssue || newBranchState.linkedGiteaPr) && mode === 'new-branch' && (
{/* Row 1: Type, number, title, actions */}
-
-
- {newBranchState.linkedLinearIssue && (
-
- {newBranchState.linkedLinearIssue.identifier}
-
- )}
+ {newBranchState.linkedIssue || newBranchState.linkedPr ? (
+
+ ) : newBranchState.linkedGitLabIssue || newBranchState.linkedGitLabMr ? (
+
+ ) : (
+
+ )}
+
{newBranchState.linkedIssue && (
{t('session.newWorktree.issueNumber', { number: newBranchState.linkedIssue.number })}
@@ -1716,13 +2295,33 @@ export function NewWorktreeDialog({
{t('session.newWorktree.prNumber', { number: newBranchState.linkedPr.number })}
)}
-
+ {newBranchState.linkedGitLabIssue && (
+
+ {t('session.newWorktree.issueNumber', { number: newBranchState.linkedGitLabIssue.number })}
+
+ )}
+ {newBranchState.linkedGitLabMr && (
+
+ {t('session.newWorktree.mrNumber', { number: newBranchState.linkedGitLabMr.number })}
+
+ )}
+ {newBranchState.linkedGiteaIssue && (
+
+ {t('session.newWorktree.issueNumber', { number: newBranchState.linkedGiteaIssue.number })}
+
+ )}
+ {newBranchState.linkedGiteaPr && (
+
+ {t('session.newWorktree.prNumber', { number: newBranchState.linkedGiteaPr.number })}
+
+ )}
+
- {newBranchState.linkedLinearIssue?.title || newBranchState.linkedIssue?.title || newBranchState.linkedPr?.title}
+ {newBranchState.linkedIssue?.title || newBranchState.linkedPr?.title || newBranchState.linkedGitLabIssue?.title || newBranchState.linkedGitLabMr?.title || newBranchState.linkedGiteaIssue?.title || newBranchState.linkedGiteaPr?.title}
-
+
-
+
-
- {/* Row 2: PR branch info + diff indicator */}
+
+ {/* Row 2: PR/MR branch info + diff indicator */}
{newBranchState.linkedPr && (
@@ -1752,6 +2351,30 @@ export function NewWorktreeDialog({
)}
)}
+ {newBranchState.linkedGitLabMr && (
+
+
+ {newBranchState.linkedGitLabMr.sourceBranch}
+
+ {newBranchState.includeGitLabMrDiff && (
+
+ {t('session.newWorktree.includeDiffBadge')}
+
+ )}
+
+ )}
+ {newBranchState.linkedGiteaPr && (
+
+
+ {newBranchState.linkedGiteaPr.sourceBranch}
+
+ {newBranchState.includeGiteaPrDiff && (
+
+ {t('session.newWorktree.includeDiffBadge')}
+
+ )}
+
+ )}
)}
@@ -1765,7 +2388,7 @@ export function NewWorktreeDialog({
{t('session.newWorktree.title')}
-
+
{/* Mode Selection - using SortableTabsStrip */}
)}
- {!hasExistingBranchQuery && existingBranchRankedGroups.otherLocal.length > 0 && (
+ {existingBranchRankedGroups.otherLocal.length > 0 && (
<>
-
+ {hasExistingBranchQuery &&
{existingBranchRankedGroups.otherLocal.map((branch) => (
+
{existingBranchRankedGroups.otherRemote.map((branch) => (
) : (
-
-
+
+
{t('session.newWorktree.branchName')}
- {startFromIssueButtons}
+ {mode === 'new-branch' && (showGitHubStartFrom || showGitLabStartFrom || showGiteaStartFrom) && (
+
+ {showGitHubStartFrom && (
+ setGithubDialogOpen(true)}
+ className="gap-1.5 h-7"
+ >
+
+ )}
+ {showGitLabStartFrom && (
+ setGitlabDialogOpen(true)}
+ className="gap-1.5 h-7"
+ >
+
+ )}
+ {showGiteaStartFrom && (
+ setGiteaDialogOpen(true)}
+ className="gap-1.5 h-7"
+ >
+
+ )}
+
+ )}
)}
+ {newBranchState.linkedGitLabMr && (
+
+
+ {t('session.newWorktree.usingMrBranch', { branch: newBranchState.linkedGitLabMr.sourceBranch })}
+
+
+ )}
+ {newBranchState.linkedGiteaPr && (
+
+
+ {t('session.newWorktree.usingPrBranch', { branch: newBranchState.linkedGiteaPr.sourceBranch })}
+
+
+ )}
{newBranchState.linkedIssue && !newBranchState.linkedPr && (
)}
- {newBranchState.linkedLinearIssue && (
+ {newBranchState.linkedGitLabIssue && !newBranchState.linkedGitLabMr && (
- {t('session.newWorktree.fromLinearIssue', {
- identifier: newBranchState.linkedLinearIssue.identifier,
- title: newBranchState.linkedLinearIssue.title,
- })}
+ {t('session.newWorktree.fromIssue', { number: newBranchState.linkedGitLabIssue.number, title: newBranchState.linkedGitLabIssue.title })}
+
+
+ )}
+ {newBranchState.linkedGiteaIssue && !newBranchState.linkedGiteaPr && (
+
+
+ {t('session.newWorktree.fromIssue', { number: newBranchState.linkedGiteaIssue.number, title: newBranchState.linkedGiteaIssue.title })}
)}
@@ -2034,8 +2718,8 @@ export function NewWorktreeDialog({
/>
{t('session.newWorktree.sourceBranch')}
@@ -2092,9 +2776,10 @@ export function NewWorktreeDialog({
)}
- {!hasSourceBranchQuery && sourceBranchRankedGroups.otherLocal.length > 0 && (
+ {sourceBranchRankedGroups.otherLocal.length > 0 && (
<>
-
+ {hasSourceBranchQuery &&
{sourceBranchRankedGroups.otherLocal.map((branch) => (
+
{sourceBranchRankedGroups.otherRemote.map((branch) => (
{/* Row 1: Type, number, title, actions */}
-
-
- {newBranchState.linkedLinearIssue && (
-
- {newBranchState.linkedLinearIssue.identifier}
-
+ {newBranchState.linkedIssue || newBranchState.linkedPr ? (
+
+ ) : newBranchState.linkedGitLabIssue || newBranchState.linkedGitLabMr ? (
+
+ ) : (
+
)}
+
{newBranchState.linkedIssue && (
{t('session.newWorktree.issueNumber', { number: newBranchState.linkedIssue.number })}
@@ -2174,13 +2854,33 @@ export function NewWorktreeDialog({
{t('session.newWorktree.prNumber', { number: newBranchState.linkedPr.number })}
)}
-
+ {newBranchState.linkedGitLabIssue && (
+
+ {t('session.newWorktree.issueNumber', { number: newBranchState.linkedGitLabIssue.number })}
+
+ )}
+ {newBranchState.linkedGitLabMr && (
+
+ {t('session.newWorktree.mrNumber', { number: newBranchState.linkedGitLabMr.number })}
+
+ )}
+ {newBranchState.linkedGiteaIssue && (
+
+ {t('session.newWorktree.issueNumber', { number: newBranchState.linkedGiteaIssue.number })}
+
+ )}
+ {newBranchState.linkedGiteaPr && (
+
+ {t('session.newWorktree.prNumber', { number: newBranchState.linkedGiteaPr.number })}
+
+ )}
+
- {newBranchState.linkedLinearIssue?.title || newBranchState.linkedIssue?.title || newBranchState.linkedPr?.title}
+ {newBranchState.linkedIssue?.title || newBranchState.linkedPr?.title || newBranchState.linkedGitLabIssue?.title || newBranchState.linkedGitLabMr?.title || newBranchState.linkedGiteaIssue?.title || newBranchState.linkedGiteaPr?.title}
-
+
-
+
@@ -2210,6 +2910,30 @@ export function NewWorktreeDialog({
)}
)}
+ {newBranchState.linkedGitLabMr && (
+
+
+ {newBranchState.linkedGitLabMr.sourceBranch}
+
+ {newBranchState.includeGitLabMrDiff && (
+
+ {t('session.newWorktree.includeDiffBadge')}
+
+ )}
+
+ )}
+ {newBranchState.linkedGiteaPr && (
+
+
+ {newBranchState.linkedGiteaPr.sourceBranch}
+
+ {newBranchState.includeGiteaPrDiff && (
+
+ {t('session.newWorktree.includeDiffBadge')}
+
+ )}
+
+ )}
)}
@@ -2227,7 +2951,7 @@ export function NewWorktreeDialog({
)}
-
+
-
+
+
);
diff --git a/packages/ui/src/components/views/GitLabMrView.tsx b/packages/ui/src/components/views/GitLabMrView.tsx
new file mode 100644
index 00000000..fd762188
--- /dev/null
+++ b/packages/ui/src/components/views/GitLabMrView.tsx
@@ -0,0 +1,891 @@
+import React from 'react';
+import { useShallow } from 'zustand/react/shallow';
+import { Icon } from '@/components/icon/Icon';
+import { Button } from '@/components/ui/button';
+import { ScrollShadow } from '@/components/ui/ScrollShadow';
+import { ScrollableOverlay } from '@/components/ui/ScrollableOverlay';
+import { SortableTabsStrip } from '@/components/ui/sortable-tabs-strip';
+import { GitLabIssuesSection } from '@/components/views/git/GitLabIssuesSection';
+import { ForgeEntityDetailView } from '@/components/views/forge';
+import { buildForgeProvider } from '@/lib/forge';
+import { useRuntimeAPIs } from '@/hooks/useRuntimeAPIs';
+import { useEffectiveDirectory } from '@/hooks/useEffectiveDirectory';
+import { useGitStatus, useGitStore } from '@/stores/useGitStore';
+import { useGitLabAuthStore } from '@/stores/useGitLabAuthStore';
+import { useUIStore } from '@/stores/useUIStore';
+import { openExternalUrl } from '@/lib/url';
+import type { GitLabMergeRequestContextResult, GitLabMergeRequestSummary, GitLabRepoRef } from '@/lib/api/types';
+import { useI18n } from '@/lib/i18n';
+import { toast } from '@/components/ui';
+import { Checkbox } from '@/components/ui/checkbox';
+import { Input } from '@/components/ui/input';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { Textarea } from '@/components/ui/textarea';
+
+const mrStateColor = (state: string): string => {
+ switch (state) {
+ case 'merged':
+ return 'var(--pr-merged)';
+ case 'closed':
+ return 'var(--pr-closed)';
+ default:
+ return 'var(--pr-open)';
+ }
+};
+
+const mrAuthorLabel = (mr: GitLabMergeRequestSummary): string =>
+ mr.author?.name?.trim() || mr.author?.username || '';
+
+const draftBadgeClass =
+ 'inline-flex items-center rounded border border-border/60 bg-surface-elevated px-1.5 py-px typography-micro text-foreground';
+
+/**
+ * Read-only GitLab merge request surface for the context panel. Resolves the
+ * same repository context GitView uses (effective directory + current branch
+ * from the shared git stores) and renders the branch's merge request plus the
+ * repository's open merge requests. v1 is intentionally read-only: no create,
+ * update, or merge actions.
+ */
+export const GitLabMrView: React.FC = () => {
+ const { t } = useI18n();
+ const { git, gitlab } = useRuntimeAPIs();
+ const currentDirectory = useEffectiveDirectory();
+ const status = useGitStatus(currentDirectory ?? null);
+ const { ensureAll } = useGitStore(useShallow((state) => ({ ensureAll: state.ensureAll })));
+
+ const gitlabAuthStatus = useGitLabAuthStore((state) => state.status);
+ const gitlabAuthChecked = useGitLabAuthStore((state) => state.hasChecked);
+ const refreshGitLabStatus = useGitLabAuthStore((state) => state.refreshStatus);
+
+ const setSettingsDialogOpen = useUIStore((state) => state.setSettingsDialogOpen);
+ const setSettingsPage = useUIStore((state) => state.setSettingsPage);
+
+ React.useEffect(() => {
+ if (!currentDirectory || !git) {
+ return;
+ }
+ void ensureAll(currentDirectory, git);
+ }, [currentDirectory, ensureAll, git]);
+
+ // Settle the connection state exactly once; the store dedupes in-flight
+ // refreshes so remounts never pile up status requests.
+ React.useEffect(() => {
+ if (gitlabAuthChecked) {
+ return;
+ }
+ void refreshGitLabStatus(gitlab);
+ }, [gitlab, gitlabAuthChecked, refreshGitLabStatus]);
+
+ const currentBranch = status?.current ?? null;
+ const connected = gitlabAuthChecked ? gitlabAuthStatus?.connected === true : null;
+
+ const openGitLabSettings = React.useCallback(() => {
+ setSettingsPage('git');
+ setSettingsDialogOpen(true);
+ }, [setSettingsDialogOpen, setSettingsPage]);
+
+ // Local tab selection between the merge-request and issues surfaces. Not
+ // persisted: reopening the panel always lands on merge requests.
+ const [activeTab, setActiveTab] = React.useState<'mr' | 'issues'>('mr');
+
+ // ---- Current-branch merge request --------------------------------------
+
+ const [branchMr, setBranchMr] = React.useState
(null);
+ const [branchMrLoading, setBranchMrLoading] = React.useState(false);
+ const [branchMrError, setBranchMrError] = React.useState(null);
+ const [retryToken, setRetryToken] = React.useState(0);
+ const [repoRef, setRepoRef] = React.useState(null);
+
+ const retry = React.useCallback(() => setRetryToken((value) => value + 1), []);
+
+ React.useEffect(() => {
+ if (!currentDirectory || !currentBranch || !connected || !gitlab?.mrsList) {
+ return;
+ }
+ let cancelled = false;
+ setBranchMrLoading(true);
+ setBranchMrError(null);
+ // Re-resolving the repo context invalidates the previously fetched branch
+ // list so a stale repo's branches never leak into the create form.
+ setRepoRef(null);
+ setBranches([]);
+ setDefaultBranch(null);
+ void gitlab
+ .mrsList(currentDirectory, { sourceBranch: currentBranch })
+ .then((result) => {
+ if (cancelled) {
+ return;
+ }
+ const candidates = result.mrs ?? [];
+ // Prefer the open MR for the branch; fall back to a merged one so a
+ // just-merged branch still shows its request instead of nothing.
+ const matching =
+ candidates.find((mr) => mr.state === 'opened')
+ ?? candidates.find((mr) => mr.state === 'merged')
+ ?? null;
+ setBranchMr(matching);
+ setRepoRef(result.repo ?? null);
+ })
+ .catch((error) => {
+ if (!cancelled) {
+ setBranchMrError(error instanceof Error ? error.message : String(error));
+ }
+ })
+ .finally(() => {
+ if (!cancelled) {
+ setBranchMrLoading(false);
+ }
+ });
+ return () => {
+ cancelled = true;
+ };
+ }, [connected, currentBranch, currentDirectory, gitlab, retryToken]);
+
+ // ---- Open merge requests in this repository ----------------------------
+
+ const [openMrs, setOpenMrs] = React.useState([]);
+ const [listPage, setListPage] = React.useState(1);
+ const [listHasMore, setListHasMore] = React.useState(false);
+ const [listLoading, setListLoading] = React.useState(false);
+ const [listLoadingMore, setListLoadingMore] = React.useState(false);
+ const [listError, setListError] = React.useState(null);
+
+ React.useEffect(() => {
+ if (!currentDirectory || !connected || !gitlab?.mrsList) {
+ return;
+ }
+ let cancelled = false;
+ setListLoading(true);
+ setListError(null);
+ void gitlab
+ .mrsList(currentDirectory, { page: 1 })
+ .then((result) => {
+ if (cancelled) {
+ return;
+ }
+ setOpenMrs(result.mrs ?? []);
+ setListPage(result.page ?? 1);
+ setListHasMore(Boolean(result.hasMore));
+ })
+ .catch((error) => {
+ if (!cancelled) {
+ setListError(error instanceof Error ? error.message : String(error));
+ }
+ })
+ .finally(() => {
+ if (!cancelled) {
+ setListLoading(false);
+ }
+ });
+ return () => {
+ cancelled = true;
+ };
+ }, [connected, currentDirectory, gitlab, retryToken]);
+
+ const loadMore = React.useCallback(async () => {
+ if (!currentDirectory || !connected || !gitlab?.mrsList) {
+ return;
+ }
+ if (listLoadingMore || listLoading || !listHasMore) {
+ return;
+ }
+ setListLoadingMore(true);
+ try {
+ const next = await gitlab.mrsList(currentDirectory, { page: listPage + 1 });
+ setOpenMrs((previous) => [...previous, ...(next.mrs ?? [])]);
+ setListPage(next.page ?? listPage + 1);
+ setListHasMore(Boolean(next.hasMore));
+ } catch (error) {
+ setListError(error instanceof Error ? error.message : String(error));
+ } finally {
+ setListLoadingMore(false);
+ }
+ }, [connected, currentDirectory, gitlab, listHasMore, listLoading, listLoadingMore, listPage]);
+
+ // ---- Inline MR context (current-branch MR only) ------------------------
+
+ const [contextOpen, setContextOpen] = React.useState(false);
+ const [contextResult, setContextResult] = React.useState(null);
+ const [contextLoading, setContextLoading] = React.useState(false);
+
+ // A different branch MR invalidates any previously loaded context.
+ React.useEffect(() => {
+ setContextOpen(false);
+ setContextResult(null);
+ }, [branchMr?.number]);
+
+ // A different branch MR invalidates the update/merge transient state so the
+ // previous MR's edit form, squash flag, and in-flight requests don't leak.
+ React.useEffect(() => {
+ setUpdateOpen(false);
+ setEditTitle('');
+ setEditDescription('');
+ setEditDescriptionKnown(false);
+ setEditDescriptionLoading(false);
+ setUpdating(false);
+ setMergeSquash(false);
+ setMerging(false);
+ }, [branchMr?.number]);
+
+ const toggleContext = React.useCallback(async (mr: GitLabMergeRequestSummary) => {
+ if (!currentDirectory || !gitlab?.mrContext) {
+ return;
+ }
+ if (contextOpen) {
+ setContextOpen(false);
+ setContextResult(null);
+ return;
+ }
+ setContextOpen(true);
+ setContextLoading(true);
+ try {
+ const result = await gitlab.mrContext(currentDirectory, mr.number, { includeDiff: false });
+ setContextResult(result.connected === false ? null : result);
+ } catch {
+ setContextResult(null);
+ } finally {
+ setContextLoading(false);
+ }
+ }, [contextOpen, currentDirectory, gitlab]);
+
+ // Shared rich view for the branch MR's detail (title/body/chips/commits/
+ // files/timeline). Owns its own fetching through the forge facade.
+ const mrProvider = React.useMemo(() => (gitlab ? buildForgeProvider('gitlab', { gitlab }) : null), [gitlab]);
+
+ // ---- Create / update / merge actions -----------------------------------
+
+ const [createTitle, setCreateTitle] = React.useState('');
+ const [createDescription, setCreateDescription] = React.useState('');
+ const [createSourceBranch, setCreateSourceBranch] = React.useState(currentBranch ?? '');
+ const [createTargetBranch, setCreateTargetBranch] = React.useState('main');
+ const [createRemoveSourceBranch, setCreateRemoveSourceBranch] = React.useState(false);
+ const [creating, setCreating] = React.useState(false);
+ const createTargetTouchedRef = React.useRef(false);
+
+ // Repository branches for the source/target dropdowns, fetched lazily once
+ // the create form is visible.
+ const [branches, setBranches] = React.useState([]);
+ const [defaultBranch, setDefaultBranch] = React.useState(null);
+ const [branchesLoading, setBranchesLoading] = React.useState(false);
+
+ // The current branch is only known after git status resolves, so adopt it as
+ // the default source branch when it arrives without clobbering a pick.
+ React.useEffect(() => {
+ if (currentBranch) {
+ setCreateSourceBranch((previous) => previous || currentBranch);
+ }
+ }, [currentBranch]);
+
+ // The default target branch is the target of the repository's previously
+ // listed open MRs when available; otherwise fall back to main.
+ const defaultTargetBranch = React.useMemo(
+ () => openMrs.find((mr) => mr.targetBranch)?.targetBranch ?? 'main',
+ [openMrs],
+ );
+
+ // Adopt the repository's target branch default once the open-MR list
+ // resolves, unless the user has already typed into the field.
+ React.useEffect(() => {
+ if (branchMrLoading || branchMr || createTargetTouchedRef.current) {
+ return;
+ }
+ setCreateTargetBranch(defaultBranch ?? defaultTargetBranch);
+ }, [branchMr, branchMrLoading, defaultBranch, defaultTargetBranch]);
+
+ // The source dropdown must always offer the picked/current branch, even
+ // before the branch list resolves.
+ const sourceBranchOptions = React.useMemo(() => {
+ if (!createSourceBranch) {
+ return branches;
+ }
+ return branches.includes(createSourceBranch) ? branches : [createSourceBranch, ...branches];
+ }, [branches, createSourceBranch]);
+
+ // A merge request cannot target its own source branch once there is more
+ // than one branch to choose from.
+ const targetBranchOptions = React.useMemo(
+ () => (branches.length >= 2 ? branches.filter((branch) => branch !== createSourceBranch) : branches),
+ [branches, createSourceBranch],
+ );
+
+ // Fetch the repository's branches lazily once the create form is visible so
+ // the source/target dropdowns can offer real values. Failure surfaces as a
+ // toast and leaves the dropdowns on the current-branch fallback.
+ React.useEffect(() => {
+ if (!repoRef || branchMr || !connected || !gitlab?.repoBranches) {
+ return;
+ }
+ let cancelled = false;
+ setBranchesLoading(true);
+ void gitlab
+ .repoBranches(repoRef.namespace, repoRef.project)
+ .then((result) => {
+ if (cancelled) {
+ return;
+ }
+ setBranches(result.branches ?? []);
+ setDefaultBranch(result.defaultBranch ?? null);
+ })
+ .catch((error) => {
+ if (cancelled) {
+ return;
+ }
+ setBranches([]);
+ setDefaultBranch(null);
+ toast.error(t('contextPanel.gitlabMr.error.loadFailed'), {
+ description: error instanceof Error ? error.message : String(error),
+ });
+ })
+ .finally(() => {
+ if (!cancelled) {
+ setBranchesLoading(false);
+ }
+ });
+ return () => {
+ cancelled = true;
+ };
+ }, [branchMr, connected, gitlab, repoRef, t]);
+
+ const [updateOpen, setUpdateOpen] = React.useState(false);
+ const [editTitle, setEditTitle] = React.useState('');
+ const [editDescription, setEditDescription] = React.useState('');
+ const [editDescriptionKnown, setEditDescriptionKnown] = React.useState(false);
+ const [editDescriptionLoading, setEditDescriptionLoading] = React.useState(false);
+ const [updating, setUpdating] = React.useState(false);
+
+ const [mergeSquash, setMergeSquash] = React.useState(false);
+ const [merging, setMerging] = React.useState(false);
+
+ const createMr = React.useCallback(async () => {
+ if (!currentDirectory || !currentBranch || !gitlab?.mrCreate) {
+ return;
+ }
+ const targetBranch = createTargetBranch.trim();
+ if (!targetBranch) {
+ return;
+ }
+ setCreating(true);
+ try {
+ const created = await gitlab.mrCreate({
+ directory: currentDirectory,
+ title: createTitle.trim() || currentBranch,
+ sourceBranch: createSourceBranch,
+ targetBranch,
+ ...(createDescription.trim() ? { description: createDescription } : {}),
+ ...(createRemoveSourceBranch ? { removeSourceBranch: true } : {}),
+ });
+ toast.success(t('contextPanel.gitlabMr.createMr.toast.created'));
+ // Show the created MR immediately and refresh both the branch MR and
+ // the open list so the card flips to the opened state.
+ setBranchMr(created);
+ setRetryToken((value) => value + 1);
+ // Clear the form.
+ setCreateTitle('');
+ setCreateDescription('');
+ setCreateRemoveSourceBranch(false);
+ createTargetTouchedRef.current = false;
+ setCreateTargetBranch(defaultBranch ?? defaultTargetBranch);
+ } catch (error) {
+ toast.error(t('contextPanel.gitlabMr.createMr.toast.createFailed'), {
+ description: error instanceof Error ? error.message : String(error),
+ });
+ } finally {
+ setCreating(false);
+ }
+ }, [createDescription, createRemoveSourceBranch, createSourceBranch, createTargetBranch, createTitle, currentBranch, currentDirectory, defaultBranch, defaultTargetBranch, gitlab, t]);
+
+ const toggleUpdate = React.useCallback(async () => {
+ if (!branchMr) {
+ return;
+ }
+ if (updateOpen) {
+ setUpdateOpen(false);
+ return;
+ }
+ setUpdateOpen(true);
+ setEditTitle(branchMr.title);
+ const knownBody = contextResult?.mr?.body;
+ if (typeof knownBody === 'string') {
+ setEditDescription(knownBody);
+ setEditDescriptionKnown(true);
+ return;
+ }
+ setEditDescription('');
+ setEditDescriptionKnown(false);
+ if (!currentDirectory || !gitlab?.mrContext) {
+ return;
+ }
+ setEditDescriptionLoading(true);
+ try {
+ const result = await gitlab.mrContext(currentDirectory, branchMr.number, { includeDiff: false });
+ if (result.connected === false) {
+ setEditDescription('');
+ return;
+ }
+ setEditDescription(result.mr?.body ?? '');
+ setEditDescriptionKnown(true);
+ } catch {
+ // Leave the description empty; the title can still be edited.
+ } finally {
+ setEditDescriptionLoading(false);
+ }
+ }, [branchMr, contextResult?.mr?.body, currentDirectory, gitlab, updateOpen]);
+
+ const saveMr = React.useCallback(async () => {
+ if (!currentDirectory || !branchMr || !gitlab?.mrUpdate) {
+ return;
+ }
+ const trimmedTitle = editTitle.trim();
+ if (!trimmedTitle) {
+ return;
+ }
+ setUpdating(true);
+ try {
+ await gitlab.mrUpdate({
+ directory: currentDirectory,
+ number: branchMr.number,
+ title: trimmedTitle,
+ // Only send the description when it was actually loaded so an
+ // unresolved description can never be wiped out by a title-only save.
+ ...(editDescriptionKnown ? { description: editDescription } : {}),
+ });
+ toast.success(t('contextPanel.gitlabMr.updateMr.toast.updated'));
+ setUpdateOpen(false);
+ setRetryToken((value) => value + 1);
+ } catch (error) {
+ toast.error(t('contextPanel.gitlabMr.updateMr.toast.updateFailed'), {
+ description: error instanceof Error ? error.message : String(error),
+ });
+ } finally {
+ setUpdating(false);
+ }
+ }, [branchMr, currentDirectory, editDescription, editDescriptionKnown, editTitle, gitlab, t]);
+
+ const mergeMr = React.useCallback(async () => {
+ if (!currentDirectory || !branchMr || !gitlab?.mrMerge) {
+ return;
+ }
+ setMerging(true);
+ try {
+ const result = await gitlab.mrMerge({
+ directory: currentDirectory,
+ number: branchMr.number,
+ ...(mergeSquash ? { squash: true } : {}),
+ });
+ if (result.merged) {
+ toast.success(t('contextPanel.gitlabMr.mergeMr.toast.merged'));
+ } else {
+ toast.error(t('contextPanel.gitlabMr.mergeMr.toast.mergeFailed'), {
+ ...(result.message ? { description: result.message } : {}),
+ });
+ }
+ // Refresh the branch MR (flips to the merged state) and the open list.
+ setRetryToken((value) => value + 1);
+ } catch (error) {
+ toast.error(t('contextPanel.gitlabMr.mergeMr.toast.mergeFailed'), {
+ description: error instanceof Error ? error.message : String(error),
+ });
+ } finally {
+ setMerging(false);
+ }
+ }, [branchMr, currentDirectory, gitlab, mergeSquash, t]);
+
+ // ---- Render ------------------------------------------------------------
+
+ if (!currentDirectory) {
+ return (
+
+
+
{t('contextPanel.gitlabMr.title')}
+
{t('contextPanel.gitlabMr.empty.noActiveProject')}
+
+
+
{t('contextPanel.gitlabMr.loading')}
+
+
+
{t('contextPanel.gitlabMr.error.notConnected')}
+
+ {t('contextPanel.gitlabMr.actions.openSettings')}
+
+
+
+
+ setActiveTab(tabId as 'mr' | 'issues')}
+ layoutMode="fit"
+ variant="active-pill"
+ activePillButtonClassName="h-7"
+ />
+
+
+ {activeTab === 'mr' ? (
+ <>
+
+
{t('contextPanel.gitlabMr.title')}
+
{t('contextPanel.gitlabMr.listSectionTitle')}
+
+
+ {/* Current-branch merge request */}
+
+ {t('contextPanel.gitlabMr.branchSectionTitle')}
+
+ {branchMrLoading ? (
+
+
+ ) : branchMrError ? (
+
+
{t('contextPanel.gitlabMr.error.loadFailed')}
+
{branchMrError}
+
+ {t('contextPanel.preview.actions.retry')}
+
+
+
+
+ !{branchMr.number} {branchMr.title}
+
+
+ {branchMr.draft ? (
+ {t('contextPanel.gitlabMr.draft')}
+ ) : null}
+
+
+ {branchMr.sourceBranch} → {branchMr.targetBranch}
+
+ {branchMrAuthor ? (
+
{branchMrAuthor}
+ ) : null}
+
+
+
+
+
+
+
+
void toggleContext(branchMr)}
+ disabled={contextLoading}
+ >
+ {contextLoading ? (
+
+ {branchMr.state === 'opened' ? (
+ <>
+
void toggleUpdate()}
+ disabled={updating}
+ >
+
+
setMergeSquash((value) => !value)}
+ onKeyDown={(event) => {
+ if (event.key === ' ' || event.key === 'Enter') {
+ event.preventDefault();
+ setMergeSquash((value) => !value);
+ }
+ }}
+ >
+ setMergeSquash(next)}
+ ariaLabel={t('contextPanel.gitlabMr.mergeMr.squash')}
+ />
+ {t('contextPanel.gitlabMr.mergeMr.squash')}
+
+
void mergeMr()}
+ disabled={merging || updating}
+ >
+ {merging ?
+
+ ) : null}
+
+
+ {updateOpen && branchMr.state === 'opened' ? (
+
+
+ {t('contextPanel.gitlabMr.createMr.titleLabel')}
+
+
+ {t('contextPanel.gitlabMr.createMr.descriptionLabel')}
+ {editDescriptionLoading ? (
+
+
+ ) : (
+ 