Rename stackState -> laneState

mtsgrd · mtsgrd · commit 9b7d54457bdd · 2025-08-13T01:24:29.000+02:00
diff --git a/apps/desktop/src/components/BranchCard.svelte b/apps/desktop/src/components/BranchCard.svelte
@@ -99,10 +99,8 @@
 			exclusiveAction.branchName === branchName
 	);
 
-	const stackState = $derived(
-		args.type === 'stack-branch' ? uiState.stack(args.laneId) : undefined
-	);
-	const selection = $derived(stackState ? stackState.selection.current : undefined);
+	const laneState = $derived(args.type === 'stack-branch' ? uiState.lane(args.laneId) : undefined);
+	const selection = $derived(laneState ? laneState.selection.current : undefined);
 	const selected = $derived(selection?.branchName === branchName);
 	const isPushed = $derived(!!(args.type === 'draft-branch' ? undefined : args.trackingBranch));
 
diff --git a/apps/desktop/src/components/BranchCommitList.svelte b/apps/desktop/src/components/BranchCommitList.svelte
@@ -111,8 +111,8 @@
 	const isCommitting = $derived(
 		exclusiveAction?.type === 'commit' && exclusiveAction.stackId === stackId
 	);
-	const stackState = $derived(uiState.stack(laneId));
-	const selection = $derived(stackState.selection);
+	const laneState = $derived(uiState.lane(laneId));
+	const selection = $derived(laneState.selection);
 	const runHooks = $derived(projectRunCommitHooks(projectId));
 
 	const selectedBranchName = $derived(selection.current?.branchName);
@@ -156,7 +156,7 @@
 
 	async function handleCommitClick(commitId: string, upstream: boolean) {
 		if (selectedCommitId !== commitId) {
-			stackState.selection.set({ branchName, commitId, upstream });
+			laneState.selection.set({ branchName, commitId, upstream });
 		}
 		projectState.stackId.set(stackId);
 		onselect?.();
@@ -327,7 +327,7 @@
 								stackId,
 								$runHooks,
 								dzCommit,
-								(newId) => uiState.stack(stackId).selection.set({ branchName, commitId: newId }),
+								(newId) => uiState.lane(stackId).selection.set({ branchName, commitId: newId }),
 								uiState
 							)
 						: undefined}
diff --git a/apps/desktop/src/components/BranchList.svelte b/apps/desktop/src/components/BranchList.svelte
@@ -55,8 +55,8 @@
 	const isCommitting = $derived(
 		exclusiveAction?.type === 'commit' && exclusiveAction?.stackId === stackId
 	);
-	const stackState = $derived(uiState.stack(laneId));
-	const selection = $derived(stackState.selection);
+	const laneState = $derived(uiState.lane(laneId));
+	const selection = $derived(laneState.selection);
 	const selectedCommitId = $derived(selection.current?.commitId);
 
 	let newBranchModal = $state<ReturnType<typeof NewBranchModal>>();
@@ -70,7 +70,7 @@
 	}
 
 	function startEditingCommitMessage(branchName: string, commitId: string) {
-		stackState.selection.set({ branchName, commitId });
+		laneState.selection.set({ branchName, commitId });
 		projectState.exclusiveAction.set({
 			type: 'edit-commit-message',
 			stackId,
@@ -185,7 +185,7 @@
 					trackingBranch={branch.remoteTrackingBranch ?? undefined}
 					readonly={!!branch.remoteTrackingBranch}
 					onclick={() => {
-						uiState.stack(laneId).selection.set({ branchName });
+						uiState.lane(laneId).selection.set({ branchName });
 						intelligentScrollingService.show(projectId, laneId, 'details');
 						onselect?.();
 					}}
diff --git a/apps/desktop/src/components/CommitMessageEditor.svelte b/apps/desktop/src/components/CommitMessageEditor.svelte
@@ -63,8 +63,8 @@
 	const uncommittedService = inject(UNCOMMITTED_SERVICE);
 	const stackService = inject(STACK_SERVICE);
 
-	const stackState = $derived(stackId ? uiState.stack(stackId) : undefined);
-	const stackSelection = $derived(stackState?.selection);
+	const laneState = $derived(stackId ? uiState.lane(stackId) : undefined);
+	const stackSelection = $derived(laneState?.selection);
 
 	let composer = $state<ReturnType<typeof MessageEditor>>();
 	let titleInput = $state<HTMLTextAreaElement>();
diff --git a/apps/desktop/src/components/CommitView.svelte b/apps/desktop/src/components/CommitView.svelte
@@ -60,9 +60,9 @@
 
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const modeService = injectOptional(MODE_SERVICE, undefined);
-	const stackState = $derived(uiState.stack(laneId));
+	const laneState = $derived(uiState.lane(laneId));
 	const projectState = $derived(uiState.project(projectId));
-	const selected = $derived(stackState.selection);
+	const selected = $derived(laneState.selection);
 	const branchName = $derived(selected.current?.branchName);
 
 	const commitResult = $derived(
@@ -123,7 +123,7 @@
 			message: commitMessage
 		});
 
-		uiState.stack(stackId).selection.set({ branchName, commitId: newCommitId });
+		uiState.lane(stackId).selection.set({ branchName, commitId: newCommitId });
 		setMode('view');
 	}
 
diff --git a/apps/desktop/src/components/FeedItemKind.svelte b/apps/desktop/src/components/FeedItemKind.svelte
@@ -30,8 +30,8 @@
 
 	function selectCommit(stackId: string, branchName: string, commitId: string) {
 		const projectState = uiState.project(projectId);
-		const stackState = uiState.stack(stackId);
-		stackState.selection.set({
+		const laneState = uiState.lane(stackId);
+		laneState.selection.set({
 			branchName,
 			commitId
 		});
@@ -40,8 +40,8 @@
 
 	function selectBranch(stackId: string, branchName: string) {
 		const projectState = uiState.project(projectId);
-		const stackState = uiState.stack(stackId);
-		stackState.selection.set({
+		const laneState = uiState.lane(stackId);
+		laneState.selection.set({
 			branchName
 		});
 		projectState.stackId.set(stackId);
diff --git a/apps/desktop/src/components/FileContextMenu.svelte b/apps/desktop/src/components/FileContextMenu.svelte
@@ -158,15 +158,15 @@
 			changes: changesToDiffSpec(changes)
 		});
 		const newCommitId = replacedCommits.find(([before]) => before === commitId)?.[1];
-		const branchName = uiState.stack(stackId).selection.current?.branchName;
+		const branchName = uiState.lane(stackId).selection.current?.branchName;
 		const selectedFiles = changes.map((change) => ({ ...selectionId, path: change.path }));
 
 		// Unselect the uncommitted files
 		idSelection.removeMany(selectedFiles);
 
 		if (newCommitId && branchName) {
 			// Update the selection to the new commit
-			uiState.stack(stackId).selection.set({ branchName, commitId: newCommitId });
+			uiState.lane(stackId).selection.set({ branchName, commitId: newCommitId });
 		}
 		contextMenu.close();
 	}
diff --git a/apps/desktop/src/components/MultiStackView.svelte b/apps/desktop/src/components/MultiStackView.svelte
@@ -143,8 +143,8 @@
 	`StackView` instead of being set imperatively in the dragstart handler.
 	 -->
 		{#each mutableStacks as stack, i (stack.id)}
-			{@const stackState = uiState.stack(stack.id)}
-			{@const selection = stackState.selection}
+			{@const laneState = uiState.lane(stack.id)}
+			{@const selection = laneState.selection}
 			<div
 				class="reorderable-stack"
 				role="presentation"
diff --git a/apps/desktop/src/components/NewCommitView.svelte b/apps/desktop/src/components/NewCommitView.svelte
@@ -26,7 +26,7 @@
 
 	const projectState = $derived(uiState.project(projectId));
 	// Using a dummy stackId kind of sucks... but it's fine for now
-	const stackState = $derived(uiState.stack(stackId || 'new-commit-view--new-stack'));
+	const laneState = $derived(uiState.lane(stackId || 'new-commit-view--new-stack'));
 
 	const [createCommitInStack, commitCreation] = stackService.createCommit({});
 
@@ -120,7 +120,7 @@
 
 			if (newId) {
 				// Clear saved state for commit message editor.
-				stackState.newCommitMessage.set({ title: '', description: '' });
+				laneState.newCommitMessage.set({ title: '', description: '' });
 
 				// Close the drawer.
 				projectState.exclusiveAction.set(undefined);
@@ -143,7 +143,7 @@
 					projectId,
 					targetBranchName: finalBranchName,
 					newCommitId: newId ?? undefined,
-					commitTitle: stackState.newCommitMessage.current?.title || '',
+					commitTitle: laneState.newCommitMessage.current?.title || '',
 					pathsToRejectedChanges
 				});
 			}
@@ -155,7 +155,7 @@
 	const [createNewStack, newStackResult] = stackService.newStack;
 
 	async function handleCommitCreation(title: string, description: string) {
-		stackState.newCommitMessage.set({ title, description });
+		laneState.newCommitMessage.set({ title, description });
 
 		const message = description ? title + '\n\n' + description : title;
 		if (!message) {
@@ -184,15 +184,15 @@
 		}
 
 		if (newCommitMessageUpdate) {
-			stackState.newCommitMessage.set({
-				...stackState.newCommitMessage.current,
+			laneState.newCommitMessage.set({
+				...laneState.newCommitMessage.current,
 				...newCommitMessageUpdate
 			});
 		}
 	}
 
 	function cancel(args: { title: string; description: string }) {
-		stackState.newCommitMessage.set(args);
+		laneState.newCommitMessage.set(args);
 		projectState.exclusiveAction.set(undefined);
 		uncommittedService.uncheckAll(null);
 		if (stackId) {
@@ -213,7 +213,7 @@
 		onCancel={cancel}
 		disabledAction={!canCommit}
 		loading={commitCreation.current.isLoading || newStackResult.current.isLoading || isCooking}
-		title={stackState.newCommitMessage.current.title}
-		description={stackState.newCommitMessage.current.description}
+		title={laneState.newCommitMessage.current.title}
+		description={laneState.newCommitMessage.current.description}
 	/>
 </div>
diff --git a/apps/desktop/src/components/StackView.svelte b/apps/desktop/src/components/StackView.svelte
@@ -90,8 +90,8 @@
 
 	let dropzoneActivated = $state(false);
 
-	const stackState = $derived(uiState.stack(laneId));
-	const selection = $derived(stackState.selection);
+	const laneState = $derived(uiState.lane(laneId));
+	const selection = $derived(laneState.selection);
 	const assignedSelection = $derived(
 		idSelection.getById(createWorktreeSelection({ stackId: stackId }))
 	);
@@ -435,7 +435,7 @@
 									}}
 									onselect={() => {
 										// Clear one selection when you modify the other.
-										stackState?.selection.set(undefined);
+										laneState?.selection.set(undefined);
 										intelligentScrollingService.show(projectId, laneId, 'diff');
 									}}
 								>
diff --git a/apps/desktop/src/lib/commits/dropHandler.ts b/apps/desktop/src/lib/commits/dropHandler.ts
@@ -360,8 +360,8 @@ function updateUiState(
 	mapping: [string, string][]
 ) {
 	const sourceReplacement = mapping.find(([before]) => before === commitId);
-	const sourceState = untrack(() => uiState.stack(stackId).selection.current);
+	const sourceState = untrack(() => uiState.lane(stackId).selection.current);
 	if (sourceReplacement && sourceState) {
-		uiState.stack(stackId).selection.set({ ...sourceState, commitId: sourceReplacement[1] });
+		uiState.lane(stackId).selection.set({ ...sourceState, commitId: sourceReplacement[1] });
 	}
 }
diff --git a/apps/desktop/src/lib/stacks/macros.ts b/apps/desktop/src/lib/stacks/macros.ts
@@ -37,7 +37,7 @@ export default class StackMacros {
 		);
 
 		if (outcome.newCommit) {
-			this.uiState.stack(stack.id).selection.set({
+			this.uiState.lane(stack.id).selection.set({
 				branchName,
 				commitId: outcome.newCommit
 			});
@@ -115,7 +115,7 @@ export default class StackMacros {
 			throw new Error('No new commit id found for the moved changes');
 		}
 
-		this.uiState.stack(destinationStackId).selection.set({
+		this.uiState.lane(destinationStackId).selection.set({
 			branchName,
 			commitId: newCommitId
 		});
diff --git a/apps/desktop/src/lib/stacks/stackService.svelte.ts b/apps/desktop/src/lib/stacks/stackService.svelte.ts
@@ -612,7 +612,7 @@ export class StackService {
 		commitId: string;
 	}) {
 		const result = await this.api.endpoints.uncommit.mutate(args);
-		const selection = this.uiState.stack(args.stackId).selection;
+		const selection = this.uiState.lane(args.stackId).selection;
 		if (args.commitId === selection.current?.commitId) {
 			selection.set(undefined);
 		}
@@ -651,18 +651,18 @@ export class StackService {
 		return this.api.endpoints.updateBranchName.useMutation({
 			sideEffect: (_, args) => {
 				// Immediately update the selection and the exclusive action.
-				const stackState = this.uiState.stack(args.laneId);
+				const laneState = this.uiState.lane(args.laneId);
 				const projectState = this.uiState.project(args.projectId);
 				const exclusiveAction = projectState.exclusiveAction.current;
-				const previousSelection = stackState.selection.current;
+				const previousSelection = laneState.selection.current;
 
 				if (previousSelection) {
 					const updatedSelection = replaceBranchInStackSelection(
 						previousSelection,
 						args.branchName,
 						args.newName
 					);
-					stackState.selection.set(updatedSelection);
+					laneState.selection.set(updatedSelection);
 				}
 
 				if (exclusiveAction) {
@@ -675,7 +675,7 @@ export class StackService {
 				}
 			},
 			onError: (_, args) => {
-				const state = this.uiState.stack(args.laneId);
+				const state = this.uiState.lane(args.laneId);
 				state.selection.set({
 					branchName: args.branchName
 				});
diff --git a/apps/desktop/src/lib/state/uiState.svelte.ts b/apps/desktop/src/lib/state/uiState.svelte.ts
@@ -112,12 +112,12 @@ export class UiState {
 	private state = $state.raw<EntityState<UiStateVariable, string>>(uiStateSlice.getInitialState());
 
 	private scopesCache = {
-		stacks: {} as Record<string, GlobalStore<any>>,
+		lanes: {} as Record<string, GlobalStore<any>>,
 		projects: {} as Record<string, GlobalStore<any>>
 	};
 
 	/** Properties scoped to a specific stack. */
-	readonly stack = this.buildScopedProps<StackState>(this.scopesCache.stacks, {
+	readonly lane = this.buildScopedProps<StackState>(this.scopesCache.lanes, {
 		selection: undefined,
 		newCommitMessage: { title: '', description: '' }
 	});
@@ -366,16 +366,16 @@ export function updateStaleProjectState(
 }
 
 function updateStackSelection(uiState: UiState, stackId: string, details: StackDetails): void {
-	const stackState = uiState.stack(stackId);
-	const selection = stackState.selection.current;
+	const laneState = uiState.lane(stackId);
+	const selection = laneState.selection.current;
 	const branches = details.branchDetails.map((branch) => branch.name);
 
 	// If no selection, do nothing
 	if (!selection) return;
 
 	// Clear selection if the selected branch is not in the list of branches
 	if (!branches.includes(selection.branchName)) {
-		stackState.selection.set(undefined);
+		laneState.selection.set(undefined);
 		return;
 	}
 
@@ -395,7 +395,7 @@ function updateStackSelection(uiState: UiState, stackId: string, details: StackD
 
 	// If the selected commit is not in the branch, clear the commit selection
 	if (!selection.upstream && !branchCommitIds.includes(selection.commitId)) {
-		stackState.selection.set({
+		laneState.selection.set({
 			branchName: selection.branchName
 		});
 
@@ -407,7 +407,7 @@ function updateStackSelection(uiState: UiState, stackId: string, details: StackD
 
 	// If the selection is for an upstream commit and the commit is not in the upstream commits, clear the selection
 	if (selection.upstream && !upstreamCommitIds.includes(selection.commitId)) {
-		stackState.selection.set({
+		laneState.selection.set({
 			branchName: selection.branchName
 		});
 
