From ec93e6de838e7937f1401fcfdc585549765875ac Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Mon, 2 Feb 2026 16:00:37 -0800
Subject: [PATCH 1/2] feat(desktop): make "none" the default branch prefix
 option

Move "none" to the first position in BRANCH_PREFIX_MODES and
BRANCH_PREFIX_MODE_LABELS so it appears first in the dropdown,
clearly indicating it's the default choice.
---
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   | 43 ++++++++++++++++---
 .../utils/branch-prefix/branch-prefix.ts      |  2 +-
 packages/local-db/src/schema/zod.ts           |  2 +-
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index ce724970e92..6fa8c89678c 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -27,9 +27,15 @@ import {
 import { Input } from "@superset/ui/input";
 import { Popover, PopoverContent, PopoverTrigger } from "@superset/ui/popover";
 import { toast } from "@superset/ui/sonner";
+import { useNavigate } from "@tanstack/react-router";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { GoGitBranch } from "react-icons/go";
-import { HiCheck, HiChevronDown, HiChevronUpDown } from "react-icons/hi2";
+import {
+	HiCheck,
+	HiChevronDown,
+	HiChevronUpDown,
+	HiOutlinePencil,
+} from "react-icons/hi2";
 import { LuFolderOpen } from "react-icons/lu";
 import { electronTrpc } from "renderer/lib/electron-trpc";
 import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
@@ -54,6 +60,7 @@ function generateSlugFromTitle(title: string): string {
 type Mode = "existing" | "new" | "cloud";
 
 export function NewWorkspaceModal() {
+	const navigate = useNavigate();
 	const isOpen = useNewWorkspaceModalOpen();
 	const closeModal = useCloseNewWorkspaceModal();
 	const preSelectedProjectId = usePreSelectedProjectId();
@@ -348,15 +355,41 @@ export function NewWorkspaceModal() {
 									/>
 
 									{(title || branchNameEdited) && (
-										<p className="text-xs text-muted-foreground flex items-center gap-1.5">
+										<div className="text-xs text-muted-foreground flex items-center gap-1.5">
 											<GoGitBranch className="size-3" />
-											<span className="font-mono">
-												{branchPreview || "branch-name"}
+											<span className="font-mono flex items-center">
+												{applyPrefix && resolvedPrefix && (
+													<button
+														type="button"
+														onClick={() => {
+															handleClose();
+															navigate({ to: "/settings/behavior" });
+														}}
+														className="inline-flex items-center gap-0.5 hover:text-foreground transition-colors"
+													>
+														<span>{resolvedPrefix}/</span>
+														<HiOutlinePencil className="size-2.5" />
+													</button>
+												)}
+												{applyPrefix && !resolvedPrefix && (
+													<button
+														type="button"
+														onClick={() => {
+															handleClose();
+															navigate({ to: "/settings/behavior" });
+														}}
+														className="inline-flex items-center gap-0.5 text-muted-foreground/60 hover:text-foreground transition-colors mr-1"
+														title="Add branch prefix"
+													>
+														<HiOutlinePencil className="size-2.5" />
+													</button>
+												)}
+												<span>{branchSlug || "branch-name"}</span>
 											</span>
 											<span className="text-muted-foreground/60">
 												from {effectiveBaseBranch}
 											</span>
-										</p>
+										</div>
 									)}
 
 									<Collapsible
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/branch-prefix/branch-prefix.ts b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/branch-prefix/branch-prefix.ts
index 06568ccf8d9..fc842cef3e6 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/utils/branch-prefix/branch-prefix.ts
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/utils/branch-prefix/branch-prefix.ts
@@ -1,10 +1,10 @@
 import type { BranchPrefixMode } from "@superset/local-db";
 
 export const BRANCH_PREFIX_MODE_LABELS: Record<BranchPrefixMode, string> = {
+	none: "No prefix",
 	github: "GitHub username",
 	author: "Git author name",
 	custom: "Custom prefix",
-	none: "No prefix",
 };
 
 export const BRANCH_PREFIX_MODE_LABELS_WITH_DEFAULT: Record<
diff --git a/packages/local-db/src/schema/zod.ts b/packages/local-db/src/schema/zod.ts
index 20880e278a8..bd91026d78e 100644
--- a/packages/local-db/src/schema/zod.ts
+++ b/packages/local-db/src/schema/zod.ts
@@ -119,10 +119,10 @@ export type TerminalLinkBehavior = (typeof TERMINAL_LINK_BEHAVIORS)[number];
  * Branch prefix modes for workspace branch naming
  */
 export const BRANCH_PREFIX_MODES = [
+	"none",
 	"github",
 	"author",
 	"custom",
-	"none",
 ] as const;
 
 export type BranchPrefixMode = (typeof BRANCH_PREFIX_MODES)[number];

From a667efb6f62fede333c8c792bcb3e80ee28b5a67 Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Mon, 2 Feb 2026 16:20:38 -0800
Subject: [PATCH 2/2] Edit prefix

---
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   | 59 ++++++++-----------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index 6fa8c89678c..ec523660651 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -355,41 +355,15 @@ export function NewWorkspaceModal() {
 									/>
 
 									{(title || branchNameEdited) && (
-										<div className="text-xs text-muted-foreground flex items-center gap-1.5">
+										<p className="text-xs text-muted-foreground flex items-center gap-1.5">
 											<GoGitBranch className="size-3" />
-											<span className="font-mono flex items-center">
-												{applyPrefix && resolvedPrefix && (
-													<button
-														type="button"
-														onClick={() => {
-															handleClose();
-															navigate({ to: "/settings/behavior" });
-														}}
-														className="inline-flex items-center gap-0.5 hover:text-foreground transition-colors"
-													>
-														<span>{resolvedPrefix}/</span>
-														<HiOutlinePencil className="size-2.5" />
-													</button>
-												)}
-												{applyPrefix && !resolvedPrefix && (
-													<button
-														type="button"
-														onClick={() => {
-															handleClose();
-															navigate({ to: "/settings/behavior" });
-														}}
-														className="inline-flex items-center gap-0.5 text-muted-foreground/60 hover:text-foreground transition-colors mr-1"
-														title="Add branch prefix"
-													>
-														<HiOutlinePencil className="size-2.5" />
-													</button>
-												)}
-												<span>{branchSlug || "branch-name"}</span>
+											<span className="font-mono">
+												{branchPreview || "branch-name"}
 											</span>
 											<span className="text-muted-foreground/60">
 												from {effectiveBaseBranch}
 											</span>
-										</div>
+										</p>
 									)}
 
 									<Collapsible
@@ -404,12 +378,25 @@ export function NewWorkspaceModal() {
 										</CollapsibleTrigger>
 										<CollapsibleContent className="pt-3 space-y-3">
 											<div className="space-y-1.5">
-												<label
-													htmlFor="branch"
-													className="text-xs text-muted-foreground"
-												>
-													Branch name
-												</label>
+												<div className="flex items-center justify-between">
+													<label
+														htmlFor="branch"
+														className="text-xs text-muted-foreground"
+													>
+														Branch name
+													</label>
+													<button
+														type="button"
+														onClick={() => {
+															handleClose();
+															navigate({ to: "/settings/behavior" });
+														}}
+														className="inline-flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors"
+													>
+														<HiOutlinePencil className="size-3" />
+														<span>Edit prefix</span>
+													</button>
+												</div>
 												<Input
 													id="branch"
 													className="h-8 text-sm font-mono"