ship: iter 1 — address greptile #3133271501 and copilot #4307244389

- Memoize readInitialRouteState in PrsProvider so the four useState
  initializers share one window.location read (greptile P2).
- Mirror PRsPage's resolveRouteRebaseSelection inside
  readInitialRouteState so the initial selectedRebaseItemId has the
  same shape as the post-effect value.
- QueueTab.openRebaseTab now navigates to
  ?tab=workflows&workflow=rebase to keep URL in sync with state.
- Normalize the "Open Rebase/Merge tab" label to sentence case across
  CreatePrModal, IntegrationTab; keep LaneGitActionsPane tooltip title
  case to match its sibling tooltips.
- Restore prRebaseResolver.sendMessage displayText — it is used by
  agentChatService for the transcript text bubble.

Verified locally: desktop tsc clean; 46 affected tests pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: arul28

apps/desktop/src/main/services/prs/prRebaseResolver.test.ts

@@ -142,9 +142,9 @@ describe("launchRebaseResolutionChat", () => {
       expect.objectContaining({
         sessionId: "session-rebase-1",
         reasoningEffort: "high",
+        displayText: "Rebase feature/rebase-target onto main",
       }),
     );
-    expect(sendMessage.mock.calls[0]?.[0]).not.toHaveProperty("displayText");
     expect(result).toEqual({
       sessionId: "session-rebase-1",
       laneId: lane.id,

apps/desktop/src/main/services/prs/prRebaseResolver.ts

@@ -158,6 +158,11 @@ export async function launchRebaseResolutionChat(
   await deps.agentChatService.sendMessage({
     sessionId: session.id,
     text: prompt,
+    // Show the short human-readable title in the transcript instead of the
+    // full composed prompt (which is long and technical). Mirrors
+    // prIssueResolver's pattern; agentChatService falls back to `text` when
+    // displayText is absent, which would surface the raw prompt to the user.
+    displayText: title,
     ...(reasoningEffort ? { reasoningEffort } : {}),
   });
 

apps/desktop/src/renderer/components/lanes/LaneGitActionsPane.tsx

@@ -1571,7 +1571,7 @@ export function LaneGitActionsPane({
             {autoRebaseStatus.state !== "autoRebased" ? (
               isAutoRebaseFailure ? (
                 <SmartTooltip content={{
-                  label: "Open Rebase/Merge tab",
+                  label: "Open Rebase/Merge Tab",
                   description: "View detailed rebase information and resolve issues.",
                   effect: "Navigate to the rebase details view",
                 }}>

apps/desktop/src/renderer/components/prs/CreatePrModal.tsx

@@ -447,7 +447,7 @@ function LaneWarningPanel({
                   cursor: "pointer",
                 }}
               >
-                Open Rebase/Merge Tab
+                Open Rebase/Merge tab
               </button>
               <span style={{ fontSize: 10, color: C.textMuted, fontFamily: MONO_FONT }}>
                 Review rebase status before PR creation{rebaseLaneIds.length > 1 ? ` (${rebaseLaneIds.length} lanes)` : ""}.

apps/desktop/src/renderer/components/prs/state/PrsContext.tsx

@@ -35,6 +35,7 @@ import { DEFAULT_PR_TIMELINE_FILTERS } from "../shared/PrTimeline";
 import { buildPrAiResolutionContextKey } from "../../../../shared/types";
 import { getModelById } from "../../../../shared/modelRegistry";
 import { parsePrsRouteState, resolvePrsActiveTab } from "../prsRouteState";
+import { resolveRouteRebaseSelection } from "../shared/rebaseNeedUtils";
 
 type PrTab = "normal" | "queue" | "integration" | "rebase";
 
@@ -232,7 +233,14 @@ function readInitialRouteState(): {
         ? route.prId
         : null,
       selectedQueueGroupId: resolved.effectiveWorkflow === "queue" ? route.queueGroupId : null,
-      selectedRebaseItemId: resolved.effectiveWorkflow === "rebase" ? route.laneId : null,
+      // Mirror PRsPage's resolver so the shape of this id matches what the
+      // rebase UI later expects. rebaseNeeds are empty at provider mount, so
+      // this returns the bare lane id; PRsPage's syncFromLocation effect runs
+      // the same resolver again once needs load and upgrades it to the
+      // canonical need-item key.
+      selectedRebaseItemId: resolved.effectiveWorkflow === "rebase"
+        ? resolveRouteRebaseSelection({ rebaseNeeds: [], routeItemId: route.laneId })
+        : null,
     };
   } catch { /* ignore */ }
   return {
@@ -284,7 +292,11 @@ function diffPrIds(prev: PrWithConflicts[], next: PrWithConflicts[]): string[] {
 }
 
 export function PrsProvider({ children }: { children: React.ReactNode }) {
-  const initialRouteState = readInitialRouteState();
+  // Compute initial route state exactly once per provider mount. Reading
+  // window.location + running parsePrsRouteState/resolvePrsActiveTab on every
+  // render would be wasteful; useMemo with empty deps captures it once so all
+  // four useState calls below share a single computation.
+  const initialRouteState = useMemo(() => readInitialRouteState(), []);
   const [activeTab, setActiveTab] = useState<PrTab>(initialRouteState.activeTab);
   const [prs, setPrs] = useState<PrWithConflicts[]>([]);
   const [lanes, setLanes] = useState<LaneSummary[]>([]);

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

@@ -161,7 +161,7 @@ function RebaseGuidancePanel({
               navigate({ pathname: "/prs", search: `?${search.toString()}` });
             }}
           >
-            OPEN REBASE/MERGE TAB
+            Open Rebase/Merge tab
           </button>
           {onResimulate ? (
             <button

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

@@ -469,7 +469,13 @@ export function QueueTab({
     const need = findLaneBaseNeed(visibleRebaseNeeds, laneId);
     setSelectedRebaseItemId(need ? rebaseNeedItemKey(need) : null);
     setActiveTab("rebase");
-  }, [setActiveTab, setSelectedRebaseItemId, visibleRebaseNeeds]);
+    // Keep the URL in sync with the tab switch so deep links / back-button
+    // behaviour match other openRebaseTab migrations (CreatePrModal,
+    // IntegrationTab). The `laneId` drives PRsPage's resolveRouteRebaseSelection
+    // on the receiving side.
+    const search = new URLSearchParams({ tab: "workflows", workflow: "rebase", laneId });
+    navigate({ pathname: "/prs", search: `?${search.toString()}` });
+  }, [navigate, setActiveTab, setSelectedRebaseItemId, visibleRebaseNeeds]);
 
   const handleLandCurrentPr = React.useCallback(async () => {
     if (!selectedGroup) return;