feat(web): add branch deletion from the branch picker

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -15,6 +15,7 @@ const clientSettings: ClientSettings = {
   autoOpenPlanSidebar: false,
   confirmThreadArchive: true,
   confirmThreadDelete: false,
+  deleteRemoteBranchOnDelete: true,
   dismissedProviderUpdateNotificationKeys: [],
   diffIgnoreWhitespace: true,
   diffWordWrap: true,

apps/server/src/git/GitWorkflowService.ts

@@ -9,6 +9,8 @@ import {
   type VcsSwitchRefResult,
   type VcsCreateRefInput,
   type VcsCreateRefResult,
+  type VcsDeleteBranchInput,
+  type VcsDeleteBranchResult,
   type VcsCreateWorktreeInput,
   type VcsCreateWorktreeResult,
   type VcsListRefsInput,
@@ -67,6 +69,9 @@ export interface GitWorkflowServiceShape {
   readonly switchRef: (
     input: VcsSwitchRefInput,
   ) => Effect.Effect<VcsSwitchRefResult, GitCommandError>;
+  readonly deleteBranch: (
+    input: VcsDeleteBranchInput,
+  ) => Effect.Effect<VcsDeleteBranchResult, GitCommandError>;
   readonly renameBranch: (input: {
     readonly cwd: string;
     readonly oldBranch: string;
@@ -306,6 +311,10 @@ export const make = Effect.fn("makeGitWorkflowService")(function* () {
       ensureGitCommand("GitWorkflowService.switchRef", input.cwd).pipe(
         Effect.andThen(Effect.scoped(git.switchRef(input))),
       ),
+    deleteBranch: (input) =>
+      ensureGitCommand("GitWorkflowService.deleteBranch", input.cwd).pipe(
+        Effect.andThen(git.deleteBranch(input)),
+      ),
     renameBranch: (input) =>
       ensureGit("GitWorkflowService.renameBranch", input.cwd).pipe(
         Effect.andThen(git.renameBranch(input)),

apps/server/src/vcs/GitVcsDriver.ts

@@ -16,6 +16,8 @@ import {
   type VcsSwitchRefResult,
   type VcsCreateRefInput,
   type VcsCreateRefResult,
+  type VcsDeleteBranchInput,
+  type VcsDeleteBranchResult,
   type VcsCreateWorktreeInput,
   type VcsCreateWorktreeResult,
   type ReviewDiffPreviewInput,
@@ -217,6 +219,9 @@ export interface GitVcsDriverShape {
   readonly switchRef: (
     input: VcsSwitchRefInput,
   ) => Effect.Effect<VcsSwitchRefResult, GitCommandError>;
+  readonly deleteBranch: (
+    input: VcsDeleteBranchInput,
+  ) => Effect.Effect<VcsDeleteBranchResult, GitCommandError>;
   readonly initRepo: (input: VcsInitInput) => Effect.Effect<void, GitCommandError>;
   readonly listLocalBranchNames: (cwd: string) => Effect.Effect<string[], GitCommandError>;
 }

apps/server/src/vcs/GitVcsDriverCore.ts

@@ -316,6 +316,15 @@ function commandLabel(args: readonly string[]): string {
   return `git ${args.join(" ")}`;
 }
 
+function isMissingRemoteBranchError(stderr: string): boolean {
+  const normalized = stderr.toLowerCase();
+  return (
+    normalized.includes("remote ref does not exist") ||
+    normalized.includes("does not exist") ||
+    normalized.includes("unable to delete")
+  );
+}
+
 function parseDefaultBranchFromRemoteHeadRef(value: string, remoteName: string): string | null {
   const trimmed = value.trim();
   const prefix = `refs/remotes/${remoteName}/`;
@@ -2280,6 +2289,59 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
     },
   );
 
+  const deleteBranch: GitVcsDriver.GitVcsDriverShape["deleteBranch"] = Effect.fn("deleteBranch")(
+    function* (input) {
+      const isRemoteRef = input.isRemote === true;
+
+      let deletedLocal = false;
+      if (!isRemoteRef) {
+        yield* executeGit(
+          "GitVcsDriver.deleteBranch.local",
+          input.cwd,
+          ["branch", input.force ? "-D" : "-d", "--", input.refName],
+          {
+            timeoutMs: 10_000,
+            fallbackErrorMessage: "git branch delete failed",
+          },
+        );
+        deletedLocal = true;
+      }
+
+      let deletedRemote = false;
+      if (isRemoteRef || input.deleteRemote) {
+        const remoteName = input.remoteName
+          ? input.remoteName
+          : yield* resolvePrimaryRemoteName(input.cwd).pipe(
+              Effect.catch((error) => (isRemoteRef ? Effect.fail(error) : Effect.succeed(null))),
+            );
+        const remoteBranch = isRemoteRef
+          ? deriveLocalBranchNameFromRemoteRef(input.refName)
+          : input.refName;
+        if (remoteName && remoteBranch) {
+          const pushArgs = ["push", remoteName, "--delete", remoteBranch];
+          const result = yield* executeGit(
+            "GitVcsDriver.deleteBranch.remote",
+            input.cwd,
+            pushArgs,
+            { timeoutMs: 30_000, allowNonZeroExit: true },
+          );
+          if (result.exitCode === 0) {
+            deletedRemote = true;
+          } else if (!isMissingRemoteBranchError(result.stderr)) {
+            return yield* createGitCommandError(
+              "GitVcsDriver.deleteBranch.remote",
+              input.cwd,
+              pushArgs,
+              result.stderr.trim() || "git push --delete failed",
+            );
+          }
+        }
+      }
+
+      return { refName: input.refName, deletedLocal, deletedRemote };
+    },
+  );
+
   const initRepo: GitVcsDriver.GitVcsDriverShape["initRepo"] = (input) =>
     executeGit("GitVcsDriver.initRepo", input.cwd, ["init"], {
       timeoutMs: 10_000,
@@ -2329,6 +2391,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
     renameBranch,
     createRef,
     switchRef,
+    deleteBranch,
     initRepo,
     listLocalBranchNames,
   });

apps/server/src/ws.ts

@@ -1116,6 +1116,12 @@ const makeWsRpcLayer = (currentSessionId: AuthSessionId) =>
             gitWorkflow.switchRef(input).pipe(Effect.tap(() => refreshGitStatus(input.cwd))),
             { "rpc.aggregate": "vcs" },
           ),
+        [WS_METHODS.vcsDeleteBranch]: (input) =>
+          observeRpcEffect(
+            WS_METHODS.vcsDeleteBranch,
+            gitWorkflow.deleteBranch(input).pipe(Effect.tap(() => refreshGitStatus(input.cwd))),
+            { "rpc.aggregate": "vcs" },
+          ),
         [WS_METHODS.vcsInit]: (input) =>
           observeRpcEffect(
             WS_METHODS.vcsInit,