Fix bug in draft stack branch name

This came about with a change to the `UiState` draft branch name, where 
we don't set it unless the user changes the default branch name.

Author: mtsgrd

apps/desktop/src/components/MultiStackCreateNew.svelte

@@ -108,7 +108,7 @@
 
 	async function showAndPrefillName() {
 		createRefModal?.show();
-		createRefName = await stackService.newBranchName(projectId);
+		createRefName = await stackService.fetchNewBranchName(projectId);
 		// Reset selected stack to default
 		selectedStackId = undefined;
 	}

apps/desktop/src/components/NewCommitView.svelte

@@ -81,9 +81,6 @@
 		return failed;
 	}
 
-	const stackState = $derived(stackId ? uiState.stack(stackId) : undefined);
-	const selection = $derived(stackState?.selection.current);
-
 	const exclusiveAction = $derived(projectState.exclusiveAction.current);
 	const commitAction = $derived(exclusiveAction?.type === 'commit' ? exclusiveAction : undefined);
 
@@ -92,11 +89,7 @@
 	const topBranchName = $derived(topBranchResult?.current.data?.at(0)?.name);
 
 	const draftBranchName = $derived(uiState.global.draftBranchName.current);
-
-	const selectedBranchName = $derived(selection?.branchName || topBranchName);
-	const canCommit = $derived(
-		(selectedBranchName || draftBranchName || topBranchName) && selectedLines.current.length > 0
-	);
+	const canCommit = $derived(selectedLines.current.length > 0);
 
 	let input = $state<ReturnType<typeof CommitMessageEditor>>();
 
@@ -110,13 +103,17 @@
 		await tick();
 		try {
 			let finalStackId = stackId;
-			let finalBranchName = commitAction?.branchName || topBranchName;
+			let finalBranchName = commitAction?.branchName || draftBranchName || topBranchName;
+			// TODO: Refactor this awkward fallback somehow.
+			if (!finalBranchName) {
+				finalBranchName = await stackService.fetchNewBranchName(projectId);
+			}
 			const parentId = commitAction?.parentCommitId;
 
 			if (!finalStackId) {
 				const stack = await createNewStack({
 					projectId,
-					branch: { name: draftBranchName, order: 0 }
+					branch: { name: finalBranchName, order: 0 }
 				});
 				finalStackId = stack.id;
 				projectState.stackId.set(finalStackId);

apps/desktop/src/components/StackDraft.svelte

@@ -3,6 +3,7 @@
 	import CommitGoesHere from '$components/CommitGoesHere.svelte';
 	import ConfigurableScrollableContainer from '$components/ConfigurableScrollableContainer.svelte';
 	import NewCommitView from '$components/NewCommitView.svelte';
+	import ReduxResult from '$components/ReduxResult.svelte';
 	import Resizer from '$components/Resizer.svelte';
 	import { StackService } from '$lib/stacks/stackService.svelte';
 	import { UiState } from '$lib/state/uiState.svelte';
@@ -43,20 +44,22 @@
 				<div class="new-commit-view" data-testid={TestId.NewCommitView}>
 					<NewCommitView {projectId} />
 				</div>
-				{#await newNameResult then newName}
-					{@const branchName = draftBranchName.current || newName}
-					<BranchCard
-						type="draft-branch"
-						{projectId}
-						{branchName}
-						readonly={false}
-						lineColor="var(--clr-commit-local)"
-					>
-						{#snippet branchContent()}
-							<CommitGoesHere commitId={undefined} selected last />
-						{/snippet}
-					</BranchCard>
-				{/await}
+				<ReduxResult {projectId} result={newNameResult.current}>
+					{#snippet children(newName)}
+						{@const branchName = draftBranchName.current || newName}
+						<BranchCard
+							type="draft-branch"
+							{projectId}
+							{branchName}
+							readonly={false}
+							lineColor="var(--clr-commit-local)"
+						>
+							{#snippet branchContent()}
+								<CommitGoesHere commitId={undefined} selected last />
+							{/snippet}
+						</BranchCard>
+					{/snippet}
+				</ReduxResult>
 				<Resizer
 					persistId="resizer-darft-panel"
 					viewport={draftPanelEl}

apps/desktop/src/components/v3/FileContextMenu.svelte

@@ -239,7 +239,7 @@
 		const branchName = selectionId.branchName;
 
 		const fileNames = changes.map((change) => change.path);
-		const newBranchName = await stackService.newBranchName(projectId);
+		const newBranchName = await stackService.fetchNewBranchName(projectId);
 
 		if (!newBranchName) {
 			toasts.error('Failed to generate a new branch name.');
@@ -269,7 +269,7 @@
 		const branchName = selectionId.branchName;
 
 		const fileNames = changes.map((change) => change.path);
-		const newBranchName = await stackService.newBranchName(projectId);
+		const newBranchName = await stackService.fetchNewBranchName(projectId);
 
 		if (!newBranchName) {
 			toasts.error('Failed to generate a new branch name.');
@@ -306,7 +306,7 @@
 						<ContextMenuItem
 							label="Stash into branch"
 							onclick={() => {
-								stackService.newBranchName(projectId).then((name) => {
+								stackService.fetchNewBranchName(projectId).then((name) => {
 									stashBranchName = name || '';
 								});
 								stashConfirmationModal?.show(item);

apps/desktop/src/lib/stacks/stackService.svelte.ts

@@ -736,7 +736,14 @@ export class StackService {
 		});
 	}
 
-	async newBranchName(projectId: string) {
+	newBranchName(projectId: string) {
+		const result = $derived(
+			this.api.endpoints.newBranchName.useQuery({ projectId }, { forceRefetch: true })
+		);
+		return result;
+	}
+
+	async fetchNewBranchName(projectId: string) {
 		return await this.api.endpoints.newBranchName.fetch({ projectId }, { forceRefetch: true });
 	}