From f3c103403c37dc75b02cc8f0a7672019491d80fa Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 06:59:13 +0000
Subject: [PATCH 1/4] Replace hardcoded PR/MR labels with dynamic forge-based
 labels (#11444)

- Refactor: rename GENERATE_MESSAGES to generateMessages for reactive clarity
- Update clipboard messages and context menu labels to use dynamic forge labels
- Update modal titles and CTA labels to use dynamic forge unit names

Co-authored-by: Byron <63622+Byron@users.noreply.github.com>
---
 .../src/components/BranchHeaderContextMenu.svelte    | 12 ++++++++----
 apps/desktop/src/components/BranchReview.svelte      | 11 ++++++-----
 apps/desktop/src/components/BranchesView.svelte      |  2 +-
 apps/desktop/src/components/BranchesViewPR.svelte    |  2 +-
 .../src/components/CanPublishReviewPlugin.svelte     |  3 ++-
 apps/desktop/src/components/PRBranchView.svelte      |  3 ++-
 apps/desktop/src/components/PullRequestCard.svelte   |  4 ++--
 apps/desktop/src/components/ReviewCreation.svelte    |  6 ++++--
 .../src/components/editor/MessageEditor.svelte       | 12 +++++++-----
 .../profileSettings/IntegrationsSettings.svelte      | 10 +++++++---
 10 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/apps/desktop/src/components/BranchHeaderContextMenu.svelte b/apps/desktop/src/components/BranchHeaderContextMenu.svelte
index 221f02dcfa..bf1436ec66 100644
--- a/apps/desktop/src/components/BranchHeaderContextMenu.svelte
+++ b/apps/desktop/src/components/BranchHeaderContextMenu.svelte
@@ -55,6 +55,8 @@
 	const aiService = inject(AI_SERVICE);
 	const stackService = inject(STACK_SERVICE);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
+	const prService = $derived(forge.current.prService);
+	const prUnit = $derived(prService?.unit);
 	const promptService = inject(PROMPT_SERVICE);
 	const urlService = inject(URL_SERVICE);
 	const clipboardService = inject(CLIPBOARD_SERVICE);
@@ -303,11 +305,11 @@
 				<ReduxResult {projectId} {stackId} result={prQuery?.result}>
 					{#snippet children(pr)}
 						<ContextMenuSection>
-							<ContextMenuItemSubmenu label="Pull Request" icon="pr">
+							<ContextMenuItemSubmenu label={prUnit?.name ?? 'Pull Request'} icon="pr">
 								{#snippet submenu({ close: closeSubmenu })}
 									<ContextMenuSection>
 										<ContextMenuItem
-											label="Open PR in browser"
+											label="Open {prUnit?.abbr ?? 'PR'} in browser"
 											testId={TestId.BranchHeaderContextMenu_OpenPRInBrowser}
 											onclick={() => {
 												urlService.openExternalUrl(pr.htmlUrl);
@@ -316,10 +318,12 @@
 											}}
 										/>
 										<ContextMenuItem
-											label="Copy PR link"
+											label="Copy {prUnit?.abbr ?? 'PR'} link"
 											testId={TestId.BranchHeaderContextMenu_CopyPRLink}
 											onclick={() => {
-												clipboardService.write(pr.htmlUrl, { message: 'PR link copied' });
+												clipboardService.write(pr.htmlUrl, {
+													message: `${prUnit?.abbr ?? 'PR'} link copied`
+												});
 												closeSubmenu();
 												close();
 											}}
diff --git a/apps/desktop/src/components/BranchReview.svelte b/apps/desktop/src/components/BranchReview.svelte
index 3c4f79f9b5..1ba7d73a73 100644
--- a/apps/desktop/src/components/BranchReview.svelte
+++ b/apps/desktop/src/components/BranchReview.svelte
@@ -28,6 +28,7 @@
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const prService = $derived(forge.current.prService);
 	const reviewUnit = $derived(prService?.unit.abbr);
+	const reviewUnitName = $derived(prService?.unit.name ?? 'Pull request');
 
 	const canPublishPR = $derived(!!canPublishReviewPlugin?.imports.canPublishPR);
 
@@ -49,21 +50,21 @@
 	<Modal
 		width="small"
 		type="warning"
-		title="Create Pull Request"
+		title="Create {reviewUnitName}"
 		bind:this={confirmCreatePrModal}
 		onSubmit={() => {
 			modal?.show();
 		}}
 	>
 		<p class="text-13 text-body helper-text">
-			It's strongly recommended to create pull requests starting with the branch at the base of the
-			stack.
+			It's strongly recommended to create {reviewUnitName.toLowerCase()}s starting with the branch
+			at the base of the stack.
 			<br />
-			Do you still want to create this pull request?
+			Do you still want to create this {reviewUnitName.toLowerCase()}?
 		</p>
 		{#snippet controls(close)}
 			<Button kind="outline" onclick={close}>Cancel</Button>
-			<Button style="warning" type="submit">Create Pull Request</Button>
+			<Button style="warning" type="submit">Create {reviewUnitName}</Button>
 		{/snippet}
 	</Modal>
 
diff --git a/apps/desktop/src/components/BranchesView.svelte b/apps/desktop/src/components/BranchesView.svelte
index 0515b2cdea..eeccb1bf21 100644
--- a/apps/desktop/src/components/BranchesView.svelte
+++ b/apps/desktop/src/components/BranchesView.svelte
@@ -334,7 +334,7 @@
 										icon="workbench"
 										onclick={applyFromFork}
 									>
-										Apply PR to workspace
+										Apply {prUnit?.abbr ?? 'PR'} to workspace
 									</Button>
 								{/if}
 							</div>
diff --git a/apps/desktop/src/components/BranchesViewPR.svelte b/apps/desktop/src/components/BranchesViewPR.svelte
index a5cb464310..0a90d9cb9a 100644
--- a/apps/desktop/src/components/BranchesViewPR.svelte
+++ b/apps/desktop/src/components/BranchesViewPR.svelte
@@ -110,7 +110,7 @@
 
 		<Modal
 			testId={TestId.BranchesView_CreateRemoteModal}
-			title="Apply Pull Request"
+			title="Apply {prUnit?.name ?? 'Pull Request'}"
 			width="small"
 			bind:this={createRemoteModal}
 			onSubmit={async () => await handleConfirmRemote(pr)}
diff --git a/apps/desktop/src/components/CanPublishReviewPlugin.svelte b/apps/desktop/src/components/CanPublishReviewPlugin.svelte
index ee11407eff..c384a59ee8 100644
--- a/apps/desktop/src/components/CanPublishReviewPlugin.svelte
+++ b/apps/desktop/src/components/CanPublishReviewPlugin.svelte
@@ -23,10 +23,11 @@
 	const prService = $derived(forge.current.prService);
 	const prQuery = $derived(prNumber ? prService?.get(prNumber) : undefined);
 	const pr = $derived(prQuery?.response);
+	const reviewUnitName = $derived(prService?.unit.name ?? 'Pull request');
 
 	const canPublishPR = $derived(forge.current.authenticated && !pr);
 
-	const ctaLabel = 'Create Pull Request…';
+	const ctaLabel = $derived(`Create ${reviewUnitName}…`);
 
 	export const imports = {
 		get allowedToPublishPR() {
diff --git a/apps/desktop/src/components/PRBranchView.svelte b/apps/desktop/src/components/PRBranchView.svelte
index 19ab9bf370..7a66da23e9 100644
--- a/apps/desktop/src/components/PRBranchView.svelte
+++ b/apps/desktop/src/components/PRBranchView.svelte
@@ -17,6 +17,7 @@
 	const prService = $derived(forge.current.prService);
 	const prQuery = $derived(prService?.get(prNumber, { forceRefetch: true }));
 	const unitSymbol = $derived(prService?.unit.symbol ?? '');
+	const unitAbbr = $derived(prService?.unit.abbr ?? 'PR');
 </script>
 
 <ReduxResult result={prQuery?.result} {projectId} {onerror}>
@@ -24,7 +25,7 @@
 		<Drawer testId={TestId.PRBranchDrawer} persistId="pr-branch-drawer-{projectId}-{pr.number}">
 			{#snippet header()}
 				<h3 class="text-14 text-semibold truncate">
-					<span class="clr-text-2">PR {unitSymbol}{pr.number}:</span>
+					<span class="clr-text-2">{unitAbbr} {unitSymbol}{pr.number}:</span>
 					<span> {pr.title}</span>
 				</h3>
 			{/snippet}
diff --git a/apps/desktop/src/components/PullRequestCard.svelte b/apps/desktop/src/components/PullRequestCard.svelte
index 88db72c397..0c5a9dea35 100644
--- a/apps/desktop/src/components/PullRequestCard.svelte
+++ b/apps/desktop/src/components/PullRequestCard.svelte
@@ -126,7 +126,7 @@
 				<ContextMenuItem
 					label="Copy link"
 					onclick={() => {
-						clipboardService.write(pr.htmlUrl, { message: 'PR link copied' });
+						clipboardService.write(pr.htmlUrl, { message: `${abbr} link copied` });
 						contextMenuEl?.close();
 					}}
 				/>
@@ -179,7 +179,7 @@
 					icon="copy-small"
 					tooltip="Copy {abbr} link"
 					onclick={() => {
-						clipboardService.write(pr.htmlUrl, { message: 'PR link copied' });
+						clipboardService.write(pr.htmlUrl, { message: `${abbr} link copied` });
 					}}
 				/>
 				<Button
diff --git a/apps/desktop/src/components/ReviewCreation.svelte b/apps/desktop/src/components/ReviewCreation.svelte
index 54851c7d7b..bfaabe5069 100644
--- a/apps/desktop/src/components/ReviewCreation.svelte
+++ b/apps/desktop/src/components/ReviewCreation.svelte
@@ -57,6 +57,7 @@
 	const baseBranchName = $derived(baseBranch?.shortName);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const prService = $derived(forge.current.prService);
+	const prUnit = $derived(prService?.unit);
 	const stackService = inject(STACK_SERVICE);
 	const aiService = inject(AI_SERVICE);
 	const remotesService = inject(REMOTES_SERVICE);
@@ -423,7 +424,7 @@
 					onClose();
 				}
 			})}
-			placeholder="PR title"
+			placeholder="{prUnit?.abbr ?? 'PR'} title"
 			showCount={false}
 			oninput={imeHandler.handleInput((e: Event) => {
 				const target = e.target as HTMLInputElement;
@@ -439,8 +440,9 @@
 			initialValue={$prBody}
 			enableFileUpload
 			enableSmiles
-			placeholder="PR Description"
+			placeholder="{prUnit?.abbr ?? 'PR'} Description"
 			messageType="pr"
+			reviewUnitAbbr={prUnit?.abbr}
 			{onAiButtonClick}
 			{canUseAI}
 			{aiIsLoading}
diff --git a/apps/desktop/src/components/editor/MessageEditor.svelte b/apps/desktop/src/components/editor/MessageEditor.svelte
index 17eb0032d8..bbaf9c30f9 100644
--- a/apps/desktop/src/components/editor/MessageEditor.svelte
+++ b/apps/desktop/src/components/editor/MessageEditor.svelte
@@ -61,6 +61,7 @@
 		forceSansFont?: boolean;
 		useRuler?: boolean;
 		messageType: 'commit' | 'pr';
+		reviewUnitAbbr?: string;
 	}
 
 	let {
@@ -80,7 +81,8 @@
 		testId,
 		forceSansFont,
 		useRuler,
-		messageType
+		messageType,
+		reviewUnitAbbr
 	}: Props = $props();
 
 	const MIN_RULER_VALUE = 30;
@@ -230,17 +232,17 @@
 		medium: 320
 	};
 
-	const GENERATE_MESSAGES: Record<typeof messageType, string> = {
+	const generateMessages = $derived.by(() => ({
 		commit: 'Generate commit message',
-		pr: 'Generate PR description'
-	};
+		pr: `Generate ${reviewUnitAbbr ?? 'PR'} description`
+	}));
 
 	function getTooltipText(): string | undefined {
 		if (!canUseAI) {
 			return 'You need to enable AI in the project settings to use this feature';
 		}
 		if (currentEditorWidth <= DROPDOWN_BTN_BREAKPOINTS.medium) {
-			return GENERATE_MESSAGES[messageType];
+			return generateMessages[messageType];
 		}
 		return undefined;
 	}
diff --git a/apps/desktop/src/components/profileSettings/IntegrationsSettings.svelte b/apps/desktop/src/components/profileSettings/IntegrationsSettings.svelte
index 59d9c59b3e..dc96d60de0 100644
--- a/apps/desktop/src/components/profileSettings/IntegrationsSettings.svelte
+++ b/apps/desktop/src/components/profileSettings/IntegrationsSettings.svelte
@@ -1,11 +1,15 @@
 <script lang="ts">
 	import GithubIntegration from '$components/GithubIntegration.svelte';
 	import { SETTINGS_SERVICE } from '$lib/config/appSettingsV2';
+	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
 	import { inject } from '@gitbutler/core/context';
 	import { CardGroup, Spacer, Toggle } from '@gitbutler/ui';
 
 	const settingsService = inject(SETTINGS_SERVICE);
 	const appSettings = settingsService.appSettings;
+	const forge = inject(DEFAULT_FORGE_FACTORY);
+	const prService = $derived(forge.current.prService);
+	const prUnit = $derived(prService?.unit);
 
 	async function toggleAutoFillPrDescription() {
 		await settingsService.updateReviews({
@@ -20,11 +24,11 @@
 
 <CardGroup.Item labelFor="autoFillPrDescription">
 	{#snippet title()}
-		Auto-fill PR descriptions from commit
+		Auto-fill {prUnit?.abbr ?? 'PR'} descriptions from commit
 	{/snippet}
 	{#snippet caption()}
-		When creating a pull request for a branch with just one commit, automatically use that commit's
-		message as the PR title and description.
+		When creating a {prUnit?.name.toLowerCase() ?? 'pull request'} for a branch with just one commit,
+		automatically use that commit's message as the {prUnit?.abbr ?? 'PR'} title and description.
 	{/snippet}
 	{#snippet actions()}
 		<Toggle

From 1cf4d1188e3e8b9f5164f4df9f67f5c38ff3d4d9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 16:10:55 +0000
Subject: [PATCH 2/4] Use static "PR/MR" in global settings instead of dynamic
 labels

Co-authored-by: Byron <63622+Byron@users.noreply.github.com>
---
 .../profileSettings/IntegrationsSettings.svelte        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/components/profileSettings/IntegrationsSettings.svelte b/apps/desktop/src/components/profileSettings/IntegrationsSettings.svelte
index dc96d60de0..7a72c3cc38 100644
--- a/apps/desktop/src/components/profileSettings/IntegrationsSettings.svelte
+++ b/apps/desktop/src/components/profileSettings/IntegrationsSettings.svelte
@@ -1,15 +1,11 @@
 <script lang="ts">
 	import GithubIntegration from '$components/GithubIntegration.svelte';
 	import { SETTINGS_SERVICE } from '$lib/config/appSettingsV2';
-	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
 	import { inject } from '@gitbutler/core/context';
 	import { CardGroup, Spacer, Toggle } from '@gitbutler/ui';
 
 	const settingsService = inject(SETTINGS_SERVICE);
 	const appSettings = settingsService.appSettings;
-	const forge = inject(DEFAULT_FORGE_FACTORY);
-	const prService = $derived(forge.current.prService);
-	const prUnit = $derived(prService?.unit);
 
 	async function toggleAutoFillPrDescription() {
 		await settingsService.updateReviews({
@@ -24,11 +20,11 @@
 
 <CardGroup.Item labelFor="autoFillPrDescription">
 	{#snippet title()}
-		Auto-fill {prUnit?.abbr ?? 'PR'} descriptions from commit
+		Auto-fill PR/MR descriptions from commit
 	{/snippet}
 	{#snippet caption()}
-		When creating a {prUnit?.name.toLowerCase() ?? 'pull request'} for a branch with just one commit,
-		automatically use that commit's message as the {prUnit?.abbr ?? 'PR'} title and description.
+		When creating a pull request or merge request for a branch with just one commit, automatically
+		use that commit's message as the PR/MR title and description.
 	{/snippet}
 	{#snippet actions()}
 		<Toggle

From 3613ad7f07e290a6ac594f472475035d23d0c0f9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 16:28:59 +0000
Subject: [PATCH 3/4] Add forge factory getters to reduce duplicated fallback
 defaults

Co-authored-by: Byron <63622+Byron@users.noreply.github.com>
---
 .../components/BranchHeaderContextMenu.svelte | 10 ++++-----
 .../src/components/BranchReview.svelte        | 11 +++++-----
 .../src/components/BranchesView.svelte        |  2 +-
 .../src/components/BranchesViewPR.svelte      |  3 +--
 .../components/CanPublishReviewPlugin.svelte  |  3 +--
 .../src/components/PRBranchView.svelte        |  5 ++---
 .../src/components/ReviewCreation.svelte      |  7 +++----
 .../src/lib/forge/forgeFactory.svelte.ts      | 21 +++++++++++++++++++
 8 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/apps/desktop/src/components/BranchHeaderContextMenu.svelte b/apps/desktop/src/components/BranchHeaderContextMenu.svelte
index bf1436ec66..f3662aa9f8 100644
--- a/apps/desktop/src/components/BranchHeaderContextMenu.svelte
+++ b/apps/desktop/src/components/BranchHeaderContextMenu.svelte
@@ -55,8 +55,6 @@
 	const aiService = inject(AI_SERVICE);
 	const stackService = inject(STACK_SERVICE);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
-	const prService = $derived(forge.current.prService);
-	const prUnit = $derived(prService?.unit);
 	const promptService = inject(PROMPT_SERVICE);
 	const urlService = inject(URL_SERVICE);
 	const clipboardService = inject(CLIPBOARD_SERVICE);
@@ -305,11 +303,11 @@
 				<ReduxResult {projectId} {stackId} result={prQuery?.result}>
 					{#snippet children(pr)}
 						<ContextMenuSection>
-							<ContextMenuItemSubmenu label={prUnit?.name ?? 'Pull Request'} icon="pr">
+							<ContextMenuItemSubmenu label={forge.reviewUnitName} icon="pr">
 								{#snippet submenu({ close: closeSubmenu })}
 									<ContextMenuSection>
 										<ContextMenuItem
-											label="Open {prUnit?.abbr ?? 'PR'} in browser"
+											label="Open {forge.reviewUnitAbbr} in browser"
 											testId={TestId.BranchHeaderContextMenu_OpenPRInBrowser}
 											onclick={() => {
 												urlService.openExternalUrl(pr.htmlUrl);
@@ -318,11 +316,11 @@
 											}}
 										/>
 										<ContextMenuItem
-											label="Copy {prUnit?.abbr ?? 'PR'} link"
+											label="Copy {forge.reviewUnitAbbr} link"
 											testId={TestId.BranchHeaderContextMenu_CopyPRLink}
 											onclick={() => {
 												clipboardService.write(pr.htmlUrl, {
-													message: `${prUnit?.abbr ?? 'PR'} link copied`
+													message: `${forge.reviewUnitAbbr} link copied`
 												});
 												closeSubmenu();
 												close();
diff --git a/apps/desktop/src/components/BranchReview.svelte b/apps/desktop/src/components/BranchReview.svelte
index 1ba7d73a73..611d9377d5 100644
--- a/apps/desktop/src/components/BranchReview.svelte
+++ b/apps/desktop/src/components/BranchReview.svelte
@@ -28,7 +28,6 @@
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const prService = $derived(forge.current.prService);
 	const reviewUnit = $derived(prService?.unit.abbr);
-	const reviewUnitName = $derived(prService?.unit.name ?? 'Pull request');
 
 	const canPublishPR = $derived(!!canPublishReviewPlugin?.imports.canPublishPR);
 
@@ -50,21 +49,21 @@
 	<Modal
 		width="small"
 		type="warning"
-		title="Create {reviewUnitName}"
+		title="Create {forge.reviewUnitName}"
 		bind:this={confirmCreatePrModal}
 		onSubmit={() => {
 			modal?.show();
 		}}
 	>
 		<p class="text-13 text-body helper-text">
-			It's strongly recommended to create {reviewUnitName.toLowerCase()}s starting with the branch
-			at the base of the stack.
+			It's strongly recommended to create {forge.reviewUnitName.toLowerCase()}s starting with the
+			branch at the base of the stack.
 			<br />
-			Do you still want to create this {reviewUnitName.toLowerCase()}?
+			Do you still want to create this {forge.reviewUnitName.toLowerCase()}?
 		</p>
 		{#snippet controls(close)}
 			<Button kind="outline" onclick={close}>Cancel</Button>
-			<Button style="warning" type="submit">Create {reviewUnitName}</Button>
+			<Button style="warning" type="submit">Create {forge.reviewUnitName}</Button>
 		{/snippet}
 	</Modal>
 
diff --git a/apps/desktop/src/components/BranchesView.svelte b/apps/desktop/src/components/BranchesView.svelte
index eeccb1bf21..4f76e53626 100644
--- a/apps/desktop/src/components/BranchesView.svelte
+++ b/apps/desktop/src/components/BranchesView.svelte
@@ -334,7 +334,7 @@
 										icon="workbench"
 										onclick={applyFromFork}
 									>
-										Apply {prUnit?.abbr ?? 'PR'} to workspace
+										Apply {forge.reviewUnitAbbr} to workspace
 									</Button>
 								{/if}
 							</div>
diff --git a/apps/desktop/src/components/BranchesViewPR.svelte b/apps/desktop/src/components/BranchesViewPR.svelte
index 0a90d9cb9a..a63231b975 100644
--- a/apps/desktop/src/components/BranchesViewPR.svelte
+++ b/apps/desktop/src/components/BranchesViewPR.svelte
@@ -26,7 +26,6 @@
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const prService = $derived(forge.current.prService);
 	const prQuery = $derived(prService?.get(prNumber, { forceRefetch: true }));
-	const prUnit = $derived(prService?.unit);
 
 	const uiState = inject(UI_STATE);
 	const projectState = $derived(uiState.project(projectId));
@@ -110,7 +109,7 @@
 
 		<Modal
 			testId={TestId.BranchesView_CreateRemoteModal}
-			title="Apply {prUnit?.name ?? 'Pull Request'}"
+			title="Apply {forge.reviewUnitName}"
 			width="small"
 			bind:this={createRemoteModal}
 			onSubmit={async () => await handleConfirmRemote(pr)}
diff --git a/apps/desktop/src/components/CanPublishReviewPlugin.svelte b/apps/desktop/src/components/CanPublishReviewPlugin.svelte
index c384a59ee8..1a062349b1 100644
--- a/apps/desktop/src/components/CanPublishReviewPlugin.svelte
+++ b/apps/desktop/src/components/CanPublishReviewPlugin.svelte
@@ -23,11 +23,10 @@
 	const prService = $derived(forge.current.prService);
 	const prQuery = $derived(prNumber ? prService?.get(prNumber) : undefined);
 	const pr = $derived(prQuery?.response);
-	const reviewUnitName = $derived(prService?.unit.name ?? 'Pull request');
 
 	const canPublishPR = $derived(forge.current.authenticated && !pr);
 
-	const ctaLabel = $derived(`Create ${reviewUnitName}…`);
+	const ctaLabel = $derived(`Create ${forge.reviewUnitName}…`);
 
 	export const imports = {
 		get allowedToPublishPR() {
diff --git a/apps/desktop/src/components/PRBranchView.svelte b/apps/desktop/src/components/PRBranchView.svelte
index 7a66da23e9..2095ef1c40 100644
--- a/apps/desktop/src/components/PRBranchView.svelte
+++ b/apps/desktop/src/components/PRBranchView.svelte
@@ -16,8 +16,6 @@
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const prService = $derived(forge.current.prService);
 	const prQuery = $derived(prService?.get(prNumber, { forceRefetch: true }));
-	const unitSymbol = $derived(prService?.unit.symbol ?? '');
-	const unitAbbr = $derived(prService?.unit.abbr ?? 'PR');
 </script>
 
 <ReduxResult result={prQuery?.result} {projectId} {onerror}>
@@ -25,7 +23,8 @@
 		<Drawer testId={TestId.PRBranchDrawer} persistId="pr-branch-drawer-{projectId}-{pr.number}">
 			{#snippet header()}
 				<h3 class="text-14 text-semibold truncate">
-					<span class="clr-text-2">{unitAbbr} {unitSymbol}{pr.number}:</span>
+					<span class="clr-text-2">{forge.reviewUnitAbbr} {forge.reviewUnitSymbol}{pr.number}:</span
+					>
 					<span> {pr.title}</span>
 				</h3>
 			{/snippet}
diff --git a/apps/desktop/src/components/ReviewCreation.svelte b/apps/desktop/src/components/ReviewCreation.svelte
index bfaabe5069..830c4ec3fe 100644
--- a/apps/desktop/src/components/ReviewCreation.svelte
+++ b/apps/desktop/src/components/ReviewCreation.svelte
@@ -57,7 +57,6 @@
 	const baseBranchName = $derived(baseBranch?.shortName);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const prService = $derived(forge.current.prService);
-	const prUnit = $derived(prService?.unit);
 	const stackService = inject(STACK_SERVICE);
 	const aiService = inject(AI_SERVICE);
 	const remotesService = inject(REMOTES_SERVICE);
@@ -424,7 +423,7 @@
 					onClose();
 				}
 			})}
-			placeholder="{prUnit?.abbr ?? 'PR'} title"
+			placeholder="{forge.reviewUnitAbbr} title"
 			showCount={false}
 			oninput={imeHandler.handleInput((e: Event) => {
 				const target = e.target as HTMLInputElement;
@@ -440,9 +439,9 @@
 			initialValue={$prBody}
 			enableFileUpload
 			enableSmiles
-			placeholder="{prUnit?.abbr ?? 'PR'} Description"
+			placeholder="{forge.reviewUnitAbbr} Description"
 			messageType="pr"
-			reviewUnitAbbr={prUnit?.abbr}
+			reviewUnitAbbr={forge.reviewUnitAbbr}
 			{onAiButtonClick}
 			{canUseAI}
 			{aiIsLoading}
diff --git a/apps/desktop/src/lib/forge/forgeFactory.svelte.ts b/apps/desktop/src/lib/forge/forgeFactory.svelte.ts
index b053a31e60..d1b7b281bd 100644
--- a/apps/desktop/src/lib/forge/forgeFactory.svelte.ts
+++ b/apps/desktop/src/lib/forge/forgeFactory.svelte.ts
@@ -73,6 +73,27 @@ export class DefaultForgeFactory implements Reactive<Forge> {
 		return this._canSetupIntegration;
 	}
 
+	/**
+	 * Get review unit abbreviation with fallback to 'PR'
+	 */
+	get reviewUnitAbbr(): string {
+		return this._forge.prService?.unit.abbr ?? 'PR';
+	}
+
+	/**
+	 * Get review unit name with fallback to 'Pull request'
+	 */
+	get reviewUnitName(): string {
+		return this._forge.prService?.unit.name ?? 'Pull request';
+	}
+
+	/**
+	 * Get review unit symbol with fallback to '#'
+	 */
+	get reviewUnitSymbol(): string {
+		return this._forge.prService?.unit.symbol ?? '#';
+	}
+
 	setConfig(config: ForgeConfig) {
 		if (deepCompare(config, this._config)) {
 			return;

From 47d45db36e2c741522fefb3620ac695c17d0fe2d Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Thu, 4 Dec 2025 18:53:24 +0100
Subject: [PATCH 4/4] Add missing symbol

Strangely enough, this wasn't flagged when running `pnpm begood` locally.
CI found it though, and it's definitely a real issue.
It's unclear to me how that's possible.
---
 apps/desktop/src/components/BranchesViewPR.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/desktop/src/components/BranchesViewPR.svelte b/apps/desktop/src/components/BranchesViewPR.svelte
index a63231b975..086120981d 100644
--- a/apps/desktop/src/components/BranchesViewPR.svelte
+++ b/apps/desktop/src/components/BranchesViewPR.svelte
@@ -26,6 +26,7 @@
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const prService = $derived(forge.current.prService);
 	const prQuery = $derived(prService?.get(prNumber, { forceRefetch: true }));
+	const prUnit = $derived(prService?.unit);
 
 	const uiState = inject(UI_STATE);
 	const projectState = $derived(uiState.project(projectId));