From 21e6a0a2259df2542e31c083ddeb4f53bfd8a995 Mon Sep 17 00:00:00 2001
From: "js@qlax.de" <js@qlax.de>
Date: Mon, 9 Feb 2026 08:41:02 +0000
Subject: [PATCH 1/5] fix(isl): use correct 'remove' subcommand for worktree
 deletion

The WorktreeRemoveOperation used 'sl wt rm' but the actual subcommand
is 'sl wt remove', causing 'abort: you need to specify a subcommand'
when attempting to delete a worktree from the UI.
---
 addons/isl/src/operations/WorktreeRemoveOperation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/isl/src/operations/WorktreeRemoveOperation.ts b/addons/isl/src/operations/WorktreeRemoveOperation.ts
index ab569a74743fb..d8a83f4b67f19 100644
--- a/addons/isl/src/operations/WorktreeRemoveOperation.ts
+++ b/addons/isl/src/operations/WorktreeRemoveOperation.ts
@@ -25,7 +25,7 @@ export class WorktreeRemoveOperation extends Operation {
   }
 
   getArgs() {
-    const args = ['wt', 'rm'];
+    const args = ['wt', 'remove'];
     if (this.force) {
       args.push('--force');
     }

From edefc973c8ab7748b37c86e64dd3b146727ae8b2 Mon Sep 17 00:00:00 2001
From: "js@qlax.de" <js@qlax.de>
Date: Mon, 9 Feb 2026 08:42:05 +0000
Subject: [PATCH 2/5] fix(isl): filter stale worktrees with non-existent
 directories

The worktree dropdown showed deleted worktrees because 'sl wt list'
returns entries even after directories are removed from disk. Added
server-side validation using exists() to filter out stale entries.
---
 addons/isl-server/src/Repository.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/isl-server/src/Repository.ts b/addons/isl-server/src/Repository.ts
index f2f1494ae364e..a3c6bd7cd7508 100644
--- a/addons/isl-server/src/Repository.ts
+++ b/addons/isl-server/src/Repository.ts
@@ -31,11 +31,11 @@ import type {
   SettableConfigName,
   ShelvedChange,
   StableInfo,
-  WorktreeInfo,
   Submodule,
   SubmodulesByRoot,
   UncommittedChanges,
   ValidatedRepoInfo,
+  WorktreeInfo,
 } from 'isl/src/types';
 import type {Comparison} from 'shared/Comparison';
 import type {EjecaChildProcess, EjecaOptions} from 'shared/ejeca';
@@ -1562,13 +1562,14 @@ export class Repository {
   }
 
   public async getWorktrees(ctx: RepositoryContext): Promise<Array<WorktreeInfo>> {
-    const result = await this.runCommand(
-      ['wt', 'list', '--json'],
-      'WorktreeListCommand',
-      ctx,
-    );
+    const result = await this.runCommand(['wt', 'list', '--json'], 'WorktreeListCommand', ctx);
     try {
-      return JSON.parse(result.stdout) as Array<WorktreeInfo>;
+      const worktrees = JSON.parse(result.stdout) as Array<WorktreeInfo>;
+      // Filter out stale worktrees whose directories no longer exist on disk
+      const validated = await Promise.all(
+        worktrees.map(async wt => ({wt, pathExists: await exists(wt.path)})),
+      );
+      return validated.filter(({pathExists}) => pathExists).map(({wt}) => wt);
     } catch (err) {
       ctx.logger.error('Failed to parse worktree list output:', err);
       return [];

From 537946aefd00a5453d547b3821ba713909326735 Mon Sep 17 00:00:00 2001
From: "js@qlax.de" <js@qlax.de>
Date: Mon, 9 Feb 2026 08:43:13 +0000
Subject: [PATCH 3/5] style(isl): improve PR stack layout and avatar
 positioning

- Move stack card avatars closer to title (remove margin-left: auto)
- Push action buttons to far right with margin-left: auto on actions div
- Reduce left/right padding on PR dashboard content for wider cards
- Bump version to v4.2.1
---
 addons/isl/src/Commit.tsx      |   8 +-
 addons/isl/src/PRDashboard.css |  82 ++++++++++-----
 addons/isl/src/PRDashboard.tsx | 175 ++++++++++++++++++---------------
 3 files changed, 158 insertions(+), 107 deletions(-)

diff --git a/addons/isl/src/Commit.tsx b/addons/isl/src/Commit.tsx
index 81240ad9fc693..4b7a0366f5773 100644
--- a/addons/isl/src/Commit.tsx
+++ b/addons/isl/src/Commit.tsx
@@ -26,8 +26,8 @@ import {MS_PER_DAY} from 'shared/constants';
 import {useAutofocusRef} from 'shared/hooks';
 import {notEmpty, nullthrows} from 'shared/utils';
 import {spacing} from '../../components/theme/tokens.stylex';
-import {AllBookmarksTruncated, Bookmark, Bookmarks, createBookmarkAtCommit} from './Bookmark';
 import {CommitAvatar} from './Avatar';
+import {AllBookmarksTruncated, Bookmark, Bookmarks, createBookmarkAtCommit} from './Bookmark';
 import {openBrowseUrlForHash, supportsBrowseUrlForHash} from './BrowseRepo';
 import {hasUnsavedEditedCommitMessage} from './CommitInfoView/CommitInfoState';
 import {showComparison} from './ComparisonView/atoms';
@@ -41,6 +41,7 @@ import {SubmitSingleCommitButton} from './SubmitSingleCommitButton';
 import {getSuggestedRebaseOperation, suggestedRebaseDestinations} from './SuggestedRebase';
 import {UncommitButton} from './UncommitButton';
 import {UncommittedChanges} from './UncommittedChanges';
+import {WorktreeIndicator} from './WorktreeIndicator';
 import {tracker} from './analytics';
 import {clipboardLinkHtml} from './clipboard';
 import {
@@ -50,13 +51,13 @@ import {
   diffSummary,
   latestCommitMessageTitle,
 } from './codeReview/CodeReviewInfo';
+import {DiffBadge, DiffFollower, DiffInfo} from './codeReview/DiffBadge';
 import {
-  showOnlyMyStacksAtom,
   hideBotStacksAtom,
   hideMergedStacksAtom,
   isBotAuthor,
+  showOnlyMyStacksAtom,
 } from './codeReview/PRStacksAtom';
-import {DiffBadge, DiffFollower, DiffInfo} from './codeReview/DiffBadge';
 import {SyncStatus, syncStatusAtom} from './codeReview/syncStatus';
 import {useFeatureFlagSync} from './featureFlags';
 import {FoldButton, useRunFoldPreview} from './fold';
@@ -97,7 +98,6 @@ import {latestSuccessorUnlessExplicitlyObsolete} from './successionUtils';
 import {copyAndShowToast} from './toast';
 import {showModal} from './useModal';
 import {short} from './utils';
-import {WorktreeIndicator} from './WorktreeIndicator';
 
 export const rebaseOffWarmWarningEnabled = localStorageBackedAtom<boolean>(
   'isl.rebase-off-warm-warning-enabled',
diff --git a/addons/isl/src/PRDashboard.css b/addons/isl/src/PRDashboard.css
index fb20e5da60c55..2ecbdb12cbe9c 100644
--- a/addons/isl/src/PRDashboard.css
+++ b/addons/isl/src/PRDashboard.css
@@ -110,9 +110,9 @@
 
 .pr-dashboard-content {
   padding: var(--pad);
-  /* Account for negative margins on parent */
-  padding-left: calc(var(--pad) + 16px);
-  padding-right: calc(var(--pad) + 16px);
+  /* Account for negative margins on parent, keep padding tight for more card width */
+  padding-left: calc(var(--halfpad) + 16px);
+  padding-right: calc(var(--halfpad) + 16px);
 }
 
 .pr-dashboard-empty {
@@ -162,12 +162,12 @@
 }
 
 .stack-card-title {
-  flex: 1;
   font-weight: 500;
   cursor: pointer;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  min-width: 0;
 }
 
 .stack-card-pull-button {
@@ -305,8 +305,7 @@
 .stack-card-author {
   display: flex;
   align-items: center;
-  margin-left: auto;
-  margin-right: var(--halfpad);
+  margin-left: 4px;
 }
 
 .stack-card-avatar {
@@ -320,6 +319,7 @@
   display: flex;
   align-items: center;
   gap: 2px;
+  margin-left: auto;
 }
 
 /* Label editor */
@@ -605,26 +605,60 @@
 }
 
 /* Stagger animation delays for visual interest */
-.stack-card-skeleton:nth-child(1) { animation-delay: 0s; }
-.stack-card-skeleton:nth-child(2) { animation-delay: 0.1s; }
-.stack-card-skeleton:nth-child(3) { animation-delay: 0.2s; }
-.stack-card-skeleton:nth-child(4) { animation-delay: 0.3s; }
-.stack-card-skeleton:nth-child(5) { animation-delay: 0.4s; }
-.stack-card-skeleton:nth-child(6) { animation-delay: 0.5s; }
-.stack-card-skeleton:nth-child(7) { animation-delay: 0.6s; }
-.stack-card-skeleton:nth-child(8) { animation-delay: 0.7s; }
+.stack-card-skeleton:nth-child(1) {
+  animation-delay: 0s;
+}
+.stack-card-skeleton:nth-child(2) {
+  animation-delay: 0.1s;
+}
+.stack-card-skeleton:nth-child(3) {
+  animation-delay: 0.2s;
+}
+.stack-card-skeleton:nth-child(4) {
+  animation-delay: 0.3s;
+}
+.stack-card-skeleton:nth-child(5) {
+  animation-delay: 0.4s;
+}
+.stack-card-skeleton:nth-child(6) {
+  animation-delay: 0.5s;
+}
+.stack-card-skeleton:nth-child(7) {
+  animation-delay: 0.6s;
+}
+.stack-card-skeleton:nth-child(8) {
+  animation-delay: 0.7s;
+}
 
 /* Stagger skeleton boxes within each card */
-.stack-card-skeleton .skeleton-box:nth-child(1) { animation-delay: 0s; }
-.stack-card-skeleton .skeleton-box:nth-child(2) { animation-delay: 0.05s; }
-.stack-card-skeleton .skeleton-box:nth-child(3) { animation-delay: 0.1s; }
-.stack-card-skeleton .skeleton-box:nth-child(4) { animation-delay: 0.15s; }
-
-.pr-row-skeleton:nth-child(1) .skeleton-box { animation-delay: 0.1s; }
-.pr-row-skeleton:nth-child(2) .skeleton-box { animation-delay: 0.15s; }
-.pr-row-skeleton:nth-child(3) .skeleton-box { animation-delay: 0.2s; }
-.pr-row-skeleton:nth-child(4) .skeleton-box { animation-delay: 0.25s; }
-.pr-row-skeleton:nth-child(5) .skeleton-box { animation-delay: 0.3s; }
+.stack-card-skeleton .skeleton-box:nth-child(1) {
+  animation-delay: 0s;
+}
+.stack-card-skeleton .skeleton-box:nth-child(2) {
+  animation-delay: 0.05s;
+}
+.stack-card-skeleton .skeleton-box:nth-child(3) {
+  animation-delay: 0.1s;
+}
+.stack-card-skeleton .skeleton-box:nth-child(4) {
+  animation-delay: 0.15s;
+}
+
+.pr-row-skeleton:nth-child(1) .skeleton-box {
+  animation-delay: 0.1s;
+}
+.pr-row-skeleton:nth-child(2) .skeleton-box {
+  animation-delay: 0.15s;
+}
+.pr-row-skeleton:nth-child(3) .skeleton-box {
+  animation-delay: 0.2s;
+}
+.pr-row-skeleton:nth-child(4) .skeleton-box {
+  animation-delay: 0.25s;
+}
+.pr-row-skeleton:nth-child(5) .skeleton-box {
+  animation-delay: 0.3s;
+}
 
 /* Time Range Dropdown */
 .time-range-wrapper {
diff --git a/addons/isl/src/PRDashboard.tsx b/addons/isl/src/PRDashboard.tsx
index aef76c237f6de..9b1678db89559 100644
--- a/addons/isl/src/PRDashboard.tsx
+++ b/addons/isl/src/PRDashboard.tsx
@@ -9,41 +9,43 @@ import type {PRStack} from './codeReview/PRStacksAtom';
 import type {DiffSummary, TimeRangeDays} from './types';
 
 import {Button} from 'isl-components/Button';
-import {Dropdown} from 'isl-components/Dropdown';
 import {Icon} from 'isl-components/Icon';
 import {TextField} from 'isl-components/TextField';
 import {Tooltip} from 'isl-components/Tooltip';
 import {useAtom, useAtomValue} from 'jotai';
-import {useState, useCallback, useEffect, useRef} from 'react';
+import {useCallback, useEffect, useRef, useState} from 'react';
 import {ComparisonType} from 'shared/Comparison';
 import serverAPI from './ClientToServerAPI';
-import {showComparison} from './ComparisonView/atoms';
-import {enterReviewMode} from './reviewMode';
-import {currentGitHubUser, allDiffSummaries, triggerFullDiffSummariesRefresh} from './codeReview/CodeReviewInfo';
 import {
-  prStacksAtom,
-  stackLabelsAtom,
+  allDiffSummaries,
+  currentGitHubUser,
+  triggerFullDiffSummariesRefresh,
+} from './codeReview/CodeReviewInfo';
+import {
   hiddenStacksAtom,
-  hideMergedStacksAtom,
-  showOnlyMyStacksAtom,
   hideBotStacksAtom,
+  hideMergedStacksAtom,
   isBotAuthor,
+  prStacksAtom,
+  showOnlyMyStacksAtom,
+  stackLabelsAtom,
 } from './codeReview/PRStacksAtom';
-import {T} from './i18n';
 import {scrollToCommit} from './CommitTreeList';
+import {showComparison} from './ComparisonView/atoms';
+import {T, t} from './i18n';
 import {writeAtom} from './jotaiUtils';
-import {inlineProgressByHash, useRunOperation} from './operationsState';
-import {PullOperation} from './operations/PullOperation';
-import {GotoOperation} from './operations/GotoOperation';
 import {ClosePROperation} from './operations/ClosePROperation';
+import {GotoOperation} from './operations/GotoOperation';
+import {PullOperation} from './operations/PullOperation';
 import {WorktreeAddOperation} from './operations/WorktreeAddOperation';
-import {worktreesForCommit} from './worktrees';
-import {showToast} from './toast';
-import {t} from './i18n';
+import {inlineProgressByHash, useRunOperation} from './operationsState';
 import {dagWithPreviews} from './previews';
+import {enterReviewMode} from './reviewMode';
 import {selectedCommits} from './selection';
 import {selectedTimeRangeAtom, setTimeRange} from './serverAPIState';
+import {showToast} from './toast';
 import {succeedableRevset} from './types';
+import {worktreesForCommit} from './worktrees';
 
 import './PRDashboard.css';
 
@@ -135,9 +137,14 @@ function MainBranchSection({}: {isScrolled?: boolean}) {
 
   // Find main/master bookmark in the dag
   const mainCommit = dag.resolve('main') ?? dag.resolve('master');
-  const remoteName = mainCommit?.remoteBookmarks.find(b =>
-    b === 'origin/main' || b === 'origin/master' || b === 'remote/main' || b === 'remote/master'
-  ) ?? 'main';
+  const remoteName =
+    mainCommit?.remoteBookmarks.find(
+      b =>
+        b === 'origin/main' ||
+        b === 'origin/master' ||
+        b === 'remote/main' ||
+        b === 'remote/master',
+    ) ?? 'main';
 
   // Check if we're currently on main
   const currentCommit = dag.resolve('.');
@@ -161,11 +168,7 @@ function MainBranchSection({}: {isScrolled?: boolean}) {
     runOperation(new GotoOperation(succeedableRevset(remoteName)));
   }, [isOnMain, isBehind, runOperation, remoteName]);
 
-  const syncStatusText = isBehind
-    ? 'Updates available'
-    : isOnMain
-      ? 'You are here'
-      : 'Up to date';
+  const syncStatusText = isBehind ? 'Updates available' : isOnMain ? 'You are here' : 'Up to date';
 
   const statusClass = isBehind
     ? 'main-branch-status main-branch-status-behind'
@@ -182,13 +185,8 @@ function MainBranchSection({}: {isScrolled?: boolean}) {
         <Button
           className="main-branch-goto-button"
           onClick={handleGoToMain}
-          disabled={isOnMain && !isBehind || inlineProgress != null}
-        >
-          {inlineProgress ? (
-            <Icon icon="loading" />
-          ) : (
-            <Icon icon="arrow-down" />
-          )}
+          disabled={(isOnMain && !isBehind) || inlineProgress != null}>
+          {inlineProgress ? <Icon icon="loading" /> : <Icon icon="arrow-down" />}
           <T>Go to main</T>
         </Button>
       </Tooltip>
@@ -219,7 +217,9 @@ function TimeRangeDropdown() {
         value={selectedRange === undefined ? 'undefined' : String(selectedRange)}
         onChange={handleChange}>
         {TIME_RANGE_OPTIONS.map(opt => (
-          <option key={opt.value ?? 'undefined'} value={opt.value === undefined ? 'undefined' : String(opt.value)}>
+          <option
+            key={opt.value ?? 'undefined'}
+            value={opt.value === undefined ? 'undefined' : String(opt.value)}>
             {opt.label}
           </option>
         ))}
@@ -284,9 +284,7 @@ export function PRDashboard() {
         return true;
       });
 
-  const hiddenCount = stacks.filter(stack =>
-    hiddenStacks.includes(stack.id),
-  ).length;
+  const hiddenCount = stacks.filter(stack => hiddenStacks.includes(stack.id)).length;
 
   const mergedCount = stacks.filter(stack => stack.isMerged).length;
 
@@ -302,24 +300,32 @@ export function PRDashboard() {
       <div className="pr-dashboard-sticky-header">
         <div className="pr-dashboard-header">
           <span className="pr-dashboard-title">
-            <T>PR Stacks</T> <span style={{fontSize: '10px', opacity: 0.5}}>(v4.2)</span>
+            <T>PR Stacks</T> <span style={{fontSize: '10px', opacity: 0.5}}>(v4.2.1)</span>
           </span>
           <div className="pr-dashboard-header-buttons">
             <TimeRangeDropdown />
             {currentUser && (
               <Tooltip
-                title={showOnlyMine ? `Show all authors (${otherAuthorsCount} hidden)` : 'Show only my stacks'}>
+                title={
+                  showOnlyMine
+                    ? `Show all authors (${otherAuthorsCount} hidden)`
+                    : 'Show only my stacks'
+                }>
                 <Button
                   icon
                   onClick={() => setShowOnlyMine(prev => !prev)}
                   className={showOnlyMine ? 'author-filter-active' : 'author-filter-inactive'}>
                   <Icon icon="account" />
-                  {showOnlyMine && otherAuthorsCount > 0 && <span className="hidden-count">{otherAuthorsCount}</span>}
+                  {showOnlyMine && otherAuthorsCount > 0 && (
+                    <span className="hidden-count">{otherAuthorsCount}</span>
+                  )}
                 </Button>
               </Tooltip>
             )}
             <Tooltip
-              title={hideBots ? `Show ${botCount} bot PRs` : 'Hide bot PRs (renovate, dependabot, etc)'}>
+              title={
+                hideBots ? `Show ${botCount} bot PRs` : 'Hide bot PRs (renovate, dependabot, etc)'
+              }>
               <Button
                 icon
                 onClick={() => setHideBots(prev => !prev)}
@@ -328,8 +334,7 @@ export function PRDashboard() {
                 {hideBots && botCount > 0 && <span className="hidden-count">{botCount}</span>}
               </Button>
             </Tooltip>
-            <Tooltip
-              title={hideMerged ? `Show ${mergedCount} merged` : 'Hide merged stacks'}>
+            <Tooltip title={hideMerged ? `Show ${mergedCount} merged` : 'Hide merged stacks'}>
               <Button
                 icon
                 onClick={() => setHideMerged(prev => !prev)}
@@ -339,8 +344,7 @@ export function PRDashboard() {
               </Button>
             </Tooltip>
             {hiddenCount > 0 && (
-              <Tooltip
-                title={showHidden ? 'Hide hidden stacks' : 'Show hidden stacks'}>
+              <Tooltip title={showHidden ? 'Hide hidden stacks' : 'Show hidden stacks'}>
                 <Button icon onClick={() => setShowHidden(prev => !prev)}>
                   <Icon icon={showHidden ? 'eye' : 'eye-closed'} />
                   <span className="hidden-count">{hiddenCount}</span>
@@ -403,7 +407,8 @@ function StackCard({
 
   const customLabel = stackLabels[stack.id];
   // Check if this stack is from an external author (someone other than the current user)
-  const isExternal = currentUser != null && stack.mainAuthor != null && stack.mainAuthor !== currentUser;
+  const isExternal =
+    currentUser != null && stack.mainAuthor != null && stack.mainAuthor !== currentUser;
 
   // Get the top PR's head hash for checkout
   const topHeadHash = stack.prs[0]?.type === 'github' ? stack.prs[0].head : undefined;
@@ -428,16 +433,15 @@ function StackCard({
 
     setIsClosingStale(true);
     const mergedPrNumber = stack.mergedAbovePrNumber ?? stack.topPrNumber;
-    showToast(
-      t('Closing $count stale PRs...', {replace: {$count: String(stalePRs.length)}}),
-      {durationMs: 3000}
-    );
+    showToast(t('Closing $count stale PRs...', {replace: {$count: String(stalePRs.length)}}), {
+      durationMs: 3000,
+    });
 
     for (const pr of stalePRs) {
       try {
         const closeOp = new ClosePROperation(
           Number(pr.number),
-          `Closed: changes already merged via PR #${mergedPrNumber}`
+          `Closed: changes already merged via PR #${mergedPrNumber}`,
         );
         await runOperation(closeOp);
       } catch (err) {
@@ -445,7 +449,9 @@ function StackCard({
       }
     }
 
-    showToast(t('Closed $count stale PRs', {replace: {$count: String(stalePRs.length)}}), {durationMs: 3000});
+    showToast(t('Closed $count stale PRs', {replace: {$count: String(stalePRs.length)}}), {
+      durationMs: 3000,
+    });
     setIsClosingStale(false);
 
     // Refresh the PR list after a short delay to let GitHub propagate the changes
@@ -455,16 +461,19 @@ function StackCard({
     }, 1500);
   }, [stalePRs, isClosingStale, stack.mergedAbovePrNumber, stack.topPrNumber, runOperation]);
 
-  const handleStackCheckout = useCallback((e: React.MouseEvent) => {
-    // Don't interfere with child element clicks
-    if ((e.target as HTMLElement).closest('button, input, .stack-card-title')) {
-      return;
-    }
-    if (!topHeadHash || isCurrentStack) {
-      return;
-    }
-    runOperation(new GotoOperation(succeedableRevset(topHeadHash)));
-  }, [topHeadHash, isCurrentStack, runOperation]);
+  const handleStackCheckout = useCallback(
+    (e: React.MouseEvent) => {
+      // Don't interfere with child element clicks
+      if ((e.target as HTMLElement).closest('button, input, .stack-card-title')) {
+        return;
+      }
+      if (!topHeadHash || isCurrentStack) {
+        return;
+      }
+      runOperation(new GotoOperation(succeedableRevset(topHeadHash)));
+    },
+    [topHeadHash, isCurrentStack, runOperation],
+  );
 
   const toggleExpanded = () => {
     setIsExpanded(prev => !prev);
@@ -498,12 +507,16 @@ function StackCard({
     isCurrentStack ? 'stack-card-current' : '',
     inlineProgress ? 'stack-card-loading' : '',
     stack.isMerged ? 'stack-card-merged' : '',
-  ].filter(Boolean).join(' ');
+  ]
+    .filter(Boolean)
+    .join(' ');
 
   const headerClass = [
     'stack-card-header',
     topHeadHash && !isCurrentStack ? 'stack-card-header-clickable' : '',
-  ].filter(Boolean).join(' ');
+  ]
+    .filter(Boolean)
+    .join(' ');
 
   return (
     <div className={stackCardClass}>
@@ -556,8 +569,9 @@ function StackCard({
         )}
 
         <div className="stack-card-actions">
-          {isExternal && topHeadHash && (
-            existingWorktree ? (
+          {isExternal &&
+            topHeadHash &&
+            (existingWorktree ? (
               <Tooltip title="Switch ISL to the existing worktree for this stack">
                 <Button
                   className="stack-card-worktree-button"
@@ -585,8 +599,7 @@ function StackCard({
                   <T>Open in Worktree</T>
                 </Button>
               </Tooltip>
-            )
-          )}
+            ))}
           {hasStaleStack && (
             <Tooltip
               title={`Close ${stalePRs.length} stale PR${stalePRs.length > 1 ? 's' : ''} — these PRs are still open but their changes were already merged via PR #${stack.mergedAbovePrNumber ?? '?'} on GitHub. This happens when merging directly on GitHub instead of through ISL.`}>
@@ -594,11 +607,7 @@ function StackCard({
                 className="stack-card-close-stale-button"
                 onClick={handleCloseStalePRs}
                 disabled={isClosingStale}>
-                {isClosingStale ? (
-                  <Icon icon="loading" />
-                ) : (
-                  <Icon icon="trash" />
-                )}
+                {isClosingStale ? <Icon icon="loading" /> : <Icon icon="trash" />}
                 <span>Close {stalePRs.length} stale</span>
               </Button>
             </Tooltip>
@@ -686,22 +695,30 @@ function PRRow({pr}: {pr: DiffSummary}) {
     }
   };
 
-  const handleReview = useCallback((e: React.MouseEvent) => {
-    e.stopPropagation();
-    if (headHash) {
-      enterReviewMode(pr.number, headHash);
-    }
-  }, [pr.number, headHash]);
+  const handleReview = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      if (headHash) {
+        enterReviewMode(pr.number, headHash);
+      }
+    },
+    [pr.number, headHash],
+  );
 
   const prRowClass = [
     'pr-row',
     headHash && !isCurrentCommit ? 'pr-row-clickable' : '',
     isCurrentCommit ? 'pr-row-current' : '',
     inlineProgress ? 'pr-row-loading' : '',
-  ].filter(Boolean).join(' ');
+  ]
+    .filter(Boolean)
+    .join(' ');
 
   return (
-    <div className={prRowClass} onClick={handleCheckout} id={headHash ? `pr-${headHash}` : undefined}>
+    <div
+      className={prRowClass}
+      onClick={handleCheckout}
+      id={headHash ? `pr-${headHash}` : undefined}>
       {inlineProgress ? (
         <Icon icon="loading" className="pr-row-status" />
       ) : (

From c764da7a2778546722ab964ea7ade566bfd4105a Mon Sep 17 00:00:00 2001
From: "js@qlax.de" <js@qlax.de>
Date: Mon, 9 Feb 2026 09:04:06 +0000
Subject: [PATCH 4/5] feat(isl): show GitHub avatars for commits linked to PRs

Add gitAuthorAvatarCache atom that cross-references diff summaries
(PR data with GitHub avatar URLs) with the commit DAG to build a
mapping from git author strings to avatar URLs. CommitAvatar now
uses this shared cache, so all commits by known PR authors show
their GitHub profile picture instead of colored initials.
---
 addons/isl/src/Avatar.tsx         | 52 ++++++++++++++++-
 addons/isl/src/CommitTreeList.css | 94 +++++++++++++++++++++++--------
 2 files changed, 121 insertions(+), 25 deletions(-)

diff --git a/addons/isl/src/Avatar.tsx b/addons/isl/src/Avatar.tsx
index 5459c68b00552..699ac32911910 100644
--- a/addons/isl/src/Avatar.tsx
+++ b/addons/isl/src/Avatar.tsx
@@ -8,11 +8,13 @@
 import type {DetailedHTMLProps} from 'react';
 
 import * as stylex from '@stylexjs/stylex';
-import {useAtomValue} from 'jotai';
+import {atom, useAtomValue} from 'jotai';
 import {colors, radius} from '../../components/theme/tokens.stylex';
 import serverAPI from './ClientToServerAPI';
+import {allDiffSummaries} from './codeReview/CodeReviewInfo';
 import {t} from './i18n';
 import {atomFamilyWeak, lazyAtom} from './jotaiUtils';
+import {dagWithPreviews} from './previews';
 
 export const avatarUrl = atomFamilyWeak((author: string) => {
   // Rate limitor for the same author is by lazyAtom and atomFamilyWeak caching.
@@ -28,6 +30,34 @@ export const avatarUrl = atomFamilyWeak((author: string) => {
   }, undefined);
 });
 
+/**
+ * Shared cache mapping git author strings to GitHub avatar URLs.
+ * Built by cross-referencing diff summaries (PR data with avatar URLs)
+ * with the commit DAG (which maps hashes to git author strings).
+ */
+export const gitAuthorAvatarCache = atom(get => {
+  const summariesResult = get(allDiffSummaries);
+  const dag = get(dagWithPreviews);
+  const cache = new Map<string, string>();
+
+  if (!summariesResult?.value) {
+    return cache;
+  }
+
+  for (const summary of summariesResult.value.values()) {
+    if (summary.type !== 'github' || !summary.authorAvatarUrl) {
+      continue;
+    }
+    // Match the PR's head commit hash to a DAG commit to get the git author string
+    const commit = dag.get(summary.head);
+    if (commit?.author) {
+      cache.set(commit.author, summary.authorAvatarUrl);
+    }
+  }
+
+  return cache;
+});
+
 export function AvatarImg({
   url,
   username,
@@ -162,8 +192,24 @@ export function InitialsAvatar({username, size = 20}: {username: string; size?:
   );
 }
 
+export function SkeletonAvatar({size = 20}: {size?: number}) {
+  return (
+    <div
+      className="avatar-skeleton"
+      style={{
+        width: size,
+        height: size,
+        borderRadius: '50%',
+        flexShrink: 0,
+      }}
+    />
+  );
+}
+
 export function CommitAvatar({username, size = 20}: {username: string; size?: number}) {
-  const url = useAtomValue(avatarUrl(username));
+  const fetchedUrl = useAtomValue(avatarUrl(username));
+  const cachedAvatars = useAtomValue(gitAuthorAvatarCache);
+  const url = fetchedUrl ?? cachedAvatars.get(username);
 
   if (url) {
     return (
@@ -177,5 +223,5 @@ export function CommitAvatar({username, size = 20}: {username: string; size?: nu
     );
   }
 
-  return <InitialsAvatar username={username} size={size} />;
+  return <SkeletonAvatar size={size} />;
 }
diff --git a/addons/isl/src/CommitTreeList.css b/addons/isl/src/CommitTreeList.css
index 5583f92e7535e..9cf1a5a40a266 100644
--- a/addons/isl/src/CommitTreeList.css
+++ b/addons/isl/src/CommitTreeList.css
@@ -117,7 +117,7 @@
   /* Gradient highlight from left to transparent - visible, extends across most of the row */
   background: linear-gradient(
     90deg,
-    rgba(74, 144, 226, 0.20) 0%,
+    rgba(74, 144, 226, 0.2) 0%,
     rgba(74, 144, 226, 0.14) 20%,
     rgba(74, 144, 226, 0.08) 45%,
     rgba(74, 144, 226, 0.03) 70%,
@@ -350,11 +350,7 @@
 
 .commit.origin-main-commit .commit-details {
   /* Very subtle background tint */
-  background: linear-gradient(
-    90deg,
-    rgba(74, 144, 226, 0.08) 0%,
-    transparent 50%
-  );
+  background: linear-gradient(90deg, rgba(74, 144, 226, 0.08) 0%, transparent 50%);
 }
 
 .origin-main-badge {
@@ -392,18 +388,52 @@
   flex-shrink: 0;
 }
 
+/* Skeleton avatar placeholder (loading state) */
+.avatar-skeleton {
+  background: linear-gradient(
+    90deg,
+    var(--subtle-hover-darken) 0%,
+    color-mix(in srgb, var(--foreground) 12%, var(--subtle-hover-darken)) 50%,
+    var(--subtle-hover-darken) 100%
+  );
+  background-size: 200% 100%;
+  animation: avatar-skeleton-pulse 1.5s ease-in-out infinite;
+}
+
+@keyframes avatar-skeleton-pulse {
+  0% {
+    opacity: 0.3;
+  }
+  50% {
+    opacity: 0.6;
+  }
+  100% {
+    opacity: 0.3;
+  }
+}
+
 /* ===== COMMIT TREE LOADING ===== */
 
 /* Pulsing animation */
 @keyframes skeleton-pulse {
-  0% { opacity: 0.4; }
-  50% { opacity: 0.7; }
-  100% { opacity: 0.4; }
+  0% {
+    opacity: 0.4;
+  }
+  50% {
+    opacity: 0.7;
+  }
+  100% {
+    opacity: 0.4;
+  }
 }
 
 @keyframes spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
 }
 
 /* Loading container */
@@ -459,17 +489,37 @@
 }
 
 /* Stagger animation delays */
-.top-bar-skeleton-left .skeleton-box:nth-child(1) { animation-delay: 0s; }
-.top-bar-skeleton-left .skeleton-box:nth-child(2) { animation-delay: 0.1s; }
-.top-bar-skeleton-left .skeleton-box:nth-child(3) { animation-delay: 0.2s; }
-.top-bar-skeleton-left .skeleton-box:nth-child(4) { animation-delay: 0.3s; }
-.top-bar-skeleton-left .skeleton-box:nth-child(5) { animation-delay: 0.4s; }
-
-.top-bar-skeleton-right .skeleton-box:nth-child(1) { animation-delay: 0.15s; }
-.top-bar-skeleton-right .skeleton-box:nth-child(2) { animation-delay: 0.25s; }
-.top-bar-skeleton-right .skeleton-box:nth-child(3) { animation-delay: 0.35s; }
-.top-bar-skeleton-right .skeleton-box:nth-child(4) { animation-delay: 0.45s; }
-.top-bar-skeleton-right .skeleton-box:nth-child(5) { animation-delay: 0.55s; }
+.top-bar-skeleton-left .skeleton-box:nth-child(1) {
+  animation-delay: 0s;
+}
+.top-bar-skeleton-left .skeleton-box:nth-child(2) {
+  animation-delay: 0.1s;
+}
+.top-bar-skeleton-left .skeleton-box:nth-child(3) {
+  animation-delay: 0.2s;
+}
+.top-bar-skeleton-left .skeleton-box:nth-child(4) {
+  animation-delay: 0.3s;
+}
+.top-bar-skeleton-left .skeleton-box:nth-child(5) {
+  animation-delay: 0.4s;
+}
+
+.top-bar-skeleton-right .skeleton-box:nth-child(1) {
+  animation-delay: 0.15s;
+}
+.top-bar-skeleton-right .skeleton-box:nth-child(2) {
+  animation-delay: 0.25s;
+}
+.top-bar-skeleton-right .skeleton-box:nth-child(3) {
+  animation-delay: 0.35s;
+}
+.top-bar-skeleton-right .skeleton-box:nth-child(4) {
+  animation-delay: 0.45s;
+}
+.top-bar-skeleton-right .skeleton-box:nth-child(5) {
+  animation-delay: 0.55s;
+}
 
 /* Loading spinner area */
 .commit-tree-loading-spinner {

From 61bd555a58158f043d6a0b4ba8e90ec9227100ea Mon Sep 17 00:00:00 2001
From: "js@qlax.de" <js@qlax.de>
Date: Mon, 9 Feb 2026 13:23:55 +0000
Subject: [PATCH 5/5] feat(isl): add PR review status indicators with legend
 tooltip

Show review decision (approved, changes requested, review required) on PR
row status circles. Each state gets a distinct icon and color. Hovering
reveals an interactive legend showing all possible statuses.
---
 addons/isl/src/PRDashboard.css |  79 +++++++++++++++++++++++
 addons/isl/src/PRDashboard.tsx | 113 ++++++++++++++++++++++++++++++---
 2 files changed, 184 insertions(+), 8 deletions(-)

diff --git a/addons/isl/src/PRDashboard.css b/addons/isl/src/PRDashboard.css
index 2ecbdb12cbe9c..e6ab663352e32 100644
--- a/addons/isl/src/PRDashboard.css
+++ b/addons/isl/src/PRDashboard.css
@@ -258,6 +258,18 @@
   color: var(--signal-good);
 }
 
+.pr-state-approved {
+  color: var(--signal-good);
+}
+
+.pr-state-changes-requested {
+  color: #f59e0b;
+}
+
+.pr-state-review-required {
+  color: var(--signal-warning);
+}
+
 .pr-state-merged {
   color: var(--scm-modified-foreground);
 }
@@ -274,6 +286,73 @@
   color: var(--signal-warning);
 }
 
+/* ===== PR STATUS LEGEND TOOLTIP ===== */
+
+.pr-status-legend {
+  min-width: 160px;
+  font-size: 12px;
+  line-height: 1;
+}
+
+.pr-status-legend-current {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 6px 8px;
+  border-radius: 4px;
+  background: rgba(255, 255, 255, 0.06);
+}
+
+.pr-status-legend-current-label {
+  font-weight: 600;
+  color: var(--foreground);
+  letter-spacing: 0.01em;
+}
+
+.pr-status-legend-divider {
+  height: 1px;
+  background: rgba(255, 255, 255, 0.08);
+  margin: 6px 0;
+}
+
+.pr-status-legend-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 2px 12px;
+}
+
+.pr-status-legend-item {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 3px 6px;
+  border-radius: 3px;
+  opacity: 0.5;
+  transition: opacity 0.1s;
+}
+
+.pr-status-legend-item:hover {
+  opacity: 0.8;
+}
+
+.pr-status-legend-item-active {
+  opacity: 1;
+  background: rgba(255, 255, 255, 0.05);
+}
+
+.pr-status-legend-icon {
+  font-size: 11px;
+  width: 14px;
+  text-align: center;
+  flex-shrink: 0;
+}
+
+.pr-status-legend-label {
+  color: var(--foreground);
+  white-space: nowrap;
+  font-size: 11px;
+}
+
 /* Header buttons */
 .pr-dashboard-header-buttons {
   display: flex;
diff --git a/addons/isl/src/PRDashboard.tsx b/addons/isl/src/PRDashboard.tsx
index 9b1678db89559..c55571a4e028d 100644
--- a/addons/isl/src/PRDashboard.tsx
+++ b/addons/isl/src/PRDashboard.tsx
@@ -663,8 +663,9 @@ function LabelEditor({
 }
 
 function PRRow({pr}: {pr: DiffSummary}) {
-  const stateIcon = getPRStateIcon(pr.state);
-  const stateClass = getPRStateClass(pr.state);
+  const reviewDecision = pr.type === 'github' ? pr.reviewDecision : undefined;
+  const stateIcon = getPRStateIcon(pr.state, reviewDecision);
+  const stateClass = getPRStateClass(pr.state, reviewDecision);
   const headHash = pr.type === 'github' ? pr.head : undefined;
   const isMerged = pr.state === 'MERGED';
 
@@ -722,7 +723,15 @@ function PRRow({pr}: {pr: DiffSummary}) {
       {inlineProgress ? (
         <Icon icon="loading" className="pr-row-status" />
       ) : (
-        <span className={`pr-row-status ${stateClass}`}>{stateIcon}</span>
+        <Tooltip
+          component={() => (
+            <PRStatusLegend currentState={pr.state} currentReviewDecision={reviewDecision} />
+          )}
+          interactive
+          delayMs={400}
+          placement="right">
+          <span className={`pr-row-status ${stateClass}`}>{stateIcon}</span>
+        </Tooltip>
       )}
       <a
         className="pr-row-number"
@@ -759,23 +768,32 @@ function PRRow({pr}: {pr: DiffSummary}) {
   );
 }
 
-function getPRStateIcon(state: DiffSummary['state']): string {
+function getPRStateIcon(state: DiffSummary['state'], reviewDecision?: string): string {
   switch (state) {
     case 'MERGED':
       return '✓';
     case 'CLOSED':
       return '✕';
     case 'DRAFT':
-      return '○';
+      return '✎';
     case 'MERGE_QUEUED':
       return '◐';
     case 'OPEN':
     default:
-      return '●';
+      switch (reviewDecision) {
+        case 'APPROVED':
+          return '✓';
+        case 'CHANGES_REQUESTED':
+          return '↻';
+        case 'REVIEW_REQUIRED':
+          return '◑';
+        default:
+          return '●';
+      }
   }
 }
 
-function getPRStateClass(state: DiffSummary['state']): string {
+function getPRStateClass(state: DiffSummary['state'], reviewDecision?: string): string {
   switch (state) {
     case 'MERGED':
       return 'pr-state-merged';
@@ -787,6 +805,85 @@ function getPRStateClass(state: DiffSummary['state']): string {
       return 'pr-state-queued';
     case 'OPEN':
     default:
-      return 'pr-state-open';
+      switch (reviewDecision) {
+        case 'APPROVED':
+          return 'pr-state-approved';
+        case 'CHANGES_REQUESTED':
+          return 'pr-state-changes-requested';
+        case 'REVIEW_REQUIRED':
+          return 'pr-state-review-required';
+        default:
+          return 'pr-state-open';
+      }
   }
 }
+
+const PR_STATUS_LEGEND = [
+  {icon: '●', label: 'Open', cssClass: 'pr-state-open', state: 'OPEN', review: undefined},
+  {icon: '✓', label: 'Approved', cssClass: 'pr-state-approved', state: 'OPEN', review: 'APPROVED'},
+  {
+    icon: '↻',
+    label: 'Changes requested',
+    cssClass: 'pr-state-changes-requested',
+    state: 'OPEN',
+    review: 'CHANGES_REQUESTED',
+  },
+  {
+    icon: '◑',
+    label: 'Review required',
+    cssClass: 'pr-state-review-required',
+    state: 'OPEN',
+    review: 'REVIEW_REQUIRED',
+  },
+  {icon: '✎', label: 'Draft', cssClass: 'pr-state-draft', state: 'DRAFT', review: undefined},
+  {
+    icon: '◐',
+    label: 'In merge queue',
+    cssClass: 'pr-state-queued',
+    state: 'MERGE_QUEUED',
+    review: undefined,
+  },
+  {icon: '✓', label: 'Merged', cssClass: 'pr-state-merged', state: 'MERGED', review: undefined},
+  {icon: '✕', label: 'Closed', cssClass: 'pr-state-closed', state: 'CLOSED', review: undefined},
+] as const;
+
+function PRStatusLegend({
+  currentState,
+  currentReviewDecision,
+}: {
+  currentState: DiffSummary['state'];
+  currentReviewDecision?: string;
+}) {
+  const currentIcon = getPRStateIcon(currentState, currentReviewDecision);
+  const currentClass = getPRStateClass(currentState, currentReviewDecision);
+  const currentLabel =
+    PR_STATUS_LEGEND.find(
+      s =>
+        s.state === currentState && (currentState !== 'OPEN' || s.review === currentReviewDecision),
+    )?.label ?? 'Open';
+
+  return (
+    <div className="pr-status-legend">
+      <div className="pr-status-legend-current">
+        <span className={`pr-status-legend-icon ${currentClass}`}>{currentIcon}</span>
+        <span className="pr-status-legend-current-label">{currentLabel}</span>
+      </div>
+      <div className="pr-status-legend-divider" />
+      <div className="pr-status-legend-grid">
+        {PR_STATUS_LEGEND.map(entry => {
+          const isCurrent =
+            entry.state === currentState &&
+            (currentState !== 'OPEN' || entry.review === currentReviewDecision);
+          return (
+            <div
+              key={`${entry.state}-${entry.review}`}
+              className={`pr-status-legend-item ${isCurrent ? 'pr-status-legend-item-active' : ''}`}>
+              <span className={`pr-status-legend-icon ${entry.cssClass}`}>{entry.icon}</span>
+              <span className="pr-status-legend-label">{entry.label}</span>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}