Commit 02eca40c3b854377ec7bfff629c638379b04e030 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-03-01 10:58:38-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-03-01 20:06:01-08:00
log	02eca40c3b854377ec7bfff629c638379b04e030
tree	f64fd7dd752c1ed4c8998388b85197a387668d64
parent	c6ee3aee9fbe97baeea08593b1fdf9a5b9173466

Enable push/PR actions for branches without upstream

- Treat no-upstream branches as publishable: enable Push/Create PR and update quick actions
- Route Create PR menu action through commit+push+PR flow when appropriate
- Simplify Git action dialog to commit-only and add "Commit on new branch" option

3 files changed, 125 insertions(+), 113 deletions(-)

apps
- web
  - src
    components
    GitActionsControl.logic.test.ts
    GitActionsControl.logic.ts
    GitActionsControl.tsx

apps/web/src/components/GitActionsControl.logic.test.ts+13-11

 @@ -515,19 +515,20 @@ describe("when: HEAD is detached and there are no local changes", () => {
 });
 describe("when: branch has no upstream configured", () => {
-  it("resolveQuickAction returns disabled commit state when clean and no commits are ahead", () => {
+  it("resolveQuickAction runs push and create PR when clean, no upstream, and no local commits are ahead", () => {
     const quick = resolveQuickAction(
       status({ hasUpstream: false, pr: null, aheadCount: 0 }),
       false,
     );
     assert.deepInclude(quick, {
-      kind: "show_hint",
+      kind: "run_action",
-      label: "Commit",
+      action: "commit_push_pr",
-      disabled: true,
+      label: "Push & create PR",
+      disabled: false,
     });
   });
-  it("resolveQuickAction remains disabled when clean, no upstream, and no local commits ahead", () => {
+  it("resolveQuickAction runs push when clean and no upstream even if PR metadata exists", () => {
     const quick = resolveQuickAction(
       status({
         hasUpstream: false,
 @@ -544,9 +545,10 @@ describe("when: branch has no upstream configured", () => {
       false,
     );
     assert.deepInclude(quick, {
-      kind: "show_hint",
+      kind: "run_action",
-      label: "Commit",
+      action: "commit_push",
-      disabled: true,
+      label: "Push",
+      disabled: false,
     });
   });
 @@ -574,7 +576,7 @@ describe("when: branch has no upstream configured", () => {
     });
   });
-  it("buildMenuItems disables push and create PR when no commits are ahead", () => {
+  it("buildMenuItems enables push and create PR to publish branch when no upstream exists", () => {
     const items = buildMenuItems(
       status({ hasUpstream: false, pr: null, aheadCount: 0 }),
       false,
 @@ -591,7 +593,7 @@ describe("when: branch has no upstream configured", () => {
       {
         id: "push",
         label: "Push",
-        disabled: true,
+        disabled: false,
         icon: "push",
         kind: "open_dialog",
         dialogAction: "push",
 @@ -599,7 +601,7 @@ describe("when: branch has no upstream configured", () => {
       {
         id: "pr",
         label: "Create PR",
-        disabled: true,
+        disabled: false,
         icon: "pr",
         kind: "open_dialog",
         dialogAction: "create_pr",

apps/web/src/components/GitActionsControl.logic.ts+20-3

 @@ -111,15 +111,20 @@ export function buildMenuItems(
   const hasChanges = gitStatus.hasWorkingTreeChanges;
   const hasOpenPr = gitStatus.pr?.state === "open";
   const isBehind = gitStatus.behindCount > 0;
+  const canPublishUntrackedBranch = !gitStatus.hasUpstream;
   const canCommit = !isBusy && hasChanges;
-  const canPush = !isBusy && hasBranch && !hasChanges && !isBehind && gitStatus.aheadCount > 0;
+  const canPush =
+    !isBusy &&
+    hasBranch &&
+    !hasChanges &&
+    !isBehind &&
+    (gitStatus.aheadCount > 0 || canPublishUntrackedBranch);
   const canCreatePr =
     !isBusy &&
     hasBranch &&
     !hasChanges &&
     !hasOpenPr &&
-    gitStatus.aheadCount > 0 &&
+    (gitStatus.aheadCount > 0 || canPublishUntrackedBranch) &&
-    gitStatus.hasUpstream &&
     !isBehind;
   const canOpenPr = !isBusy && hasOpenPr;
 @@ -205,6 +210,18 @@ export function resolveQuickAction(
     };
   }
+  if (!gitStatus.hasUpstream) {
+    if (hasOpenPr || isDefaultBranch) {
+      return { label: "Push", disabled: false, kind: "run_action", action: "commit_push" };
+    }
+    return {
+      label: "Push & create PR",
+      disabled: false,
+      kind: "run_action",
+      action: "commit_push_pr",
+    };
+  }
   if (isDiverged) {
     return {
       label: "Sync branch",

apps/web/src/components/GitActionsControl.tsx+92-99

 @@ -8,7 +8,6 @@ import {
   buildMenuItems,
   type GitActionIconName,
   type GitActionMenuItem,
-  type GitDialogAction,
   type GitQuickAction,
   requiresDefaultBranchConfirmation,
   resolveAutoFeatureBranchName,
 @@ -88,6 +87,9 @@ function getMenuActionDisabledReason(
     if (isBehind) {
       return "Branch is behind upstream. Pull/rebase before pushing.";
     }
+    if (!gitStatus.hasUpstream) {
+      return "Branch has no upstream. Push to publish it.";
+    }
     if (!isAhead) {
       return "No local commits to push.";
     }
 @@ -103,29 +105,21 @@ function getMenuActionDisabledReason(
   if (hasChanges) {
     return "Commit local changes before creating a PR.";
   }
-  if (!isAhead) {
-    return "No local commits to include in a PR.";
-  }
   if (!gitStatus.hasUpstream) {
     return "Set an upstream branch before creating a PR.";
   }
+  if (!isAhead) {
+    return "No local commits to include in a PR.";
+  }
   if (isBehind) {
     return "Branch is behind upstream. Pull/rebase before creating a PR.";
   }
   return "Create PR is currently unavailable.";
 }
-const DIALOG_TITLE_BY_ACTION = {
+const COMMIT_DIALOG_TITLE = "Commit changes";
-  commit: "Commit changes",
+const COMMIT_DIALOG_DESCRIPTION =
-  push: "Push branch",
+  "Review and confirm your commit. Leave the message blank to auto-generate one.";
-  create_pr: "Create pull request",
-};
-const DIALOG_DESCRIPTION_BY_ACTION = {
-  commit: "Review and confirm your commit. Leave the message blank to auto-generate one.",
-  push: "Push this branch now.",
-  create_pr: "Create a pull request using generated title/body content.",
-};
 const DEFAULT_BRANCH_ACTION_DESCRIPTION: Record<GitStackedAction, string> = {
   commit: "commit changes",
 @@ -158,7 +152,7 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
     [activeThreadId],
   );
   const queryClient = useQueryClient();
-  const [activeDialogAction, setActiveDialogAction] = useState<GitDialogAction | null>(null);
+  const [isCommitDialogOpen, setIsCommitDialogOpen] = useState(false);
   const [dialogCommitMessage, setDialogCommitMessage] = useState("");
   const [pendingDefaultBranchAction, setPendingDefaultBranchAction] =
     useState<PendingDefaultBranchAction | null>(null);
 @@ -376,7 +370,7 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
                       children: "Create PR",
                       onClick: () => {
                         closeResultToast();
-                        setActiveDialogAction("create_pr");
+                        void runGitActionWithToast({ action: "commit_push_pr" });
                       },
                     },
                   }
 @@ -396,7 +390,6 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
     [
       isDefaultBranch,
       runImmediateGitActionMutation,
-      setActiveDialogAction,
       setPendingDefaultBranchAction,
       threadToastData,
       gitStatusForActions,
 @@ -455,6 +448,54 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
     threadToastData,
   ]);
+  const runDialogActionOnNewBranch = useCallback(() => {
+    if (!isCommitDialogOpen) return;
+    const action: GitStackedAction = "commit";
+    const commitMessage = dialogCommitMessage.trim();
+    const branchName = resolveAutoFeatureBranchName(branchList?.branches.map((branch) => branch.name) ?? []);
+    setIsCommitDialogOpen(false);
+    setDialogCommitMessage("");
+    const checkoutPromise = createBranchAndCheckoutMutation.mutateAsync(branchName);
+    toastManager.promise(checkoutPromise, {
+      loading: { title: `Creating ${branchName}...`, data: threadToastData },
+      success: () => ({
+        title: `Checked out ${branchName}`,
+        data: threadToastData,
+      }),
+      error: (error) => ({
+        title: "Failed to checkout feature branch",
+        description: error instanceof Error ? error.message : "An error occurred.",
+        data: threadToastData,
+      }),
+    });
+    void checkoutPromise
+      .then(() => {
+        const statusOverride = gitStatusForActions
+          ? { ...gitStatusForActions, branch: branchName, pr: null }
+          : null;
+        return runGitActionWithToast({
+          action,
+          ...(commitMessage ? { commitMessage } : {}),
+          skipDefaultBranchPrompt: true,
+          statusOverride,
+          isDefaultBranchOverride: false,
+        });
+      })
+      .catch(() => undefined);
+  }, [
+    branchList?.branches,
+    createBranchAndCheckoutMutation,
+    dialogCommitMessage,
+    gitStatusForActions,
+    isCommitDialogOpen,
+    runGitActionWithToast,
+    setIsCommitDialogOpen,
+    threadToastData,
+  ]);
   const runQuickAction = useCallback(() => {
     if (quickAction.kind === "open_pr") {
       void openExistingPr();
 @@ -506,30 +547,24 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
         void runGitActionWithToast({ action: "commit_push", forcePushOnlyProgress: true });
         return;
       }
-      if (item.dialogAction) {
+      if (item.dialogAction === "create_pr") {
-        setActiveDialogAction(item.dialogAction);
+        void runGitActionWithToast({ action: "commit_push_pr" });
+        return;
       }
+      setIsCommitDialogOpen(true);
     },
-    [openExistingPr, runGitActionWithToast],
+    [openExistingPr, runGitActionWithToast, setIsCommitDialogOpen],
   );
   const runDialogAction = useCallback(() => {
-    if (!activeDialogAction) return;
+    if (!isCommitDialogOpen) return;
-    const action: GitStackedAction =
+    const commitMessage = dialogCommitMessage.trim();
-      activeDialogAction === "commit"
+    setIsCommitDialogOpen(false);
-        ? "commit"
-        : activeDialogAction === "push"
-          ? "commit_push"
-          : "commit_push_pr";
-    const commitMessage = activeDialogAction === "commit" ? dialogCommitMessage.trim() : "";
-    const forcePushOnlyProgress = activeDialogAction === "push";
-    setActiveDialogAction(null);
     void runGitActionWithToast({
-      action,
+      action: "commit",
       ...(commitMessage ? { commitMessage } : {}),
-      ...(forcePushOnlyProgress ? { forcePushOnlyProgress } : {}),
     });
-  }, [activeDialogAction, dialogCommitMessage, runGitActionWithToast]);
+  }, [dialogCommitMessage, isCommitDialogOpen, runGitActionWithToast, setIsCommitDialogOpen]);
   const openChangedFileInEditor = useCallback(
     (filePath: string) => {
 @@ -685,68 +720,29 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
       )}
       <Dialog
-        open={activeDialogAction !== null}
+        open={isCommitDialogOpen}
         onOpenChange={(open) => {
           if (!open) {
-            setActiveDialogAction(null);
+            setIsCommitDialogOpen(false);
             setDialogCommitMessage("");
           }
         }}
       >
         <DialogPopup>
           <DialogHeader>
-            <DialogTitle>{DIALOG_TITLE_BY_ACTION[activeDialogAction ?? "commit"]}</DialogTitle>
+            <DialogTitle>{COMMIT_DIALOG_TITLE}</DialogTitle>
-            <DialogDescription>
+            <DialogDescription>{COMMIT_DIALOG_DESCRIPTION}</DialogDescription>
-              {DIALOG_DESCRIPTION_BY_ACTION[activeDialogAction ?? "commit"]}
-            </DialogDescription>
           </DialogHeader>
           <DialogPanel className="space-y-4">
             <div className="space-y-3 rounded-lg border border-input bg-muted/40 p-3 text-xs">
               <div className="grid grid-cols-[auto_1fr] items-center gap-x-2 gap-y-1">
                 <span className="text-muted-foreground">Branch</span>
-                <span className="font-medium">
+                <span className="flex items-center justify-between gap-2">
-                  {gitStatusForActions?.branch ?? "(detached HEAD)"}
+                  <span className="font-medium">{gitStatusForActions?.branch ?? "(detached HEAD)"}</span>
+                  {isDefaultBranch && (
+                    <span className="text-right text-warning text-xs">Warning: default branch</span>
+                  )}
                 </span>
-                {activeDialogAction !== "commit" && (
-                  <>
-                    <span className="text-muted-foreground">Upstream</span>
-                    <span className="font-medium">
-                      {!gitStatusForActions || !gitStatusForActions.hasUpstream
-                        ? "No upstream configured"
-                        : gitStatusForActions.aheadCount === 0 &&
-                            gitStatusForActions.behindCount === 0
-                          ? "Up to date"
-                          : gitStatusForActions.aheadCount > 0 &&
-                              gitStatusForActions.behindCount > 0
-                            ? `Diverged (+${gitStatusForActions.aheadCount} / -${gitStatusForActions.behindCount})`
-                            : gitStatusForActions.aheadCount > 0
-                              ? `Ahead by ${gitStatusForActions.aheadCount}`
-                              : `Behind by ${gitStatusForActions.behindCount}`}
-                    </span>
-                    <span className="text-muted-foreground">Working tree</span>
-                    <span className="font-medium">
-                      {!gitStatusForActions || !gitStatusForActions.hasWorkingTreeChanges
-                        ? "Clean"
-                        : `${gitStatusForActions.workingTree.files.length} file(s)`}
-                    </span>
-                    <span className="text-muted-foreground">Diff</span>
-                    <span className="font-mono">
-                      {!gitStatusForActions || !gitStatusForActions.hasWorkingTreeChanges ? (
-                        "none"
-                      ) : (
-                        <>
-                          <span className="text-success">
-                            +{gitStatusForActions.workingTree.insertions}
-                          </span>
-                          <span className="text-muted-foreground"> / </span>
-                          <span className="text-destructive">
-                            -{gitStatusForActions.workingTree.deletions}
-                          </span>
-                        </>
-                      )}
-                    </span>
-                  </>
-                )}
               </div>
               <div className="space-y-1">
                 <p className="text-muted-foreground">Files</p>
 @@ -786,35 +782,32 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
                 )}
               </div>
             </div>
-            {activeDialogAction === "commit" && (
+            <div className="space-y-1">
-              <div className="space-y-1">
+              <p className="text-xs font-medium">Commit message (optional)</p>
-                <p className="text-xs font-medium">Commit message (optional)</p>
+              <Textarea
-                <Textarea
+                value={dialogCommitMessage}
-                  value={dialogCommitMessage}
+                onChange={(event) => setDialogCommitMessage(event.target.value)}
-                  onChange={(event) => setDialogCommitMessage(event.target.value)}
+                placeholder="Leave empty to auto-generate"
-                  placeholder="Leave empty to auto-generate"
+                size="sm"
-                  size="sm"
+              />
-                />
+            </div>
-              </div>
-            )}
           </DialogPanel>
           <DialogFooter>
             <Button
               variant="outline"
               size="sm"
               onClick={() => {
-                setActiveDialogAction(null);
+                setIsCommitDialogOpen(false);
                 setDialogCommitMessage("");
               }}
             >
               Cancel
             </Button>
+            <Button variant="outline" size="sm" onClick={runDialogActionOnNewBranch}>
+              Commit on new branch
+            </Button>
             <Button size="sm" onClick={runDialogAction}>
-              {activeDialogAction === "commit"
+              Commit
-                ? "Commit"
-                : activeDialogAction === "push"
-                  ? "Push"
-                  : "Create PR"}
             </Button>
           </DialogFooter>
         </DialogPopup>