Merge remote-tracking branch 'origin/main' into HEAD

Author: PR Batch Tester

apps/mobile/src/components/AndroidScreenHeader.tsx

@@ -6,6 +6,7 @@ import { AppText as Text } from "./AppText";
 import { cn } from "../lib/cn";
 import { MaterialIconButton } from "./MaterialIconButton";
 import { AndroidAnchoredMenu } from "./AndroidAnchoredMenu";
+import { splitAndroidHeaderActions } from "./headerMenu.android";
 import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
 import { useMaterialToolbarLayout } from "./useMaterialToolbarLayout";
 
@@ -16,6 +17,8 @@ export interface AndroidHeaderAction {
   readonly disabled?: boolean;
   readonly loading?: boolean;
   readonly selected?: boolean;
+  readonly destructive?: boolean;
+  readonly overflowOnly?: boolean;
 }
 
 export function AndroidHeaderIconButton(props: {
@@ -45,10 +48,10 @@ export function AndroidScreenHeader(props: {
     props.embedded,
   );
   const [headerWidth, setHeaderWidth] = useState(0);
-  const actions = props.actions ?? [];
-  const directCount = actions.length > 2 ? (headerWidth >= 600 ? 3 : 1) : actions.length;
-  const visibleActions = actions.slice(0, directCount);
-  const overflowActions = actions.slice(directCount);
+  const { visibleActions, overflowActions } = splitAndroidHeaderActions(
+    props.actions ?? [],
+    headerWidth >= 600,
+  );
 
   return (
     <View
@@ -115,6 +118,7 @@ export function AndroidScreenHeader(props: {
               title: action.accessibilityLabel,
               attributes: {
                 disabled: Boolean(action.disabled),
+                destructive: action.destructive,
                 state: action.selected ? "on" : undefined,
               },
             }))}

apps/mobile/src/components/AppSymbol.tsx

@@ -175,6 +175,7 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
   circle: IconCircle,
   "circle.dashed": IconCircleDashed,
   "circle.inset.filled": IconCircleDot,
+  "circle.dashed.inset.filled": IconCircleDot,
   clock: IconClock,
   timer: IconClock,
   ticket: IconTicket,

apps/mobile/src/components/headerMenu.android.ts

@@ -41,3 +41,16 @@ export function findHeaderMenuAction(
   }
   return undefined;
 }
+
+export function splitAndroidHeaderActions<Action extends { readonly overflowOnly?: boolean }>(
+  actions: ReadonlyArray<Action>,
+  wide: boolean,
+) {
+  const inline = actions.filter((action) => !action.overflowOnly);
+  const directCount = actions.length > 2 ? (wide ? 3 : 1) : inline.length;
+  const visibleActions = inline.slice(0, directCount);
+  return {
+    visibleActions,
+    overflowActions: actions.filter((action) => !visibleActions.includes(action)),
+  };
+}

apps/mobile/src/components/headerMenu.test.ts

@@ -1,5 +1,9 @@
 import { describe, expect, it } from "vite-plus/test";
-import { androidHeaderMenuActions, findHeaderMenuAction } from "./headerMenu.android";
+import {
+  androidHeaderMenuActions,
+  findHeaderMenuAction,
+  splitAndroidHeaderActions,
+} from "./headerMenu.android";
 import type { ScreenHeaderMenuItem } from "./ScreenHeader.types";
 
 const items: ReadonlyArray<ScreenHeaderMenuItem> = [
@@ -63,4 +67,36 @@ describe("header menus", () => {
     expect(findHeaderMenuAction(items, "sessions")).toBeUndefined();
     expect(findHeaderMenuAction(items, "removed-session")).toBeUndefined();
   });
+
+  it("keeps overflow-only Android header actions in the overflow menu", () => {
+    const action = (accessibilityLabel: string, overflowOnly?: boolean) => ({
+      accessibilityLabel,
+      icon: "trash" as const,
+      onPress: () => {},
+      overflowOnly,
+    });
+    const labels = (
+      split: ReturnType<typeof splitAndroidHeaderActions<ReturnType<typeof action>>>,
+    ) => ({
+      visible: split.visibleActions.map((item) => item.accessibilityLabel),
+      overflow: split.overflowActions.map((item) => item.accessibilityLabel),
+    });
+    const open = action("Open");
+    const remove = action("Delete", true);
+    expect(labels(splitAndroidHeaderActions([open, action("Comment")], false))).toEqual({
+      visible: ["Open", "Comment"],
+      overflow: [],
+    });
+    expect(labels(splitAndroidHeaderActions([open, remove], true))).toEqual({
+      visible: ["Open"],
+      overflow: ["Delete"],
+    });
+    expect(labels(splitAndroidHeaderActions([remove], true))).toEqual({
+      visible: [],
+      overflow: ["Delete"],
+    });
+    expect(
+      labels(splitAndroidHeaderActions([action("Review"), action("Comment"), open, remove], true)),
+    ).toEqual({ visible: ["Review", "Comment", "Open"], overflow: ["Delete"] });
+  });
 });

apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx

@@ -17,14 +17,20 @@ import {
   PR_ROW_EXIT,
   PR_POSITION_LAYOUT,
 } from "./pullRequestAnimations";
-import { openOnProviderLabel } from "./pullRequestActions";
+import {
+  canPerformPullRequestAction,
+  openOnProviderLabel,
+  PR_ACTION_ICONS,
+  PR_ACTION_LABELS,
+} from "./pullRequestActions";
 import * as Clipboard from "expo-clipboard";
 import { ControlPillMenu } from "../../components/ControlPillMenu";
 import { MaterialIconButton } from "../../components/MaterialIconButton";
 import { MaterialButton } from "../../components/MaterialButton";
 import { usePullRequestReviewDraft } from "./usePullRequestReviewDraft";
 import { usePullRequestFilesViewed } from "./usePullRequestFilesViewed";
 import { usePullRequestPermissions } from "./usePullRequestPermissions";
+import { usePullRequestAction } from "./usePullRequestAction";
 import { annotatePullRequestDiff, reviewPosition } from "./pullRequestDiffComments";
 import { usePullRequestFileFilter } from "./usePullRequestFileFilter";
 import { isPullRequestTestFile } from "./pullRequestFileFilters";
@@ -341,6 +347,15 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
   const summary = params.initialSummary;
   const identity = pr ?? summary;
   const permissions = usePullRequestPermissions(params, pr);
+  const action = usePullRequestAction(params, pr);
+  const showsDeleteBranch = pr !== null && canPerformPullRequestAction(pr, "delete-branch");
+  const confirmDeleteBranch = () =>
+    pr &&
+    action.confirm(
+      "delete-branch",
+      PR_ACTION_LABELS["delete-branch"],
+      `Delete ${pr.headBranch} from ${pr.headRepositoryNameWithOwner ?? pr.repository}? Local branches and worktrees are not changed.`,
+    );
   const stack = usePullRequestStack(params, pr);
   const refreshActivity = useAtomRefresh(composerPullRequests.activity(requestTarget(params)));
   const refreshGuide = useAtomRefresh(composerPullRequests.reviewGuide(requestTarget(params)));
@@ -417,6 +432,18 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
                     },
                   ]
                 : []),
+              ...(showsDeleteBranch
+                ? [
+                    {
+                      accessibilityLabel: PR_ACTION_LABELS["delete-branch"],
+                      icon: PR_ACTION_ICONS["delete-branch"],
+                      disabled: !action.available("delete-branch"),
+                      destructive: true,
+                      overflowOnly: true,
+                      onPress: confirmDeleteBranch,
+                    },
+                  ]
+                : []),
             ]}
           />
         ) : null}
@@ -456,6 +483,25 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
                 </NativeHeaderToolbar.Label>
               </NativeHeaderToolbar.MenuAction>
             ) : null}
+            {showsDeleteBranch ? (
+              <NativeHeaderToolbar.MenuAction
+                icon={PR_ACTION_ICONS["delete-branch"]}
+                destructive
+                disabled={!action.available("delete-branch")}
+                subtitle={
+                  action.busy
+                    ? "Deleting…"
+                    : connected
+                      ? pr.headBranch
+                      : "Reconnect to delete this branch."
+                }
+                onPress={confirmDeleteBranch}
+              >
+                <NativeHeaderToolbar.Label>
+                  {PR_ACTION_LABELS["delete-branch"]}
+                </NativeHeaderToolbar.Label>
+              </NativeHeaderToolbar.MenuAction>
+            ) : null}
           </NativeHeaderToolbar.Menu>
         </NativeHeaderToolbar>
         <View

apps/mobile/src/features/pull-requests/pullRequestActions.test.ts

@@ -112,6 +112,19 @@ describe("mobile pull request actions", () => {
     expect(mergeSummary(unknown, true)).toBe("Squash");
   });
 
+  it("offers deleting the source branch only once merged or closed on a host that supports it", () => {
+    const capabilities = { ...detail().capabilities, deleteBranch: true };
+    expect(canPerformPullRequestAction(detail({ capabilities }), "delete-branch")).toBe(false);
+    for (const state of ["merged", "closed"] as const) {
+      expect(canPerformPullRequestAction(detail({ state, capabilities }), "delete-branch")).toBe(
+        true,
+      );
+      expect(canPerformPullRequestAction(detail({ state }), "delete-branch")).toBe(false);
+    }
+    const refused = detail({ state: "merged", capabilities, viewerPermissions: { actions: [] } });
+    expect(canPerformPullRequestAction(refused, "delete-branch")).toBe(false);
+  });
+
   it("cannot merge when the repository has disabled every offered strategy", () => {
     const pr = detail({ mergeCapabilities: { merge: false, squash: false, rebase: false } });
     expect(canPerformPullRequestAction(pr, "merge")).toBe(false);

apps/mobile/src/features/pull-requests/pullRequestActions.ts

@@ -13,7 +13,7 @@ type ActionDetail = Pick<
 > & {
   readonly capabilities: Pick<
     PullRequestDetail["capabilities"],
-    "actions" | "mergeMethods" | "updateMethods"
+    "actions" | "mergeMethods" | "updateMethods" | "deleteBranch"
   >;
   readonly viewerPermissions: Pick<
     PullRequestDetail["viewerPermissions"],
@@ -41,6 +41,7 @@ export const PR_ACTION_LABELS = {
   "enable-auto-merge": "Enable auto-merge",
   "disable-auto-merge": "Disable auto-merge",
   revert: "Create revert pull request",
+  "delete-branch": "Delete branch",
   "approve-workflows": "Approve workflows",
 } as const satisfies Record<PullRequestAction, string>;
 
@@ -54,6 +55,7 @@ export const PR_ACTION_ICONS = {
   "enable-auto-merge": "clock",
   "disable-auto-merge": "xmark",
   revert: "arrow.uturn.backward",
+  "delete-branch": "trash",
   "approve-workflows": "checkmark",
 } as const satisfies Record<PullRequestAction, AppSymbolName>;
 
@@ -68,6 +70,7 @@ export const ALL_PR_ACTIONS: readonly PullRequestAction[] = [
   "close",
   "reopen",
   "revert",
+  "delete-branch",
 ];
 
 export function allowedMergeMethods(pr: ActionDetail) {
@@ -86,6 +89,8 @@ export function canPerformPullRequestAction(pr: ActionDetail, action: PullReques
     return false;
   if (action === "reopen") return pr.state === "closed";
   if (action === "revert") return pr.state === "merged";
+  if (action === "delete-branch")
+    return pr.state !== "open" && pr.capabilities.deleteBranch === true;
   if (pr.state !== "open") return false;
   switch (action) {
     case "update-branch":

apps/mobile/src/features/pull-requests/usePullRequestAction.ts

@@ -14,7 +14,7 @@ import { pullRequestTarget, type PullRequestParams } from "./usePullRequestDiff"
 import { usePullRequestPermissions } from "./usePullRequestPermissions";
 
 /** Small row actions stay in place, preserving expanded rows and scroll position. */
-export function usePullRequestAction(params: PullRequestParams, pr: PullRequestDetail) {
+export function usePullRequestAction(params: PullRequestParams, pr: PullRequestDetail | null) {
   const target = pullRequestTarget(params);
   const permissions = usePullRequestPermissions(params, pr);
   const run = useAtomCommand(composerPullRequests.runAction, { reportFailure: false });
@@ -23,7 +23,7 @@ export function usePullRequestAction(params: PullRequestParams, pr: PullRequestD
   const pending = useRef(false);
   const [busy, setBusy] = useState(false);
   const available = (action: PullRequestAction) =>
-    !busy && permissions.canWrite && canPerformPullRequestAction(pr, action);
+    pr !== null && !busy && permissions.canWrite && canPerformPullRequestAction(pr, action);
   const perform = async (action: PullRequestAction, updateMethod?: PullRequestUpdateMethod) => {
     if (pending.current || !available(action)) return;
     pending.current = true;
@@ -51,7 +51,7 @@ export function usePullRequestAction(params: PullRequestParams, pr: PullRequestD
       { text: "Cancel", style: "cancel" },
       {
         text: title,
-        style: action === "close" ? "destructive" : "default",
+        style: action === "close" || action === "delete-branch" ? "destructive" : "default",
         onPress: () => void perform(action),
       },
     ]);

apps/mobile/src/features/threads/thread-list-v2-items.tsx

@@ -92,7 +92,7 @@ const STATUS_LABEL_BY_STATUS: Partial<Record<ThreadListV2Status, StatusLabel>> =
   },
   waiting: {
     label: "Waiting",
-    icon: "clock",
+    icon: "circle.dashed.inset.filled",
     className: "text-foreground-muted",
     iconTintClassName: "accent-foreground-muted",
   },

apps/server/src/environment/ServerEnvironment.test.ts

@@ -118,6 +118,13 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
         expect(descriptor.capabilities.serverSelfUpdate).toBe(
           mode === "web" ? undefined : "desktop-managed",
         );
+        expect(descriptor.capabilities).toMatchObject({
+          settledWorktreeCleanup: true,
+          storageCleanupRun: true,
+          projectWorktreeCleanup: true,
+          worktreesDirectory: true,
+          threadAutoSettlementScope: true,
+        });
       }
     }),
   );