rebase issues resolved

Author: arul28

apps/desktop/src/main/main.ts

@@ -562,6 +562,7 @@ app.whenReady().then(async () => {
     let rebaseSuggestionService: ReturnType<typeof createRebaseSuggestionService> | null = null;
     let autoRebaseService: ReturnType<typeof createAutoRebaseService> | null = null;
     let humanWorkDigestService: ReturnType<typeof createHumanWorkDigestService> | null = null;
+    let conflictServiceRef: ReturnType<typeof createConflictService> | null = null;
     let prServiceRef: ReturnType<typeof createPrService> | null = null;
     let prPollingServiceRef: ReturnType<typeof createPrPollingService> | null = null;
 
@@ -622,7 +623,17 @@ app.whenReady().then(async () => {
       worktreesDir: adePaths.worktreesDir,
       operationService,
       onHeadChanged: handleHeadChanged,
-      onRebaseEvent: (event) => emitProjectEvent(projectRoot, IPC.lanesRebaseEvent, event)
+      onRebaseEvent: (event) => {
+        emitProjectEvent(projectRoot, IPC.lanesRebaseEvent, event);
+        if (event.type === "rebase-run-updated" && event.run.state !== "running") {
+          void conflictServiceRef?.scanRebaseNeeds().catch((error) => {
+            logger.warn("rebase.needs_refresh_failed", {
+              runId: event.run.runId,
+              error: error instanceof Error ? error.message : String(error),
+            });
+          });
+        }
+      }
     });
     await laneService.ensurePrimaryLane();
 
@@ -775,6 +786,7 @@ app.whenReady().then(async () => {
         }
       }
     });
+    conflictServiceRef = conflictService;
 
     autoRebaseService = createAutoRebaseService({
       db,

apps/desktop/src/renderer/components/prs/tabs/RebaseTab.tsx

@@ -87,6 +87,14 @@ export function RebaseTab({
   const [selectedPushLaneIds, setSelectedPushLaneIds] = React.useState<string[]>([]);
   const activeRunIdRef = React.useRef<string | null>(null);
 
+  const refreshRebaseNeeds = React.useCallback(async () => {
+    try {
+      await window.ade.rebase.scanNeeds();
+    } catch {
+      /* best effort */
+    }
+  }, []);
+
   // Drift commits state
   const [driftCommits, setDriftCommits] = React.useState<GitCommitSummary[]>([]);
   const [driftCommitsLoading, setDriftCommitsLoading] = React.useState(false);
@@ -177,6 +185,9 @@ export function RebaseTab({
           if (!selectedNeed || event.run.rootLaneId !== selectedNeed.laneId) return prev;
           return event.run;
         });
+        if (event.run.state !== "running") {
+          void refreshRebaseNeeds();
+        }
       } else if (event.type === "rebase-run-log") {
         setRunLogs((prev) => {
           const activeRunId = activeRunIdRef.current;
@@ -188,7 +199,7 @@ export function RebaseTab({
       }
     });
     return unsubscribe;
-  }, [selectedNeed]);
+  }, [refreshRebaseNeeds, selectedNeed]);
 
   // Fetch drift commits when selected need changes
   React.useEffect(() => {
@@ -268,6 +279,7 @@ export function RebaseTab({
         setActiveRun(pushed);
         setRunLogs((prev) => [...prev, `[${new Date().toLocaleTimeString()}] Push complete`].slice(-80));
       }
+      await refreshRebaseNeeds();
       await onRefresh();
     } catch (err: unknown) {
       setRebaseError(err instanceof Error ? err.message : String(err));
@@ -276,6 +288,15 @@ export function RebaseTab({
     }
   };
   const selectedRunIsActive = activeRun?.state === "running";
+  const selectedRunLane = React.useMemo(
+    () => (selectedNeed ? activeRun?.lanes.find((lane) => lane.laneId === selectedNeed.laneId) ?? null : null),
+    [activeRun, selectedNeed],
+  );
+  const selectedNeedResolvedByRun = Boolean(
+    selectedRunLane
+      && activeRun?.state === "completed"
+      && (selectedRunLane.status === "succeeded" || selectedRunLane.status === "skipped"),
+  );
 
   const handleAbortRun = async () => {
     if (!activeRun) return;
@@ -284,6 +305,7 @@ export function RebaseTab({
     try {
       const next = await window.ade.lanes.rebaseAbort({ runId: activeRun.runId });
       setActiveRun(next);
+      await refreshRebaseNeeds();
       await onRefresh();
     } catch (err: unknown) {
       setRebaseError(err instanceof Error ? err.message : String(err));
@@ -299,6 +321,7 @@ export function RebaseTab({
     try {
       const next = await window.ade.lanes.rebaseRollback({ runId: activeRun.runId });
       setActiveRun(next);
+      await refreshRebaseNeeds();
       await onRefresh();
     } catch (err: unknown) {
       setRebaseError(err instanceof Error ? err.message : String(err));
@@ -314,6 +337,7 @@ export function RebaseTab({
     try {
       const next = await window.ade.lanes.rebasePush({ runId: activeRun.runId, laneIds: selectedPushLaneIds });
       setActiveRun(next);
+      await refreshRebaseNeeds();
       await onRefresh();
     } catch (err: unknown) {
       setRebaseError(err instanceof Error ? err.message : String(err));
@@ -943,7 +967,7 @@ export function RebaseTab({
                 <Button
                   size="sm"
                   variant="primary"
-                  disabled={rebaseBusy || selectedNeed.behindBy === 0 || selectedRunIsActive}
+                  disabled={rebaseBusy || selectedNeed.behindBy === 0 || selectedRunIsActive || selectedNeedResolvedByRun}
                   onClick={() => void handleRebase(true)}
                   style={{ borderRadius: 0 }}
                 >
@@ -955,7 +979,7 @@ export function RebaseTab({
                 <Button
                   size="sm"
                   variant="outline"
-                  disabled={rebaseBusy || selectedNeed.behindBy === 0 || selectedRunIsActive}
+                  disabled={rebaseBusy || selectedNeed.behindBy === 0 || selectedRunIsActive || selectedNeedResolvedByRun}
                   onClick={() => void handleRebase(false, "none")}
                   style={{ borderRadius: 0, borderColor: S.borderSubtle }}
                 >
@@ -966,7 +990,7 @@ export function RebaseTab({
                 <Button
                   size="sm"
                   variant="outline"
-                  disabled={rebaseBusy || selectedNeed.behindBy === 0 || selectedRunIsActive}
+                  disabled={rebaseBusy || selectedNeed.behindBy === 0 || selectedRunIsActive || selectedNeedResolvedByRun}
                   onClick={() => void handleRebase(false, "review_then_push")}
                   style={{ borderRadius: 0, borderColor: S.borderSubtle }}
                 >