Fix protected branch push rejections not being detected (#345)

src-web/components/CreateWorkspaceDialog.tsx

@@ -51,7 +51,11 @@ export function CreateWorkspaceDialog({ hide }: Props) {
           gitMutations(syncConfig.filePath, gitCallbacks(syncConfig.filePath))
             .init.mutateAsync()
             .catch((err) => {
-              showErrorToast('git-init-error', String(err));
+              showErrorToast({
+                id: 'git-init-error',
+                title: 'Error initializing Git',
+                message: String(err),
+              });
             });
         }
 

src-web/components/core/Toast.tsx

@@ -58,12 +58,11 @@ export function Toast({ children, open, onClose, timeout, action, icon, color }:
           'pointer-events-auto overflow-hidden',
           'relative pointer-events-auto bg-surface text-text rounded-lg',
           'border border-border shadow-lg w-[25rem]',
-          'grid grid-cols-[1fr_auto]',
         )}
       >
-        <div className="px-3 py-3 flex items-start gap-2 w-full">
-          {toastIcon && <Icon icon={toastIcon} color={color} className="mt-1" />}
-          <VStack space={2} className="w-full">
+        <div className="pl-3 py-3 pr-10 flex items-start gap-2 w-full max-h-[11rem] overflow-auto">
+          {toastIcon && <Icon icon={toastIcon} color={color} className="mt-1 flex-shrink-0" />}
+          <VStack space={2} className="w-full min-w-0">
             <div className="select-auto">{children}</div>
             {action?.({ hide: onClose })}
           </VStack>
@@ -72,7 +71,7 @@ export function Toast({ children, open, onClose, timeout, action, icon, color }:
         <IconButton
           color={color}
           variant="border"
-          className="opacity-60 border-0"
+          className="opacity-60 border-0 !absolute top-2 right-2"
           title="Dismiss"
           icon="x"
           onClick={onClose}

src-web/components/git/GitCommitDialog.tsx

@@ -66,7 +66,11 @@ export function GitCommitDialog({ syncDir, onDone, workspace }: Props) {
       handlePushResult(r);
       onDone();
     } catch (err) {
-      showErrorToast('git-commit-and-push-error', String(err));
+      showErrorToast({
+        id: 'git-commit-and-push-error',
+        title: 'Error committing and pushing',
+        message: String(err),
+      });
     } finally {
       setIsPushing(false);
     }

src-web/components/git/GitDropdown.tsx

@@ -62,6 +62,7 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
     checkout.mutate(
       { branch, force },
       {
+        disableToastError: true,
         async onError(err) {
           if (!force) {
             // Checkout failed so ask user if they want to force it
@@ -78,7 +79,11 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
             }
           } else {
             // Checkout failed
-            showErrorToast('git-checkout-error', String(err));
+            showErrorToast({
+              id: 'git-checkout-error',
+              title: 'Error checking out branch',
+              message: String(err),
+            });
           }
         },
         async onSuccess(branchName) {
@@ -132,8 +137,13 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
         await branch.mutateAsync(
           { branch: name },
           {
+            disableToastError: true,
             onError: (err) => {
-              showErrorToast('git-branch-error', String(err));
+              showErrorToast({
+                id: 'git-branch-error',
+                title: 'Error creating branch',
+                message: String(err),
+              });
             },
           },
         );
@@ -163,6 +173,7 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
                 await mergeBranch.mutateAsync(
                   { branch, force: false },
                   {
+                    disableToastError: true,
                     onSettled: hide,
                     onSuccess() {
                       showToast({
@@ -177,7 +188,11 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
                       sync({ force: true });
                     },
                     onError(err) {
-                      showErrorToast('git-merged-branch-error', String(err));
+                      showErrorToast({
+                        id: 'git-merged-branch-error',
+                        title: 'Error merging branch',
+                        message: String(err),
+                      });
                     },
                   },
                 );
@@ -208,8 +223,13 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
           await deleteBranch.mutateAsync(
             { branch: currentBranch },
             {
+              disableToastError: true,
               onError(err) {
-                showErrorToast('git-delete-branch-error', String(err));
+                showErrorToast({
+                  id: 'git-delete-branch-error',
+                  title: 'Error deleting branch',
+                  message: String(err),
+                });
               },
               async onSuccess() {
                 await sync({ force: true });
@@ -226,9 +246,14 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
       waitForOnSelect: true,
       async onSelect() {
         await push.mutateAsync(undefined, {
+          disableToastError: true,
           onSuccess: handlePullResult,
           onError(err) {
-            showErrorToast('git-pull-error', String(err));
+            showErrorToast({
+              id: 'git-push-error',
+              title: 'Error pushing changes',
+              message: String(err),
+            });
           },
         });
       },
@@ -240,9 +265,14 @@ function SyncDropdownWithSyncDir({ syncDir }: { syncDir: string }) {
       waitForOnSelect: true,
       async onSelect() {
         await pull.mutateAsync(undefined, {
+          disableToastError: true,
           onSuccess: handlePullResult,
           onError(err) {
-            showErrorToast('git-pull-error', String(err));
+            showErrorToast({
+              id: 'git-pull-error',
+              title: 'Error pulling changes',
+              message: String(err),
+            });
           },
         });
       },