Fix issue #5179: [frontend]: Push to Github button should only push branch, but not creating a PR

frontend/__tests__/components/chat/chat-interface.test.tsx

@@ -281,6 +281,62 @@ describe.skip("ChatInterface", () => {
     expect(within(error).getByText("Something went wrong")).toBeInTheDocument();
   });
 
+  it("should render both GitHub buttons initially when ghToken is available", () => {
+    vi.mock("@remix-run/react", async (importActual) => ({
+      ...(await importActual<typeof import("@remix-run/react")>()),
+      useRouteLoaderData: vi.fn(() => ({ ghToken: "test-token" })),
+    }));
+
+    const messages: Message[] = [
+      {
+        sender: "assistant",
+        content: "Hello",
+        imageUrls: [],
+        timestamp: new Date().toISOString(),
+      },
+    ];
+    renderChatInterface(messages);
+
+    const pushButton = screen.getByRole("button", { name: "Push to Branch" });
+    const prButton = screen.getByRole("button", { name: "Push & Create PR" });
+
+    expect(pushButton).toBeInTheDocument();
+    expect(prButton).toBeInTheDocument();
+    expect(pushButton).toHaveTextContent("Push to Branch");
+    expect(prButton).toHaveTextContent("Push & Create PR");
+  });
+
+  it("should render only 'Push changes to PR' button after PR is created", async () => {
+    vi.mock("@remix-run/react", async (importActual) => ({
+      ...(await importActual<typeof import("@remix-run/react")>()),
+      useRouteLoaderData: vi.fn(() => ({ ghToken: "test-token" })),
+    }));
+
+    const messages: Message[] = [
+      {
+        sender: "assistant",
+        content: "Hello",
+        imageUrls: [],
+        timestamp: new Date().toISOString(),
+      },
+    ];
+    const { rerender } = renderChatInterface(messages);
+    const user = userEvent.setup();
+
+    // Click the "Push & Create PR" button
+    const prButton = screen.getByRole("button", { name: "Push & Create PR" });
+    await user.click(prButton);
+
+    // Re-render to trigger state update
+    rerender(<ChatInterface />);
+
+    // Verify only one button is shown
+    const pushToPrButton = screen.getByRole("button", { name: "Push changes to PR" });
+    expect(pushToPrButton).toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "Push to Branch" })).not.toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "Push & Create PR" })).not.toBeInTheDocument();
+  });
+
   it("should render feedback actions if there are more than 3 messages", () => {
     const messages: Message[] = [
       {

frontend/public/config.json

@@ -2,4 +2,4 @@
   "APP_MODE": "oss",
   "GITHUB_CLIENT_ID": "",
   "POSTHOG_CLIENT_KEY": "phc_3ESMmY9SgqEAGBB6sMGK5ayYHkeUuknH2vP6FmWH9RA"
-}
+}

frontend/src/components/chat-interface.tsx

@@ -52,6 +52,7 @@
   const [feedbackModalIsOpen, setFeedbackModalIsOpen] = React.useState(false);
   const [messageToSend, setMessageToSend] = React.useState<string | null>(null);
   const [isDownloading, setIsDownloading] = React.useState(false);
+  const [hasPullRequest, setHasPullRequest] = React.useState(false);
 
   React.useEffect(() => {
     if (status === WsClientProviderStatus.ACTIVE) {
@@ -65,7 +66,7 @@
           );
         });
       } catch (e) {
         console.warn("Runtime ID not available in this environment");
       }
     }
   }, [status]);
@@ -175,16 +176,44 @@
           curAgentState === AgentState.FINISHED) && (
           <div className="flex flex-col gap-2 mb-2">
             {gitHubToken ? (
-              <SuggestionItem
-                suggestion={{
-                  label: "Push to GitHub",
-                  value:
-                    "Please push the changes to GitHub and open a pull request.",
-                }}
-                onClick={(value) => {
-                  handleSendMessage(value, []);
-                }}
-              />
+              <div className="flex flex-row gap-2 justify-center w-full">
+                {!hasPullRequest ? (
+                  <>
+                    <SuggestionItem
+                      suggestion={{
+                        label: "Push to Branch",
+                        value:
+                          "Please push the changes to a remote branch on GitHub, but do NOT create a pull request.",
+                      }}
+                      onClick={(value) => {
+                        handleSendMessage(value, []);
+                      }}
+                    />
+                    <SuggestionItem
+                      suggestion={{
+                        label: "Push & Create PR",
+                        value:
+                          "Please push the changes to GitHub and open a pull request.",
+                      }}
+                      onClick={(value) => {
+                        handleSendMessage(value, []);
+                        setHasPullRequest(true);
+                      }}
+                    />
+                  </>
+                ) : (
+                  <SuggestionItem
+                    suggestion={{
+                      label: "Push changes to PR",
+                      value:
+                        "Please push the latest changes to the existing pull request.",
+                    }}
+                    onClick={(value) => {
+                      handleSendMessage(value, []);
+                    }}
+                  />
+                )}
+              </div>
             ) : (
               <SuggestionItem
                 suggestion={{

frontend/src/components/suggestion-item.tsx

@@ -7,7 +7,7 @@ interface SuggestionItemProps {
 
 export function SuggestionItem({ suggestion, onClick }: SuggestionItemProps) {
   return (
-    <li className="list-none border border-neutral-600 rounded-xl hover:bg-neutral-700">
+    <li className="list-none border border-neutral-600 rounded-xl hover:bg-neutral-700 flex-1">
       <button
         type="button"
         data-testid="suggestion"

openhands/agenthub/codeact_agent/codeact_agent.py

@@ -187,7 +187,9 @@ def get_action_message(
                 )
             ]
         elif isinstance(action, CmdRunAction) and action.source == 'user':
-            content = [TextContent(text=f'User executed the command:\n{action.command}')]
+            content = [
+                TextContent(text=f'User executed the command:\n{action.command}')
+            ]
             return [
                 Message(
                     role='user',

openhands/events/action/message.py

@@ -24,6 +24,7 @@ def images_urls(self):
     @images_urls.setter
     def images_urls(self, value):
         self.image_urls = value
+
     def __str__(self) -> str:
         ret = f'**MessageAction** (source={self.source})\n'
         ret += f'CONTENT: {self.content}'

openhands/events/serialization/action.py

@@ -69,7 +69,7 @@ def action_from_dict(action: dict) -> Action:
     # images_urls has been renamed to image_urls
     if 'images_urls' in args:
         args['image_urls'] = args.pop('images_urls')
-        
+
     try:
         decoded_action = action_class(**args)
         if 'timeout' in action:

openhands/resolver/patching/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from .patch import parse_patch
 from .apply import apply_diff
+from .patch import parse_patch
 
-__all__ = ["parse_patch", "apply_diff"]
+__all__ = ['parse_patch', 'apply_diff']

openhands/resolver/patching/apply.py

@@ -10,33 +10,33 @@
 
 def _apply_diff_with_subprocess(diff, lines, reverse=False):
     # call out to patch program
-    patchexec = which("patch")
+    patchexec = which('patch')
     if not patchexec:
-        raise SubprocessException("cannot find patch program", code=-1)
+        raise SubprocessException('cannot find patch program', code=-1)
 
     tempdir = tempfile.gettempdir()
 
-    filepath = os.path.join(tempdir, "wtp-" + str(hash(diff.header)))
-    oldfilepath = filepath + ".old"
-    newfilepath = filepath + ".new"
-    rejfilepath = filepath + ".rej"
-    patchfilepath = filepath + ".patch"
-    with open(oldfilepath, "w") as f:
-        f.write("\n".join(lines) + "\n")
+    filepath = os.path.join(tempdir, 'wtp-' + str(hash(diff.header)))
+    oldfilepath = filepath + '.old'
+    newfilepath = filepath + '.new'
+    rejfilepath = filepath + '.rej'
+    patchfilepath = filepath + '.patch'
+    with open(oldfilepath, 'w') as f:
+        f.write('\n'.join(lines) + '\n')
 
-    with open(patchfilepath, "w") as f:
+    with open(patchfilepath, 'w') as f:
         f.write(diff.text)
 
     args = [
         patchexec,
-        "--reverse" if reverse else "--forward",
-        "--quiet",
-        "--no-backup-if-mismatch",
-        "-o",
+        '--reverse' if reverse else '--forward',
+        '--quiet',
+        '--no-backup-if-mismatch',
+        '-o',
         newfilepath,
-        "-i",
+        '-i',
         patchfilepath,
-        "-r",
+        '-r',
         rejfilepath,
         oldfilepath,
     ]
@@ -58,7 +58,7 @@ def _apply_diff_with_subprocess(diff, lines, reverse=False):
 
     # do this last to ensure files get cleaned up
     if ret != 0:
-        raise SubprocessException("patch program failed", code=ret)
+        raise SubprocessException('patch program failed', code=ret)
 
     return lines, rejlines
 

openhands/resolver/patching/exceptions.py

@@ -7,7 +7,7 @@ def __init__(self, msg, hunk=None):
         self.hunk = hunk
         if hunk is not None:
             super(HunkException, self).__init__(
-                "{msg}, in hunk #{n}".format(msg=msg, n=hunk)
+                '{msg}, in hunk #{n}'.format(msg=msg, n=hunk)
             )
         else:
             super(HunkException, self).__init__(msg)