diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/components/BranchPrefixControl/BranchPrefixControl.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/components/BranchPrefixControl/BranchPrefixControl.tsx
new file mode 100644
index 0000000000..c6c0484c39
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/components/BranchPrefixControl/BranchPrefixControl.tsx
@@ -0,0 +1,112 @@
+import {
+ type BranchPrefixMode,
+ sanitizeSegment,
+} from "@superset/shared/workspace-launch";
+import { Input } from "@superset/ui/input";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@superset/ui/select";
+import { useEffect, useState } from "react";
+import {
+ BRANCH_PREFIX_MODE_LABELS,
+ BRANCH_PREFIX_MODE_LABELS_WITH_DEFAULT,
+} from "../../utils/branch-prefix";
+
+/** Select value standing in for "no override — inherit the host default". */
+const DEFAULT_VALUE = "default";
+
+/** Mode communicated by the control. `null` only appears when `showDefault`. */
+export type BranchPrefixControlMode = BranchPrefixMode | null;
+
+interface BranchPrefixControlProps {
+ mode: BranchPrefixControlMode;
+ customPrefix: string | null;
+ /**
+ * When true, prepends a "Use global default" option whose value is `null`.
+ * Used by the per-project override; the host-wide default omits it.
+ */
+ showDefault?: boolean;
+ disabled?: boolean;
+ onChange: (next: {
+ mode: BranchPrefixControlMode;
+ customPrefix: string | null;
+ }) => void;
+}
+
+/**
+ * Shared select+input for the v2 branch-prefix setting. Used by the host-wide
+ * default (`V2GitSettings`) and the per-project override (`BranchPrefixSection`).
+ * Sanitizes the custom prefix on blur. Empty custom on blur is treated as
+ * "user is still typing": the input clears but no mutation fires.
+ */
+export function BranchPrefixControl({
+ mode,
+ customPrefix,
+ showDefault = false,
+ disabled,
+ onChange,
+}: BranchPrefixControlProps) {
+ const [customPrefixInput, setCustomPrefixInput] = useState(
+ customPrefix ?? "",
+ );
+ useEffect(() => {
+ setCustomPrefixInput(customPrefix ?? "");
+ }, [customPrefix]);
+
+ const selectValue = mode ?? DEFAULT_VALUE;
+
+ const labels = showDefault
+ ? BRANCH_PREFIX_MODE_LABELS_WITH_DEFAULT
+ : BRANCH_PREFIX_MODE_LABELS;
+
+ const handleModeChange = (value: string) => {
+ const nextMode: BranchPrefixControlMode =
+ value === DEFAULT_VALUE ? null : (value as BranchPrefixMode);
+ onChange({ mode: nextMode, customPrefix: customPrefixInput || null });
+ };
+
+ const handleCustomPrefixBlur = () => {
+ const sanitized = sanitizeSegment(customPrefixInput);
+ setCustomPrefixInput(sanitized);
+ // Empty sanitized prefix: don't persist `mode=custom, customPrefix=null`
+ // — that lies about user intent. Leave the dropdown alone so they can
+ // type again; an explicit mode change is how they exit `custom`.
+ if (!sanitized) return;
+ onChange({ mode: "custom", customPrefix: sanitized });
+ };
+
+ return (
+
+
+ {selectValue === "custom" && (
+ setCustomPrefixInput(e.target.value)}
+ onBlur={handleCustomPrefixBlur}
+ className="w-[120px]"
+ disabled={disabled}
+ />
+ )}
+
+ );
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/components/BranchPrefixControl/index.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/components/BranchPrefixControl/index.ts
new file mode 100644
index 0000000000..ffe87e68ce
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/components/BranchPrefixControl/index.ts
@@ -0,0 +1,2 @@
+export type { BranchPrefixControlMode } from "./BranchPrefixControl";
+export { BranchPrefixControl } from "./BranchPrefixControl";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/git/components/V2GitSettings/V2GitSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/git/components/V2GitSettings/V2GitSettings.tsx
new file mode 100644
index 0000000000..bfec7e2914
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/git/components/V2GitSettings/V2GitSettings.tsx
@@ -0,0 +1,123 @@
+import {
+ type BranchPrefixMode,
+ resolveBranchPrefix,
+} from "@superset/shared/workspace-launch";
+import { Label } from "@superset/ui/label";
+import { toast } from "@superset/ui/sonner";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { getHostServiceClientByUrl } from "renderer/lib/host-service-client";
+import { getHostServiceUnavailableMessage } from "renderer/lib/host-service-unavailable";
+import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider";
+import { BranchPrefixControl } from "../../../components/BranchPrefixControl";
+
+const BRANCH_PREFIX_QUERY_KEY = ["host-branch-prefix"] as const;
+
+/**
+ * v2 Git settings — the host-wide branch-prefix default. Projects without
+ * their own override inherit this. The v1 equivalent lives in `GitSettings`.
+ */
+export function V2GitSettings() {
+ const hostService = useLocalHostService();
+ const { activeHostUrl } = hostService;
+ const queryClient = useQueryClient();
+
+ const branchPrefixQuery = useQuery({
+ queryKey: [...BRANCH_PREFIX_QUERY_KEY, activeHostUrl] as const,
+ enabled: !!activeHostUrl,
+ queryFn: () => {
+ if (!activeHostUrl) throw new Error("Host service unavailable");
+ return getHostServiceClientByUrl(
+ activeHostUrl,
+ ).settings.branchPrefix.get.query();
+ },
+ });
+
+ const gitInfoQuery = useQuery({
+ queryKey: ["host-git-info", activeHostUrl] as const,
+ enabled: !!activeHostUrl,
+ staleTime: 5 * 60 * 1000,
+ queryFn: () => {
+ if (!activeHostUrl) throw new Error("Host service unavailable");
+ return getHostServiceClientByUrl(
+ activeHostUrl,
+ ).settings.branchPrefix.gitInfo.query();
+ },
+ });
+
+ const mode: BranchPrefixMode = branchPrefixQuery.data?.mode ?? "none";
+ const customPrefix = branchPrefixQuery.data?.customPrefix ?? null;
+
+ const setMutation = useMutation({
+ mutationFn: (vars: {
+ mode: BranchPrefixMode;
+ customPrefix: string | null;
+ }) => {
+ if (!activeHostUrl) {
+ throw new Error(
+ getHostServiceUnavailableMessage(hostService, {
+ action: "update the branch prefix",
+ }),
+ );
+ }
+ return getHostServiceClientByUrl(
+ activeHostUrl,
+ ).settings.branchPrefix.set.mutate(vars);
+ },
+ onSuccess: () => {
+ void queryClient.invalidateQueries({
+ queryKey: BRANCH_PREFIX_QUERY_KEY,
+ });
+ },
+ onError: (err) =>
+ toast.error(
+ err instanceof Error ? err.message : "Failed to update branch prefix",
+ ),
+ });
+
+ const previewPrefix =
+ resolveBranchPrefix({
+ mode,
+ customPrefix,
+ authorPrefix: gitInfoQuery.data?.authorName,
+ githubUsername: gitInfoQuery.data?.githubUsername,
+ }) ||
+ (mode === "author" ? "author-name" : mode === "github" ? "username" : null);
+
+ const controlsDisabled =
+ !activeHostUrl || branchPrefixQuery.isLoading || setMutation.isPending;
+
+ return (
+
+
+
Git & worktrees
+
+ Configure git branch behavior for new workspaces
+
+
+
+
+
+
+
+ Group new branches under a folder. Projects can override this.{" "}
+
+ {previewPrefix ? `${previewPrefix}/branch-name` : "branch-name"}
+
+
+
+
+ // Host-wide control never produces null mode (no "default" option).
+ setMutation.mutate({
+ mode: next.mode ?? "none",
+ customPrefix: next.customPrefix,
+ })
+ }
+ />
+
+