Consistent file sorting

This affects keyboard nav/selection. The solution isn't great as we end 
up sorting in multiple places, but we need to kick that can down the 
road a bit further.

Author: mtsgrd

apps/desktop/src/lib/files/filetreeV3.ts

@@ -74,18 +74,44 @@ export function changesToFileTree(files: TreeChange[]): TreeNode {
 	return acc;
 }
 
-function fileTreeToList(node: TreeNode): TreeChange[] {
-	const list: TreeChange[] = [];
-	if (node.kind === 'file') list.push(node.change);
-	node.children.forEach((child) => {
-		list.push(...fileTreeToList(child));
-	});
-	return list;
-}
+export function sortLikeFileTree(changes: TreeChange[]): TreeChange[] {
+	const caseSensitive = false;
+	const locale = 'en';
+	const numeric = true;
+	const separator = '/';
+
+	const compareOptions: Intl.CollatorOptions = {
+		sensitivity: caseSensitive ? 'case' : 'base',
+		numeric: numeric,
+		caseFirst: 'lower'
+	};
+
+	return changes.sort((a, b) => {
+		const partsA = a.path.split(separator);
+		const partsB = b.path.split(separator);
+
+		// Compare directory by directory
+		const minLength = Math.min(partsA.length, partsB.length);
 
-// Sorts a file list the same way it is sorted in a file tree
-export function sortLikeFileTree(files: TreeChange[]): TreeChange[] {
-	return fileTreeToList(changesToFileTree(files));
+		for (let i = 0; i < minLength - 1; i++) {
+			const comparison = partsA[i]!.localeCompare(partsB[i]!, locale, compareOptions);
+			if (comparison !== 0) {
+				return comparison;
+			}
+		}
+
+		// Same parent directory - subfolders first
+		if (partsA.length !== partsB.length) {
+			return partsB.length - partsA.length;
+		}
+
+		// Same depth, compare final component
+		return partsA[partsA.length - 1]!.localeCompare(
+			partsB[partsB.length - 1]!,
+			locale,
+			compareOptions
+		);
+	});
 }
 
 /**

apps/desktop/src/lib/selection/uncommittedService.svelte.ts

@@ -1,3 +1,4 @@
+import { sortLikeFileTree } from '$lib/files/filetreeV3';
 import { type TreeChange } from '$lib/hunks/change';
 import {
 	hunkHeaderEquals,
@@ -200,7 +201,7 @@ export class UncommittedService {
 			Array.from(pathSet)
 		);
 
-		return changes;
+		return sortLikeFileTree(changes);
 	}
 
 	/**
@@ -279,12 +280,14 @@ export class UncommittedService {
 	}
 
 	getChangesByStackId(stackId: string | null): TreeChange[] {
-		const stackIdChanges = uncommittedSelectors.treeChanges.selectByStackId(this.state, stackId);
+		const stackIdChanges = sortLikeFileTree(
+			uncommittedSelectors.treeChanges.selectByStackId(this.state, stackId)
+		);
 		return stackIdChanges;
 	}
 
 	changesByStackId(stackId: string | null): Reactive<TreeChange[]> {
-		const changes = $derived(this.getChangesByStackId(stackId));
+		const changes = $derived(sortLikeFileTree(this.getChangesByStackId(stackId)));
 		return reactive(() => changes);
 	}
 

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

@@ -560,7 +560,7 @@ export class StackService {
 			{ projectId, commitId },
 			{
 				transform: (result) => ({
-					changes: changesSelectors.selectAll(result.changes),
+					changes: sortLikeFileTree(changesSelectors.selectAll(result.changes)),
 					stats: result.stats,
 					conflictEntries: result.conflictEntries
 				})
@@ -611,7 +611,7 @@ export class StackService {
 			},
 			{
 				transform: (result) => ({
-					changes: changesSelectors.selectAll(result.changes),
+					changes: sortLikeFileTree(changesSelectors.selectAll(result.changes)),
 					stats: result.stats
 				})
 			}