Use injected STACK_SERVICE instead of passing StackService

Remove StackService/HooksService parameters from various components and
handlers and inject STACK_SERVICE (and HOOKS_SERVICE where needed)
directly within drop handler modules. This simplifies signatures and
usage by treating stack service as a singleton injectable rather than
passing it through many component props and handler constructors,
reducing prop drilling and aligning with the stack service being a
singleton.

Author: mtsgrd

apps/desktop/src/components/BranchCard.svelte

@@ -168,7 +168,7 @@
 >
 	{#if args.type === "stack-branch"}
 		{@const moveHandler = args.stackId
-			? new MoveCommitDzHandler(stackService, args.stackId, projectId)
+			? new MoveCommitDzHandler(args.stackId, projectId)
 			: undefined}
 		{#if !args.prNumber && args.stackId}
 			<PrNumberUpdater {projectId} stackId={args.stackId} {branchName} />

apps/desktop/src/components/BranchCommitList.svelte

@@ -306,8 +306,6 @@
 						{@const { amendHandler, squashHandler, hunkHandler } = createCommitDropHandlers({
 							projectId,
 							stackId,
-							stackService,
-							hooksService,
 							commit: dzCommit,
 							runHooks: $runHooks,
 							okWithForce: true,

apps/desktop/src/components/BranchInsertion.svelte

@@ -4,7 +4,6 @@
 	import Dropzone from "$components/Dropzone.svelte";
 	import { MoveBranchDzHandler } from "$lib/branches/dropHandler";
 	import type { ForgePrService } from "$lib/forge/interface/forgePrService";
-	import type { StackService } from "$lib/stacks/stackService.svelte";
 
 	interface Props {
 		projectId: string;
@@ -13,7 +12,6 @@
 		lineColor: string;
 		isCommitting: boolean;
 		baseBranchName: string | undefined;
-		stackService: StackService;
 		prService: ForgePrService | undefined;
 		isFirst?: boolean;
 	}
@@ -25,15 +23,13 @@
 		lineColor,
 		isCommitting,
 		baseBranchName,
-		stackService,
 		prService,
 		isFirst = false,
 	}: Props = $props();
 </script>
 
 {#if !isCommitting && baseBranchName}
 	{@const moveBranchHandler = new MoveBranchDzHandler(
-		stackService,
 		prService,
 		projectId,
 		stackId,

apps/desktop/src/components/BranchList.svelte

@@ -145,7 +145,6 @@
 						{lineColor}
 						isCommitting={controller.isCommitting}
 						{baseBranchName}
-						{stackService}
 						prService={forge.current.prService}
 						isFirst={firstBranch}
 					/>

apps/desktop/src/components/StackDetails.svelte

@@ -148,8 +148,6 @@
 				? createCommitDropHandlers({
 						projectId: controller.projectId,
 						stackId: controller.stackId,
-						stackService,
-						hooksService,
 						commit: dzCommit,
 						runHooks: $runHooks,
 						okWithForce: true,

apps/desktop/src/components/WorktreeChanges.svelte

@@ -18,7 +18,6 @@
 	import { FILE_SELECTION_MANAGER } from "$lib/selection/fileSelectionManager.svelte";
 	import { createWorktreeSelection } from "$lib/selection/key";
 	import { UNCOMMITTED_SERVICE } from "$lib/selection/uncommittedService.svelte";
-	import { STACK_SERVICE } from "$lib/stacks/stackService.svelte";
 	import { UI_STATE } from "$lib/state/uiState.svelte";
 	import { inject, injectOptional } from "@gitbutler/core/context";
 
@@ -61,7 +60,6 @@
 	// Create a unique persist ID based on stackId and mode (both are static props)
 	const persistId = stackId ? `worktree-${mode}-${stackId}` : `worktree-${mode}`;
 
-	const stackService = inject(STACK_SERVICE);
 	const diffService = inject(DIFF_SERVICE);
 	const uncommittedService = inject(UNCOMMITTED_SERVICE);
 	const uiState = inject(UI_STATE);
@@ -80,7 +78,7 @@
 	// Create selectionId for this worktree lane
 	const selectionId = $derived(createWorktreeSelection({ stackId }));
 
-	const uncommitDzHandler = $derived(new UncommitDzHandler(projectId, stackService, stackId));
+	const uncommitDzHandler = $derived(new UncommitDzHandler(projectId, stackId));
 
 	const projectState = $derived(uiState.project(projectId));
 	const exclusiveAction = $derived(projectState.exclusiveAction.current);

apps/desktop/src/lib/branches/dropHandler.ts

@@ -1,11 +1,11 @@
 import { FileChangeDropData, FolderChangeDropData, HunkDropDataV3 } from "$lib/dragging/draggables";
 import { updateStackPrs } from "$lib/forge/shared/prFooter";
 import { UNCOMMITTED_SERVICE } from "$lib/selection/uncommittedService.svelte";
+import { STACK_SERVICE } from "$lib/stacks/stackService.svelte";
 import { UI_STATE } from "$lib/state/uiState.svelte";
 import { inject } from "@gitbutler/core/context";
 import type { DropzoneHandler } from "$lib/dragging/handler";
 import type { ForgePrService } from "$lib/forge/interface/forgePrService";
-import type { StackService } from "$lib/stacks/stackService.svelte";
 
 export class BranchDropData {
 	constructor(
@@ -24,8 +24,9 @@ export class BranchDropData {
 }
 
 export class MoveBranchDzHandler implements DropzoneHandler {
+	private readonly stackService = inject(STACK_SERVICE);
+
 	constructor(
-		private readonly stackService: StackService,
 		private readonly prService: ForgePrService | undefined,
 		private readonly projectId: string,
 		private readonly stackId: string,

apps/desktop/src/lib/commits/dropHandler.ts

@@ -9,12 +9,13 @@ import {
 	HunkDropDataV3,
 	type ChangeDropData,
 } from "$lib/dragging/draggables";
-import { type HooksService } from "$lib/hooks/hooksService";
+import { HOOKS_SERVICE } from "$lib/hooks/hooksService";
 import { showToast } from "$lib/notifications/toasts";
+import { STACK_SERVICE } from "$lib/stacks/stackService.svelte";
+import { UI_STATE, type UiState } from "$lib/state/uiState.svelte";
+import { inject } from "@gitbutler/core/context";
 import { untrack } from "svelte";
 import type { DropzoneHandler } from "$lib/dragging/handler";
-import type { StackService } from "$lib/stacks/stackService.svelte";
-import type { UiState } from "$lib/state/uiState.svelte";
 
 /** Details about a commit belonging to a drop zone. */
 export type DzCommitData = {
@@ -37,9 +38,9 @@ export class CommitDropData {
 /** Handler that can move commits between stacks. */
 export class MoveCommitDzHandler implements DropzoneHandler {
 	private readonly uiState = inject(UI_STATE);
+	private readonly stackService = inject(STACK_SERVICE);
 
 	constructor(
-		private stackService: StackService,
 		private stackId: string,
 		private projectId: string,
 	) {}
@@ -83,15 +84,16 @@ export class MoveCommitDzHandler implements DropzoneHandler {
  * Handler that will be able to amend a commit using `TreeChange`.
  */
 export class AmendCommitWithChangeDzHandler implements DropzoneHandler {
+	private readonly uiState = inject(UI_STATE);
+	private readonly stackService = inject(STACK_SERVICE);
+	private readonly hooksService = inject(HOOKS_SERVICE);
+
 	constructor(
 		private projectId: string,
-		private readonly stackService: StackService,
-		private readonly hooksService: HooksService,
 		private stackId: string,
 		private runHooks: boolean,
 		private commit: DzCommitData,
 		private onresult: (result: string) => void,
-		private readonly uiState: UiState,
 	) {}
 	accepts(data: unknown): boolean {
 		if (!(data instanceof FileChangeDropData || data instanceof FolderChangeDropData)) return false;
@@ -156,10 +158,10 @@ export class AmendCommitWithChangeDzHandler implements DropzoneHandler {
 
 export class UncommitDzHandler implements DropzoneHandler {
 	private readonly uiState = inject(UI_STATE);
+	private readonly stackService = inject(STACK_SERVICE);
 
 	constructor(
 		private projectId: string,
-		private readonly stackService: StackService,
 		private readonly assignTo?: string,
 	) {}
 
@@ -250,11 +252,11 @@ export class UncommitDzHandler implements DropzoneHandler {
  */
 export class AmendCommitWithHunkDzHandler implements DropzoneHandler {
 	private readonly uiState = inject(UI_STATE);
+	private readonly stackService = inject(STACK_SERVICE);
+	private readonly hooksService = inject(HOOKS_SERVICE);
 
 	constructor(
 		private args: {
-			stackService: StackService;
-			hooksService: HooksService;
 			okWithForce: boolean;
 			projectId: string;
 			stackId: string;
@@ -276,7 +278,7 @@ export class AmendCommitWithHunkDzHandler implements DropzoneHandler {
 	}
 
 	async ondrop(data: HunkDropDataV3): Promise<void> {
-		const { stackService, projectId, stackId, commit, okWithForce, runHooks } = this.args;
+		const { projectId, stackId, commit, okWithForce, runHooks } = this.args;
 		if (!okWithForce && commit.isRemote) return;
 
 		if (data instanceof HunkDropDataV3) {
@@ -288,7 +290,7 @@ export class AmendCommitWithHunkDzHandler implements DropzoneHandler {
 					throw new Error("Can't receive a change without it's source or commit");
 				}
 
-				const { replacedCommits } = await stackService.moveChangesBetweenCommits({
+				const { replacedCommits } = await this.stackService.moveChangesBetweenCommits({
 					projectId,
 					destinationStackId: stackId,
 					destinationCommitId: commit.id,
@@ -334,20 +336,20 @@ export class AmendCommitWithHunkDzHandler implements DropzoneHandler {
 
 			if (runHooks) {
 				try {
-					await this.args.hooksService.runPreCommitHooks(projectId, worktreeChanges);
+					await this.hooksService.runPreCommitHooks(projectId, worktreeChanges);
 				} catch {
 					return;
 				}
 			}
-			stackService.amendCommitMutation({
+			this.stackService.amendCommitMutation({
 				projectId,
 				stackId,
 				commitId: commit.id,
 				worktreeChanges,
 			});
 			if (runHooks) {
 				try {
-					await this.args.hooksService.runPostCommitHooks(projectId);
+					await this.hooksService.runPostCommitHooks(projectId);
 				} catch {
 					return;
 				}
@@ -360,9 +362,10 @@ export class AmendCommitWithHunkDzHandler implements DropzoneHandler {
  * Handler that is able to squash two commits using `DzCommitData`.
  */
 export class SquashCommitDzHandler implements DropzoneHandler {
+	private readonly stackService = inject(STACK_SERVICE);
+
 	constructor(
 		private args: {
-			stackService: StackService;
 			projectId: string;
 			stackId: string;
 			commit: DzCommitData;
@@ -381,9 +384,9 @@ export class SquashCommitDzHandler implements DropzoneHandler {
 	}
 
 	async ondrop(data: unknown) {
-		const { stackService, projectId, stackId, commit } = this.args;
+		const { projectId, stackId, commit } = this.args;
 		if (data instanceof CommitDropData) {
-			await stackService.squashCommits({
+			await this.stackService.squashCommits({
 				projectId,
 				stackId,
 				sourceCommitIds: [data.commit.id],
@@ -413,8 +416,6 @@ function updateUiState(
 export function createCommitDropHandlers(args: {
 	projectId: string;
 	stackId: string | undefined;
-	stackService: StackService;
-	hooksService: HooksService;
 	commit: DzCommitData;
 	runHooks: boolean;
 	onCommitIdChange?: (newCommitId: string) => void;
@@ -436,27 +437,21 @@ export function createCommitDropHandlers(args: {
 
 	const amendHandler = new AmendCommitWithChangeDzHandler(
 		args.projectId,
-		args.stackService,
-		args.hooksService,
 		stackId,
 		args.runHooks,
 		commit,
 		(newId) => {
 			onCommitIdChange?.(newId);
 		},
-		args.uiState,
 	);
 
 	const squashHandler = new SquashCommitDzHandler({
-		stackService: args.stackService,
 		projectId: args.projectId,
 		stackId,
 		commit,
 	});
 
 	const hunkHandler = new AmendCommitWithHunkDzHandler({
-		stackService: args.stackService,
-		hooksService: args.hooksService,
 		projectId: args.projectId,
 		stackId,
 		commit,