feat(code): unified PR creation workflow

Author: adboio

apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx

@@ -1,6 +1,6 @@
 import { Combobox } from "@components/ui/combobox/Combobox";
 import { useGitInteractionStore } from "@features/git-interaction/state/gitInteractionStore";
-import { getSuggestedBranchName } from "@features/git-interaction/utils/deriveBranchName";
+import { getSuggestedBranchName } from "@features/git-interaction/utils/getSuggestedBranchName";
 import { invalidateGitBranchQueries } from "@features/git-interaction/utils/gitCacheKeys";
 import { GitBranch, Plus } from "@phosphor-icons/react";
 import { Flex, Spinner, Tooltip } from "@radix-ui/themes";
@@ -144,7 +144,9 @@ export function BranchSelector({
                 onClick={() => {
                   setOpen(false);
                   actions.openBranch(
-                    taskId ? getSuggestedBranchName(taskId) : undefined,
+                    taskId
+                      ? getSuggestedBranchName(taskId, repoPath ?? undefined)
+                      : undefined,
                   );
                 }}
               >

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

@@ -1,5 +1,4 @@
-import type { Task } from "@shared/types";
-import { queryClient } from "@utils/queryClient";
+import { BRANCH_PREFIX } from "@shared/constants";
 
 export function deriveBranchName(title: string, fallbackId: string): string {
   const slug = title
@@ -11,21 +10,6 @@ export function deriveBranchName(title: string, fallbackId: string): string {
     .slice(0, 60)
     .replace(/-$/, "");
 
-  if (!slug) return `posthog/task-${fallbackId}`;
-  return `posthog/${slug}`;
-}
-
-export function getSuggestedBranchName(taskId: string): string {
-  const queries = queryClient.getQueriesData<Task[]>({
-    queryKey: ["tasks", "list"],
-  });
-  let task: Task | undefined;
-  for (const [, tasks] of queries) {
-    task = tasks?.find((t) => t.id === taskId);
-    if (task) break;
-  }
-  const fallbackId = task?.task_number
-    ? String(task.task_number)
-    : (task?.slug ?? taskId);
-  return deriveBranchName(task?.title ?? "", fallbackId);
+  if (!slug) return `${BRANCH_PREFIX}task-${fallbackId}`;
+  return `${BRANCH_PREFIX}${slug}`;
 }

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

@@ -0,0 +1,33 @@
+import { deriveBranchName } from "@features/git-interaction/utils/deriveBranchName";
+import { trpc } from "@renderer/trpc";
+import type { Task } from "@shared/types";
+import { queryClient } from "@utils/queryClient";
+
+export function getSuggestedBranchName(
+  taskId: string,
+  repoPath?: string,
+): string {
+  const queries = queryClient.getQueriesData<Task[]>({
+    queryKey: ["tasks", "list"],
+  });
+  let task: Task | undefined;
+  for (const [, tasks] of queries) {
+    task = tasks?.find((t) => t.id === taskId);
+    if (task) break;
+  }
+  const fallbackId = task?.task_number
+    ? String(task.task_number)
+    : (task?.slug ?? taskId);
+  const base = deriveBranchName(task?.title ?? "", fallbackId);
+
+  if (!repoPath) return base;
+
+  const cached = queryClient.getQueryData<string[]>(
+    trpc.git.getAllBranches.queryKey({ directoryPath: repoPath }),
+  );
+  if (!cached?.includes(base)) return base;
+
+  let n = 2;
+  while (cached.includes(`${base}-${n}`)) n++;
+  return `${base}-${n}`;
+}