refactor(git): centralize branch creation logic across TaskInput and git interaction

Author: CaioDGallo

apps/code/src/renderer/features/git-interaction/hooks/useGitInteraction.ts

@@ -11,10 +11,9 @@ import type {
   GitMenuActionId,
 } from "@features/git-interaction/types";
 import {
-  sanitizeBranchName,
-  validateBranchName,
-} from "@features/git-interaction/utils/branchNameValidation";
-import { invalidateGitBranchQueries } from "@features/git-interaction/utils/gitCacheKeys";
+  createBranch,
+  getBranchNameInputState,
+} from "@features/git-interaction/utils/branchCreation";
 import { updateGitCacheFromSnapshot } from "@features/git-interaction/utils/updateGitCache";
 import { trpc, trpcClient } from "@renderer/trpc";
 import { ANALYTICS_EVENTS } from "@shared/types/analytics";
@@ -480,30 +479,25 @@ export function useGitInteraction(
   const runBranch = async () => {
     if (!repoPath) return;
 
-    const branchName = store.branchName.trim();
-    if (!branchName) {
-      modal.setBranchError("Branch name is required.");
-      return;
-    }
-
-    const validationError = validateBranchName(branchName);
-    if (validationError) {
-      modal.setBranchError(validationError);
-      return;
-    }
-
     modal.setIsSubmitting(true);
     modal.setBranchError(null);
 
     try {
-      await trpcClient.git.createBranch.mutate({
-        directoryPath: repoPath,
-        branchName,
+      const result = await createBranch({
+        repoPath,
+        rawBranchName: store.branchName,
       });
+      if (!result.success) {
+        if (result.reason === "request") {
+          log.error("Failed to create branch", result.rawError ?? result.error);
+          trackGitAction(taskId, "branch-here", false);
+        }
 
-      trackGitAction(taskId, "branch-here", true);
+        modal.setBranchError(result.error);
+        return;
+      }
 
-      invalidateGitBranchQueries(repoPath);
+      trackGitAction(taskId, "branch-here", true);
       await queryClient.invalidateQueries(trpc.workspace.getAll.pathFilter());
 
       modal.closeBranch();
@@ -547,9 +541,9 @@ export function useGitInteraction(
       setPrTitle: modal.setPrTitle,
       setPrBody: modal.setPrBody,
       setBranchName: (value: string) => {
-        const sanitized = sanitizeBranchName(value);
+        const { sanitized, error } = getBranchNameInputState(value);
         modal.setBranchName(sanitized);
-        modal.setBranchError(validateBranchName(sanitized));
+        modal.setBranchError(error);
       },
       runCommit,
       runPush,

apps/code/src/renderer/features/git-interaction/utils/branchCreation.ts

@@ -0,0 +1,92 @@
+import {
+  sanitizeBranchName,
+  validateBranchName,
+} from "@features/git-interaction/utils/branchNameValidation";
+import { invalidateGitBranchQueries } from "@features/git-interaction/utils/gitCacheKeys";
+import { trpcClient } from "@renderer/trpc";
+
+export interface BranchNameInputState {
+  sanitized: string;
+  error: string | null;
+}
+
+export type CreateBranchResult =
+  | {
+      success: true;
+      branchName: string;
+    }
+  | {
+      success: false;
+      error: string;
+      reason: "missing-repo" | "validation" | "request";
+      rawError?: unknown;
+    };
+
+interface CreateBranchInput {
+  repoPath?: string;
+  rawBranchName: string;
+}
+
+function getCreateBranchError(error: unknown): string {
+  return error instanceof Error ? error.message : "Failed to create branch.";
+}
+
+export function getBranchNameInputState(value: string): BranchNameInputState {
+  const sanitized = sanitizeBranchName(value);
+  return {
+    sanitized,
+    error: validateBranchName(sanitized),
+  };
+}
+
+export async function createBranch({
+  repoPath,
+  rawBranchName,
+}: CreateBranchInput): Promise<CreateBranchResult> {
+  if (!repoPath) {
+    return {
+      success: false,
+      error: "Select a repository folder first.",
+      reason: "missing-repo",
+    };
+  }
+
+  const branchName = rawBranchName.trim();
+  if (!branchName) {
+    return {
+      success: false,
+      error: "Branch name is required.",
+      reason: "validation",
+    };
+  }
+
+  const validationError = validateBranchName(branchName);
+  if (validationError) {
+    return {
+      success: false,
+      error: validationError,
+      reason: "validation",
+    };
+  }
+
+  try {
+    await trpcClient.git.createBranch.mutate({
+      directoryPath: repoPath,
+      branchName,
+    });
+
+    invalidateGitBranchQueries(repoPath);
+
+    return {
+      success: true,
+      branchName,
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: getCreateBranchError(error),
+      reason: "request",
+      rawError: error,
+    };
+  }
+}

apps/code/src/renderer/features/task-detail/components/TaskInput.tsx

@@ -7,10 +7,9 @@ import { GitBranchDialog } from "@features/git-interaction/components/GitInterac
 import { useGitQueries } from "@features/git-interaction/hooks/useGitQueries";
 import { useGitInteractionStore } from "@features/git-interaction/state/gitInteractionStore";
 import {
-  sanitizeBranchName,
-  validateBranchName,
-} from "@features/git-interaction/utils/branchNameValidation";
-import { invalidateGitBranchQueries } from "@features/git-interaction/utils/gitCacheKeys";
+  createBranch,
+  getBranchNameInputState,
+} from "@features/git-interaction/utils/branchCreation";
 import type { MessageEditorHandle } from "@features/message-editor/components/MessageEditor";
 import { ModeIndicatorInput } from "@features/message-editor/components/ModeIndicatorInput";
 import { DropZoneOverlay } from "@features/sessions/components/DropZoneOverlay";
@@ -29,7 +28,7 @@ import {
 import { Flex } from "@radix-ui/themes";
 import { useTRPC } from "@renderer/trpc/client";
 import { useNavigationStore } from "@stores/navigationStore";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { usePreviewSession } from "../hooks/usePreviewSession";
@@ -64,6 +63,7 @@ export function TaskInput() {
 
   const [editorIsEmpty, setEditorIsEmpty] = useState(true);
   const [isDraggingFile, setIsDraggingFile] = useState(false);
+  const [isCreatingBranch, setIsCreatingBranch] = useState(false);
   const [selectedBranch, setSelectedBranch] = useState<string | null>(null);
   const [selectedEnvironment, setSelectedEnvironmentRaw] = useState<
     string | null
@@ -108,43 +108,34 @@ export function TaskInput() {
     actions: gitActions,
   } = useGitInteractionStore();
 
-  const createBranchMutation = useMutation(
-    trpcReact.git.createBranch.mutationOptions({
-      onSuccess: (_data, { branchName }) => {
-        if (selectedDirectory) invalidateGitBranchQueries(selectedDirectory);
-        setSelectedBranch(branchName);
-        gitActions.closeBranch();
-      },
-      onError: (error) => {
-        const message =
-          error instanceof Error ? error.message : "Failed to create branch.";
-        gitActions.setBranchError(message);
-      },
-    }),
-  );
-
   const handleNewBranchNameChange = useCallback(
     (value: string) => {
-      const sanitized = sanitizeBranchName(value);
+      const { sanitized, error } = getBranchNameInputState(value);
       gitActions.setBranchName(sanitized);
-      gitActions.setBranchError(validateBranchName(sanitized));
+      gitActions.setBranchError(error);
     },
     [gitActions],
   );
 
-  const handleCreateBranch = useCallback(() => {
-    const trimmed = newBranchName.trim();
-    if (!trimmed || !selectedDirectory) return;
-    const validationError = validateBranchName(trimmed);
-    if (validationError) {
-      gitActions.setBranchError(validationError);
-      return;
+  const handleCreateBranch = useCallback(async () => {
+    setIsCreatingBranch(true);
+
+    try {
+      const result = await createBranch({
+        repoPath: selectedDirectory || undefined,
+        rawBranchName: newBranchName,
+      });
+      if (!result.success) {
+        gitActions.setBranchError(result.error);
+        return;
+      }
+
+      setSelectedBranch(result.branchName);
+      gitActions.closeBranch();
+    } finally {
+      setIsCreatingBranch(false);
     }
-    createBranchMutation.mutate({
-      directoryPath: selectedDirectory,
-      branchName: trimmed,
-    });
-  }, [newBranchName, selectedDirectory, gitActions, createBranchMutation]);
+  }, [selectedDirectory, newBranchName, gitActions]);
 
   // Preview session provides adapter-specific config options
   const {
@@ -459,7 +450,7 @@ export function TaskInput() {
         branchName={newBranchName}
         onBranchNameChange={handleNewBranchNameChange}
         onConfirm={handleCreateBranch}
-        isSubmitting={createBranchMutation.isPending}
+        isSubmitting={isCreatingBranch}
         error={branchError}
       />
     </div>