coder
diff --git a/‎src/assets/icons/refresh.svg‎
Lines changed: 3 additions & 0 deletions b/‎src/assets/icons/refresh.svg‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/components/AIView.tsx‎
Lines changed: 1 addition & 0 deletions b/‎src/components/AIView.tsx‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/components/GitStatusIndicator.tsx‎
Lines changed: 88 additions & 26 deletions b/‎src/components/GitStatusIndicator.tsx‎
Lines changed: 88 additions & 26 deletions
@@ -438,6 +438,7 @@ const AIViewInner: React.FC<AIViewProps> = ({
               gitStatus={gitStatus}
               workspaceId={workspaceId}
               tooltipPosition="bottom"
+              isStreaming={canInterrupt}
             />
             {projectName} / {branch}
             <WorkspacePath>{namedWorkspacePath}</WorkspacePath>
 
@@ -1,23 +1,26 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import type { GitStatus } from "@/types/workspace";
 import { GitStatusIndicatorView } from "./GitStatusIndicatorView";
 import { useGitBranchDetails } from "./hooks/useGitBranchDetails";
+import { strict as assert } from "node:assert";
 
 interface GitStatusIndicatorProps {
   gitStatus: GitStatus | null;
   workspaceId: string;
   tooltipPosition?: "right" | "bottom";
+  isStreaming?: boolean;
 }
 
 /**
  * Container component for git status indicator.
- * Manages tooltip visibility, positioning, and data fetching.
+ * Manages tooltip visibility, positioning, data fetching, and auto-rebase UX.
  * Delegates rendering to GitStatusIndicatorView.
  */
 export const GitStatusIndicator: React.FC<GitStatusIndicatorProps> = ({
   gitStatus,
   workspaceId,
   tooltipPosition = "right",
+  isStreaming = false,
 }) => {
   const [showTooltip, setShowTooltip] = useState(false);
   const [tooltipCoords, setTooltipCoords] = useState<{ top: number; left: number }>({
@@ -26,41 +29,38 @@ export const GitStatusIndicator: React.FC<GitStatusIndicatorProps> = ({
   });
   const hideTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const containerRef = useRef<HTMLSpanElement | null>(null);
-  const trimmedWorkspaceId = workspaceId.trim();
+  const [isRebasing, setIsRebasing] = useState(false);
+  const [rebaseError, setRebaseError] = useState<string | null>(null);
 
-  console.assert(
+  const trimmedWorkspaceId = workspaceId.trim();
+  assert(
     trimmedWorkspaceId.length > 0,
     "GitStatusIndicator requires workspaceId to be a non-empty string."
   );
 
-  // Fetch branch details only when tooltip should be shown
-  const { branchHeaders, commits, dirtyFiles, isLoading, errorMessage } = useGitBranchDetails(
-    trimmedWorkspaceId,
-    gitStatus,
-    showTooltip
-  );
+  const { branchHeaders, commits, dirtyFiles, isLoading, errorMessage, invalidateCache, refresh } =
+    useGitBranchDetails(trimmedWorkspaceId, gitStatus, showTooltip);
 
-  const handleMouseEnter = () => {
-    // Cancel any pending hide timeout
+  const cancelHideTimeout = () => {
     if (hideTimeoutRef.current) {
       clearTimeout(hideTimeoutRef.current);
       hideTimeoutRef.current = null;
     }
+  };
 
+  const handleMouseEnter = () => {
+    cancelHideTimeout();
     setShowTooltip(true);
 
-    // Calculate tooltip position based on indicator position
     if (containerRef.current) {
       const rect = containerRef.current.getBoundingClientRect();
 
       if (tooltipPosition === "right") {
-        // Position to the right of the indicator
         setTooltipCoords({
           top: rect.top + rect.height / 2,
           left: rect.right + 8,
         });
       } else {
-        // Position below the indicator
         setTooltipCoords({
           top: rect.bottom + 8,
           left: rect.left,
@@ -70,38 +70,96 @@ export const GitStatusIndicator: React.FC<GitStatusIndicatorProps> = ({
   };
 
   const handleMouseLeave = () => {
-    // Delay hiding to give user time to move cursor to tooltip
     hideTimeoutRef.current = setTimeout(() => {
       setShowTooltip(false);
     }, 300);
   };
 
   const handleTooltipMouseEnter = () => {
-    // Cancel hide timeout when hovering tooltip
-    if (hideTimeoutRef.current) {
-      clearTimeout(hideTimeoutRef.current);
-      hideTimeoutRef.current = null;
-    }
+    cancelHideTimeout();
   };
 
   const handleTooltipMouseLeave = () => {
-    // Hide immediately when leaving tooltip
     setShowTooltip(false);
   };
 
   const handleContainerRef = (el: HTMLSpanElement | null) => {
     containerRef.current = el;
   };
 
-  // Cleanup timeout on unmount
+  const canRebase = !!gitStatus && gitStatus.behind > 0 && !isStreaming && !isRebasing;
+
+  const handleRebaseClick = useCallback(async () => {
+    if (!gitStatus || gitStatus.behind <= 0 || isStreaming || isRebasing) {
+      return;
+    }
+
+    setIsRebasing(true);
+    setRebaseError(null);
+
+    try {
+      const result = await window.api?.workspace?.rebase?.(trimmedWorkspaceId);
+
+      assert(
+        typeof result !== "undefined",
+        "workspace.rebase IPC handler must exist before attempting auto-rebase."
+      );
+
+      if (!result) {
+        setRebaseError("Auto-rebase unavailable: workspace IPC handler missing.");
+        return;
+      }
+
+      if (result.success) {
+        invalidateCache();
+        if (showTooltip) {
+          refresh();
+        }
+        return;
+      }
+
+      invalidateCache();
+
+      if (result.status === "conflicts") {
+        setRebaseError(
+          result.error ??
+            "Rebase hit conflicts. Check the chat for details and resolve before continuing."
+        );
+      } else {
+        setRebaseError(result.error ?? "Rebase failed unexpectedly.");
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      setRebaseError(`Failed to rebase: ${message}`);
+    } finally {
+      setIsRebasing(false);
+    }
+  }, [
+    gitStatus,
+    invalidateCache,
+    isRebasing,
+    isStreaming,
+    refresh,
+    showTooltip,
+    trimmedWorkspaceId,
+  ]);
+
+  const triggerRebase = useCallback(() => {
+    void handleRebaseClick();
+  }, [handleRebaseClick]);
+
   useEffect(() => {
     return () => {
-      if (hideTimeoutRef.current) {
-        clearTimeout(hideTimeoutRef.current);
-      }
+      cancelHideTimeout();
     };
   }, []);
 
+  useEffect(() => {
+    if (gitStatus?.behind === 0) {
+      setRebaseError(null);
+    }
+  }, [gitStatus]);
+
   return (
     <GitStatusIndicatorView
       gitStatus={gitStatus}
@@ -118,6 +176,10 @@ export const GitStatusIndicator: React.FC<GitStatusIndicatorProps> = ({
       onTooltipMouseEnter={handleTooltipMouseEnter}
       onTooltipMouseLeave={handleTooltipMouseLeave}
       onContainerRef={handleContainerRef}
+      canRebase={canRebase}
+      isRebasing={isRebasing}
+      onRebaseClick={triggerRebase}
+      rebaseError={rebaseError}
     />
   );
 };