@in-the-loop-labs/pair-review 2.6.1 → 2.6.3

package/bin/git-diff-lines

@@ -68,7 +68,7 @@ function executeGitDiff(args, cwd = null) {
     if (cwd) {
       spawnOptions.cwd = cwd;
     }
-    const gitProcess = spawn('git', ['diff', ...args], spawnOptions);
+    const gitProcess = spawn('git', ['diff', '--no-ext-diff', ...args], spawnOptions);
 
     let stdout = '';
     let stderr = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@in-the-loop-labs/pair-review",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "Your AI-powered code review partner - Close the feedback loop with AI coding agents",
   "main": "src/server.js",
   "bin": {

package/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pair-review",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "pair-review app integration — Open PRs and local changes in the pair-review web UI, run server-side AI analysis, and address review feedback. Requires the pair-review MCP server.",
   "author": {
     "name": "in-the-loop-labs",

package/plugin-code-critic/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "code-critic",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "AI-powered code review analysis — Run three-level AI analysis and implement-review-fix loops directly in your coding agent. Works standalone, no server required.",
   "author": {
     "name": "in-the-loop-labs",

package/plugin-code-critic/skills/analyze/scripts/git-diff-lines

@@ -84,7 +84,7 @@ GIT_CMD=(git)
 if [[ -n "$GIT_CWD" ]]; then
   GIT_CMD+=(-C "$GIT_CWD")
 fi
-GIT_CMD+=(diff)
+GIT_CMD+=(diff --no-ext-diff)
 # Guard: expanding an empty array with set -u fails in Bash < 4.4
 if [[ ${#GIT_ARGS[@]} -gt 0 ]]; then
   GIT_CMD+=("${GIT_ARGS[@]}")

package/public/css/pr.css

@@ -99,6 +99,50 @@
   color: var(--color-text-tertiary);
 }
 
+/* Stale Badge */
+.stale-badge {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  padding: 3px 10px;
+  border-radius: 12px;
+  font-size: 11px;
+  font-weight: 700;
+  letter-spacing: 0.5px;
+  color: #fff;
+  background: linear-gradient(135deg, #d97706 0%, #b45309 100%);
+  box-shadow: 0 2px 6px rgba(217, 119, 6, 0.35);
+  transition: opacity 0.15s ease, transform 0.15s ease;
+  white-space: nowrap;
+  margin-left: 8px;
+}
+
+
+.stale-badge.pr-closed {
+  background: linear-gradient(135deg, #cf222e 0%, #a40e26 100%);
+  box-shadow: 0 2px 6px rgba(207, 34, 46, 0.35);
+}
+
+.stale-badge.pr-merged {
+  background: linear-gradient(135deg, #8250df 0%, #6639ba 100%);
+  box-shadow: 0 2px 6px rgba(130, 80, 223, 0.35);
+}
+
+[data-theme="dark"] .stale-badge {
+  background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);
+  box-shadow: 0 2px 8px rgba(245, 158, 11, 0.4);
+}
+
+[data-theme="dark"] .stale-badge.pr-closed {
+  background: linear-gradient(135deg, #f85149 0%, #cf222e 100%);
+  box-shadow: 0 2px 8px rgba(248, 81, 73, 0.4);
+}
+
+[data-theme="dark"] .stale-badge.pr-merged {
+  background: linear-gradient(135deg, #a371f7 0%, #8250df 100%);
+  box-shadow: 0 2px 8px rgba(163, 113, 247, 0.4);
+}
+
 .pr-title .github-link {
   display: inline-flex;
   align-items: center;
@@ -514,7 +558,7 @@
 /* Theme toggle button specific styling */
 #theme-toggle {
   background-color: transparent;
-  border: 1px solid var(--color-border-primary);
+  border: 1px solid transparent;
   color: var(--color-text-primary);
   padding: 6px 10px;
   display: inline-flex;
@@ -524,6 +568,7 @@
 
 #theme-toggle:hover {
   background-color: var(--color-bg-secondary);
+  border-color: var(--color-border-primary);
 }
 
 #theme-toggle svg {
@@ -1542,6 +1587,13 @@
   color: #f85149;
 }
 
+/* When collapsed, the wrapper is only as tall as the header, so the header's
+   sticky positioning can't push it below the toolbar.  Adding scroll-margin
+   ensures scrollIntoView() lands the header below the sticky toolbar. */
+.d2h-file-wrapper.collapsed {
+  scroll-margin-top: var(--toolbar-height, 0px);
+}
+
 /* Hide diff content when collapsed */
 .d2h-file-wrapper.collapsed .d2h-file-body,
 .d2h-file-wrapper.collapsed .d2h-diff-table {
@@ -6078,15 +6130,25 @@ body::before {
   justify-content: center;
 }
 
-/* Icon buttons within the icon group have special styling (no border, transparent bg)
-   This selector is more specific than .header .btn-icon to override properly */
-.header-icon-group .btn-icon {
-  border: none;
+/* Icon buttons within the icon group have special styling (no border, transparent bg).
+   Uses high-specificity selector to override the generic .btn-icon rule (council selector)
+   and the [data-theme="dark"] .btn-icon dark-mode override.
+   NOTE: ID-based selectors (#theme-toggle, #refresh-pr) beat this rule regardless of
+   how many classes are stacked, so those rules must also set border to transparent. */
+[data-theme] .header-icon-group .btn.btn-icon {
+  border: 1px solid transparent;
+  border-color: transparent;
   background: transparent;
+  color: var(--color-text-tertiary);
+  width: 36px;
+  height: 36px;
+  box-sizing: border-box;
 }
 
-.header-icon-group .btn-icon:hover {
+[data-theme] .header-icon-group .btn.btn-icon:hover {
   background: var(--color-bg-tertiary);
+  border-color: var(--color-border-primary);
+  color: var(--color-text-primary);
 }
 
 .header .btn-secondary {
@@ -6111,27 +6173,33 @@ body::before {
   box-shadow: 0 0 12px var(--ai-glow);
 }
 
-/* Theme toggle in header */
+/* Theme toggle in header — border is transparent at rest, visible on hover.
+   Must set border-color explicitly here because this ID selector beats the
+   class-based .header-icon-group .btn.btn-icon:hover rule in specificity. */
 .header #theme-toggle {
   background: transparent;
-  border: 1px solid var(--color-border-primary);
+  border: 1px solid transparent;
   color: var(--color-text-secondary);
 }
 
 .header #theme-toggle:hover {
   background: var(--color-bg-secondary);
+  border-color: var(--color-border-primary);
   color: var(--color-text-primary);
 }
 
-/* Refresh button in header */
+/* Refresh button in header — border is transparent at rest, visible on hover.
+   Must set border-color explicitly here because this ID selector beats the
+   class-based .header-icon-group .btn.btn-icon:hover rule in specificity. */
 .header #refresh-pr {
   background: transparent;
-  border: 1px solid var(--color-border-primary);
+  border: 1px solid transparent;
   color: var(--color-text-secondary);
 }
 
 .header #refresh-pr:hover {
   background: var(--color-bg-secondary);
+  border-color: var(--color-border-primary);
   color: var(--color-text-primary);
 }
 

package/public/index.html

@@ -7,6 +7,13 @@
             const savedTheme = localStorage.getItem('theme') || 'light';
             document.documentElement.setAttribute('data-theme', savedTheme);
         })();
+        window.__pairReview = window.__pairReview || {};
+        window.__pairReview.toGraphiteUrl = function(githubUrl) {
+            return githubUrl.replace(
+                /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)/,
+                'https://app.graphite.com/github/pr/$1/$2/$3'
+            );
+        };
     </script>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

package/public/js/index.js

@@ -313,6 +313,16 @@
         '<svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor"><path d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"/></svg>' +
       '</a>';
 
+    var graphiteLinkHtml = '';
+    if (window.__pairReview?.enableGraphite && pr.html_url) {
+      // Derive from html_url to preserve GitHub's original casing (Graphite URLs are case-sensitive)
+      var graphiteUrl = window.__pairReview.toGraphiteUrl(pr.html_url);
+      graphiteLinkHtml =
+        '<a href="' + escapeHtml(graphiteUrl) + '" target="_blank" rel="noopener" class="btn-github-link" title="Open on Graphite">' +
+          '<svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor"><path d="M9.7932,1.3079L3.101,3.101l-1.7932,6.6921,4.899,4.899,6.6921-1.7931,1.7932-6.6921L9.7932,1.3079Zm1.0936,11.6921H5.1133l-2.8867-5L5.1133,3h5.7735l2.8867,5-2.8867,5Z"/><polygon points="11.3504 4.6496 6.7737 3.4232 3.4232 6.7737 4.6496 11.3504 9.2263 12.5768 12.5768 9.2263 11.3504 4.6496"/></svg>' +
+        '</a>';
+    }
+
     var authorTd = collection === 'my-prs'
       ? ''
       : '<td class="col-author">' + authorDisplay + '</td>';
@@ -324,7 +334,7 @@
         '<td class="col-title" title="' + escapeHtml(pr.title || '') + '">' + escapeHtml(pr.title || '') + '</td>' +
         authorTd +
         '<td class="col-time">' + relativeTime + '</td>' +
-        '<td class="col-actions">' + githubLinkHtml + '</td>' +
+        '<td class="col-actions">' + githubLinkHtml + graphiteLinkHtml + '</td>' +
       '</tr>';
   }
 
@@ -750,6 +760,11 @@
           '<a href="https://github.com/' + escapeHtml(worktree.repository) + '/pull/' + worktree.pr_number + '" target="_blank" rel="noopener" class="btn-github-link" title="Open on GitHub">' +
             '<svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor"><path d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"/></svg>' +
           '</a>' +
+          (window.__pairReview?.enableGraphite && worktree.html_url
+            ? '<a href="' + escapeHtml(window.__pairReview.toGraphiteUrl(worktree.html_url)) + '" target="_blank" rel="noopener" class="btn-github-link" title="Open on Graphite">' +
+                '<svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor"><path d="M9.7932,1.3079L3.101,3.101l-1.7932,6.6921,4.899,4.899,6.6921-1.7931,1.7932-6.6921L9.7932,1.3079Zm1.0936,11.6921H5.1133l-2.8867-5L5.1133,3h5.7735l2.8867,5-2.8867,5Z"/><polygon points="11.3504 4.6496 6.7737 3.4232 3.4232 6.7737 4.6496 11.3504 9.2263 12.5768 12.5768 9.2263 11.3504 4.6496"/></svg>' +
+              '</a>'
+            : '') +
           '<a href="' + settingsLink + '" class="btn-repo-settings" title="Repository settings">' +
             '<svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor">' +
               '<path d="M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z"/>' +
@@ -1103,6 +1118,7 @@
         window.__pairReview.chatProvider = config.chat_provider || 'pi';
         const chatProviders = config.chat_providers || [];
         window.__pairReview.chatProviders = chatProviders;
+        window.__pairReview.enableGraphite = config.enable_graphite === true;
 
         // Set chat feature state based on config and provider availability
         let chatState = 'disabled';
@@ -1232,9 +1248,11 @@
 
   // ─── DOMContentLoaded Initialization ────────────────────────────────────────
 
-  document.addEventListener('DOMContentLoaded', function () {
-    // Load config and update command examples based on npx detection
-    loadConfigAndUpdateUI();
+  document.addEventListener('DOMContentLoaded', async function () {
+    // Load config and update command examples based on npx detection.
+    // Await so that window.__pairReview.enableGraphite (and other config
+    // values) are available before any tab content is rendered.
+    await loadConfigAndUpdateUI();
 
     // Restore saved tab from localStorage (default: 'pr-tab')
     const savedTab = localStorage.getItem(TAB_STORAGE_KEY) || 'pr-tab';

package/public/js/local.js

@@ -588,6 +588,12 @@ class LocalManager {
       githubLink.style.display = 'none';
     }
 
+    // Hide Graphite link (no PR to link to in local mode)
+    const graphiteLink = document.getElementById('graphite-link');
+    if (graphiteLink) {
+      graphiteLink.style.display = 'none';
+    }
+
     // Hide refresh button (no remote to refresh from)
     const refreshBtn = document.getElementById('refresh-pr');
     if (refreshBtn) {

package/public/js/pr.js

@@ -136,6 +136,8 @@ class PRManager {
     this.hideWhitespace = false;
     // Diff options dropdown (gear icon popover)
     this.diffOptionsDropdown = null;
+    // Cached staleness check promise — shared between on-load and triggerAIAnalysis
+    this._stalenessPromise = null;
     // Unique client ID for self-echo suppression on WebSocket review events.
     // Sent as X-Client-Id header on mutation requests; the server echoes
     // it back in the WebSocket broadcast so this tab can skip its own events.
@@ -511,6 +513,9 @@ class PRManager {
       // Listen for review mutation events via WebSocket pub/sub
       this._initReviewEventListeners();
 
+      // Fire-and-forget staleness check — shows badge or auto-refreshes
+      this._stalenessPromise = this._checkStalenessOnLoad(owner, repo, number);
+
     } catch (error) {
       console.error('Error loading PR:', error);
       this.showError(error.message);
@@ -902,6 +907,15 @@ class PRManager {
       githubLink.href = pr.html_url;
     }
 
+    // Update Graphite link (gated on enable_graphite config)
+    const graphiteLink = document.getElementById('graphite-link');
+    if (graphiteLink && pr.html_url && window.__pairReview?.enableGraphite) {
+      // Derive from html_url to preserve GitHub's original casing (Graphite URLs are case-sensitive)
+      const graphiteUrl = window.__pairReview.toGraphiteUrl(pr.html_url);
+      graphiteLink.href = graphiteUrl;
+      graphiteLink.style.display = '';
+    }
+
     // Update settings link
     const settingsLink = document.getElementById('settings-link');
     if (settingsLink && pr.owner && pr.repo) {
@@ -4080,19 +4094,13 @@ class PRManager {
         return;
       }
 
-      // Run stale check and settings fetch in parallel to minimize dialog delay
-      // Use AbortController so the fetch is truly cancelled on timeout,
-      // freeing the HTTP connection for subsequent requests.
+      // Run stale check and settings fetch in parallel to minimize dialog delay.
+      // Reuse the on-load staleness promise if still available, otherwise fetch fresh.
       const _tParallel0 = performance.now();
-      const staleAbort = new AbortController();
-      const staleTimer = setTimeout(() => {
-        console.debug(`[Analyze] stale-check timed out after ${STALE_TIMEOUT}ms, aborting`);
-        staleAbort.abort();
-      }, STALE_TIMEOUT);
-      const staleCheckWithTimeout = fetch(`/api/pr/${owner}/${repo}/${number}/check-stale`, { signal: staleAbort.signal })
-        .then(r => r.ok ? r.json() : null)
-        .then(result => { clearTimeout(staleTimer); return result; })
-        .catch(() => { clearTimeout(staleTimer); return null; });
+      const staleCheckWithTimeout = this._stalenessPromise
+        ? this._stalenessPromise
+        : this._fetchStaleness(owner, repo, number);
+      this._stalenessPromise = null; // consume it
 
       const [staleResult, repoSettings, reviewSettings] = await Promise.all([
         staleCheckWithTimeout,
@@ -4330,6 +4338,127 @@ class PRManager {
     this.resetButton();
   }
 
+  // ─── Staleness Badge ────────────────────────────────────────────
+
+  /**
+   * Fire-and-forget staleness check on page load.
+   * If stale and no active session data, silently refreshes.
+   * If stale and session data exists, shows the badge.
+   * Also shows badge variants for closed/merged PRs.
+   * @returns {Promise<Object|null>} The parsed staleness result, or null on failure.
+   */
+  async _checkStalenessOnLoad(owner, repo, number) {
+    try {
+      const result = await this._fetchStaleness(owner, repo, number);
+      if (!result) return null;
+
+      // Show badge for closed/merged PRs regardless of staleness
+      if (result.prState && result.prState !== 'open') {
+        const type = result.merged ? 'merged' : 'closed';
+        this._showStaleBadge(type);
+        return result;
+      }
+
+      if (result.isStale !== true) return result;
+
+      // Stale — decide: silent refresh or show badge
+      const hasData = await this._hasActiveSessionData();
+      if (hasData) {
+        this._showStaleBadge('stale');
+      } else {
+        // No user work to protect — refresh silently
+        await this.refreshPR();
+      }
+      return result;
+    } catch {
+      // Fail silently — staleness badge is best-effort
+      return null;
+    }
+  }
+
+  /**
+   * Fetch staleness data from the server with a timeout.
+   * @returns {Promise<Object|null>} The parsed staleness result, or null on failure/timeout.
+   */
+  async _fetchStaleness(owner, repo, number) {
+    try {
+      const staleAbort = new AbortController();
+      const staleTimer = setTimeout(() => staleAbort.abort(), STALE_TIMEOUT);
+      const response = await fetch(
+        `/api/pr/${owner}/${repo}/${number}/check-stale`,
+        { signal: staleAbort.signal }
+      );
+      clearTimeout(staleTimer);
+      if (!response.ok) return null;
+      return await response.json();
+    } catch {
+      return null;
+    }
+  }
+
+  /**
+   * Check whether the current session has user work worth protecting
+   * (analysis results or active user comments).
+   * Returns true if uncertain (fail-safe: don't auto-refresh).
+   */
+  async _hasActiveSessionData() {
+    const reviewId = this.currentPR?.id;
+    // No review record → no session data possible
+    if (!reviewId) return false;
+
+    try {
+      const [suggestionsRes, commentsRes] = await Promise.all([
+        fetch(`/api/reviews/${reviewId}/suggestions/check`).then(r => r.ok ? r.json() : null),
+        fetch(`/api/reviews/${reviewId}/comments`).then(r => r.ok ? r.json() : null)
+      ]);
+
+      const hasAnalysis = suggestionsRes?.analysisHasRun === true;
+      const hasUserComments = (commentsRes?.comments || []).some(
+        c => c.source === 'user' && c.status !== 'inactive'
+      );
+
+      return hasAnalysis || hasUserComments;
+    } catch {
+      // Uncertain — fail safe
+      return true;
+    }
+  }
+
+  /**
+   * Show the stale badge with an optional variant class.
+   * @param {'stale'|'closed'|'merged'} type
+   */
+  _showStaleBadge(type) {
+    const badge = document.getElementById('stale-badge');
+    if (!badge) return;
+
+    // Reset variant classes
+    badge.classList.remove('pr-closed', 'pr-merged');
+
+    const textEl = badge.querySelector('.stale-badge-text');
+    if (type === 'merged') {
+      badge.classList.add('pr-merged');
+      if (textEl) textEl.textContent = 'MERGED';
+      badge.title = 'This PR has been merged';
+    } else if (type === 'closed') {
+      badge.classList.add('pr-closed');
+      if (textEl) textEl.textContent = 'CLOSED';
+      badge.title = 'This PR has been closed';
+    } else {
+      if (textEl) textEl.textContent = 'STALE';
+      badge.title = 'PR data is outdated';
+    }
+    badge.style.display = '';
+  }
+
+  /**
+   * Hide the stale badge.
+   */
+  _hideStaleBadge() {
+    const badge = document.getElementById('stale-badge');
+    if (badge) badge.style.display = 'none';
+  }
+
   /**
    * Refresh the PR data
    */
@@ -4397,6 +4526,8 @@ class PRManager {
           window.scrollTo(0, scrollPosition);
         }, 100);
 
+        this._hideStaleBadge();
+        this._stalenessPromise = null;
         console.log('PR refreshed successfully');
       }
     } catch (error) {

package/public/pr.html

@@ -17,9 +17,16 @@
                 state = anyAvailable ? 'available' : 'unavailable';
             }
             window.__pairReview = window.__pairReview || {};
+            window.__pairReview.toGraphiteUrl = function(githubUrl) {
+                return githubUrl.replace(
+                    /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)/,
+                    'https://app.graphite.com/github/pr/$1/$2/$3'
+                );
+            };
             window.__pairReview.chatProvider = config.chat_provider || 'pi';
             window.__pairReview.chatProviders = chatProviders;
             window.__pairReview.share = config.share || null;
+            window.__pairReview.enableGraphite = config.enable_graphite === true;
             document.documentElement.setAttribute('data-chat', state);
             const shortcutsState = config.chat_enable_shortcuts === false ? 'disabled' : 'enabled';
             document.documentElement.setAttribute('data-chat-shortcuts', shortcutsState);
@@ -91,6 +98,9 @@
                     <span class="breadcrumb-repo">--</span>
                     <span class="breadcrumb-pr">#--</span>
                 </div>
+                <span id="stale-badge" class="stale-badge" style="display: none" title="New version available">
+                    <span class="stale-badge-text">STALE</span>
+                </span>
             </div>
             <div class="header-center">
                 <div class="pr-title-wrapper">
@@ -131,6 +141,12 @@
                             <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8Z"/>
                         </svg>
                     </a>
+                    <a class="btn btn-icon" id="graphite-link" href="#" target="_blank" title="View on Graphite" aria-label="View on Graphite" style="display: none;">
+                        <svg viewBox="0 0 16 16" fill="currentColor" width="16" height="16">
+                            <path d="M9.7932,1.3079L3.101,3.101l-1.7932,6.6921,4.899,4.899,6.6921-1.7931,1.7932-6.6921L9.7932,1.3079Zm1.0936,11.6921H5.1133l-2.8867-5L5.1133,3h5.7735l2.8867,5-2.8867,5Z"/>
+                            <polygon points="11.3504 4.6496 6.7737 3.4232 3.4232 6.7737 4.6496 11.3504 9.2263 12.5768 12.5768 9.2263 11.3504 4.6496"/>
+                        </svg>
+                    </a>
                 </div>
                 <div id="split-button-placeholder"></div>
             </div>

package/src/ai/analyzer.js

@@ -659,7 +659,7 @@ Do NOT create suggestions for any files not in this list. If you cannot find iss
   async getChangedFilesList(worktreePath, prMetadata) {
     try {
       const { stdout } = await execPromise(
-        `git diff ${prMetadata.base_sha}...${prMetadata.head_sha} --name-only`,
+        `git diff --no-ext-diff ${prMetadata.base_sha}...${prMetadata.head_sha} --name-only`,
         { cwd: worktreePath }
       );
       return stdout.trim().split('\n').filter(f => f.length > 0);
@@ -685,7 +685,7 @@ Do NOT create suggestions for any files not in this list. If you cannot find iss
     try {
       // Get modified tracked files (unstaged only - staged files are excluded by design)
       const { stdout: unstaged } = await execPromise(
-        'git diff --name-only',
+        'git diff --no-ext-diff --name-only',
         { cwd: localPath }
       );
 
@@ -777,7 +777,7 @@ The following files are marked as generated in .gitattributes and should be SKIP
 ${generatedPatterns.map(p => `- ${p}`).join('\n')}
 
 These are auto-generated files (like package-lock.json, build outputs, etc.) that should not be reviewed.
-When running git diff, you can exclude these with: git diff ${'{base}'}...${'{head}'} -- ':!pattern' for each pattern.
+When running git diff, you can exclude these with: git diff --no-ext-diff ${'{base}'}...${'{head}'} -- ':!pattern' for each pattern.
 Or simply ignore any changes to files matching these patterns in your analysis.
 `;
   }
@@ -983,10 +983,10 @@ ${prMetadata.description || '(No description provided)'}
     const isLocal = prMetadata.reviewType === 'local';
     if (isLocal) {
       // For local mode, diff against HEAD to see working directory changes
-      return suffix ? `git diff HEAD ${suffix}` : 'git diff HEAD';
+      return suffix ? `git diff --no-ext-diff HEAD ${suffix}` : 'git diff --no-ext-diff HEAD';
     }
     // For PR mode, diff between base and head commits
-    const baseCmd = `git diff ${prMetadata.base_sha}...${prMetadata.head_sha}`;
+    const baseCmd = `git diff --no-ext-diff ${prMetadata.base_sha}...${prMetadata.head_sha}`;
     return suffix ? `${baseCmd} ${suffix}` : baseCmd;
   }
 

package/src/ai/cursor-agent-provider.js

@@ -30,9 +30,9 @@ const BIN_DIR = path.join(__dirname, '..', '..', 'bin');
  *
  * Tier structure:
  * - free (auto): Cursor's default auto-routing model
- * - fast (composer-1, gpt-5.3-codex-fast, gemini-3-flash): Quick analysis
+ * - fast (composer-2-fast, gpt-5.3-codex-fast, gemini-3-flash): Quick analysis
  * - balanced (composer-1.5, sonnet-4.6-thinking, sonnet-4.5-thinking, gemini-3.1-pro): Recommended for most reviews
- * - thorough (gpt-5.3-codex-high, gpt-5.3-codex-xhigh, opus-4.5-thinking, opus-4.6-thinking): Deep analysis for complex code
+ * - thorough (composer-2, gpt-5.3-codex-high, gpt-5.3-codex-xhigh, opus-4.5-thinking, opus-4.6-thinking): Deep analysis for complex code
  */
 const CURSOR_AGENT_MODELS = [
   {
@@ -45,23 +45,32 @@ const CURSOR_AGENT_MODELS = [
     badgeClass: 'badge-speed'
   },
   {
-    id: 'composer-1.5',
-    name: 'Composer 1.5',
-    tier: 'balanced',
+    id: 'composer-2',
+    name: 'Composer 2',
+    tier: 'thorough',
     tagline: 'Latest Composer',
-    description: 'Cursor Composer model—positioned between Sonnet and Opus for multi-file edits',
-    badge: 'Balanced',
-    badgeClass: 'badge-balanced'
+    description: 'Frontier-level coding model trained with compaction-in-the-loop RL—strong on long-horizon tasks requiring hundreds of actions',
+    badge: 'Latest',
+    badgeClass: 'badge-power'
   },
   {
-    id: 'composer-1',
-    name: 'Composer 1',
+    id: 'composer-2-fast',
+    name: 'Composer 2 Fast',
     tier: 'fast',
-    tagline: 'Original Composer',
-    description: 'Cursor Composer model—good for quick multi-file editing workflows',
+    tagline: 'Fast Composer',
+    description: 'Same intelligence as Composer 2 with lower latency—default for interactive Cursor sessions',
     badge: 'Fast',
     badgeClass: 'badge-speed'
   },
+  {
+    id: 'composer-1.5',
+    name: 'Composer 1.5',
+    tier: 'balanced',
+    tagline: 'Previous Composer',
+    description: 'Previous generation Cursor Composer model—positioned between Sonnet and Opus for multi-file edits',
+    badge: 'Previous Gen',
+    badgeClass: 'badge-balanced'
+  },
   {
     id: 'gpt-5.3-codex-fast',
     name: 'GPT-5.3 Codex Fast',

package/src/chat/prompt-builder.js

@@ -124,8 +124,8 @@ function buildReviewContext(review, prData) {
     lines.push(`This is a local code review for: ${name}`);
     lines.push('');
     lines.push('## Viewing Code Changes');
-    lines.push('The changes under review are **unstaged and untracked local changes**. Staged changes (`git diff --cached`) are treated as already reviewed.');
-    lines.push('To see the diff under review: `git diff`');
+    lines.push('The changes under review are **unstaged and untracked local changes**. Staged changes (`git diff --no-ext-diff --cached`) are treated as already reviewed.');
+    lines.push('To see the diff under review: `git diff --no-ext-diff`');
     lines.push('Do NOT use `git diff HEAD~1` or `git log` — those show committed history, not the changes under review.');
   } else {
     const parts = [];
@@ -146,7 +146,7 @@ function buildReviewContext(review, prData) {
       lines.push('');
       lines.push('## Viewing Code Changes');
       lines.push(`The changes under review are the diff between base commit \`${prData.base_sha.substring(0, 8)}\` and head commit \`${prData.head_sha.substring(0, 8)}\`.`);
-      lines.push(`To see the full diff: \`git diff ${prData.base_sha}...${prData.head_sha}\``);
+      lines.push(`To see the full diff: \`git diff --no-ext-diff ${prData.base_sha}...${prData.head_sha}\``);
       lines.push('Do NOT use `git diff HEAD~1` or `git diff` without arguments — those do not show the PR changes.');
     }
   }

package/src/config.js

@@ -34,7 +34,8 @@ const DEFAULT_CONFIG = {
   providers: {},  // Custom AI analysis provider configurations (overrides built-in defaults)
   chat_providers: {},  // Custom chat provider configurations (overrides built-in defaults)
   monorepos: {},  // Monorepo configurations: { "owner/repo": { path: "~/path/to/clone" } }
-  assisted_by_url: "https://github.com/in-the-loop-labs/pair-review"  // URL for "Review assisted by" footer link
+  assisted_by_url: "https://github.com/in-the-loop-labs/pair-review",  // URL for "Review assisted by" footer link
+  enable_graphite: false  // When true, shows Graphite links alongside GitHub links
 };
 
 /**

package/src/git/worktree.js

@@ -536,7 +536,8 @@ class GitWorktreeManager {
       // This ensures we compare the exact commits from the PR, even if the base branch has moved
       const diff = await git.diff([
         `${prData.base_sha}...${prData.head_sha}`,
-        '--unified=3'
+        '--unified=3',
+        '--no-ext-diff'
       ]);
 
       return diff;
@@ -559,7 +560,7 @@ class GitWorktreeManager {
 
       // Get file changes with stats using base SHA and head SHA
       // This ensures we get the exact files changed in the PR, even if the base branch has moved
-      const diffSummary = await git.diffSummary([`${prData.base_sha}...${prData.head_sha}`]);
+      const diffSummary = await git.diffSummary([`${prData.base_sha}...${prData.head_sha}`, '--no-ext-diff']);
 
       // Parse .gitattributes to identify generated files
       const gitattributes = await getGeneratedFilePatterns(worktreePath);
@@ -626,6 +627,29 @@ class GitWorktreeManager {
     }
   }
 
+  /**
+   * Resolve the owning git repository for a worktree path.
+   * Uses `git rev-parse --git-common-dir` to find the main repo,
+   * which works even when worktrees are outside the parent repo directory.
+   * @param {string} worktreePath - Path to a worktree
+   * @returns {Promise<import('simple-git').SimpleGit|null>} simpleGit instance for the owning repo, or null
+   */
+  async resolveOwningRepo(worktreePath) {
+    try {
+      const git = simpleGit(worktreePath);
+      const commonDir = (await git.raw(['rev-parse', '--git-common-dir'])).trim();
+      // commonDir is either a .git subdirectory (regular repos) or the bare repo root itself.
+      // Only strip the last component when it's actually a .git directory.
+      const resolvedCommonDir = path.resolve(worktreePath, commonDir);
+      const repoRoot = path.basename(resolvedCommonDir) === '.git'
+        ? path.dirname(resolvedCommonDir)
+        : resolvedCommonDir;
+      return simpleGit(repoRoot);
+    } catch {
+      return null;
+    }
+  }
+
   /**
    * Cleanup a specific worktree
    * @param {string} worktreePath - Path to worktree to cleanup
@@ -634,27 +658,30 @@ class GitWorktreeManager {
   async cleanupWorktree(worktreePath) {
     try {
       // First try to prune any stale worktree registrations
-      await this.pruneWorktrees();
-      
+      await this.pruneWorktrees(worktreePath);
+
       // Check if worktree exists
       const exists = await this.pathExists(worktreePath);
-      
-      // Try to remove via git worktree remove first (handles both directory and registration)
-      try {
-        const parentGit = simpleGit(path.dirname(worktreePath));
-        await parentGit.raw(['worktree', 'remove', '--force', worktreePath]);
-        console.log(`Removed worktree via git: ${worktreePath}`);
-        return;
-      } catch (gitError) {
-        console.log('Git worktree remove failed, trying manual cleanup...');
-      }
 
-      // If directory exists, remove it manually
       if (exists) {
+        // Try to remove via git worktree remove first (handles both directory and registration)
+        try {
+          const owningRepo = await this.resolveOwningRepo(worktreePath);
+          if (!owningRepo) {
+            throw new Error('Could not resolve owning repository');
+          }
+          await owningRepo.raw(['worktree', 'remove', '--force', worktreePath]);
+          console.log(`Removed worktree via git: ${worktreePath}`);
+          return;
+        } catch (gitError) {
+          console.log('Git worktree remove failed, trying manual cleanup...');
+        }
+
+        // git remove failed — remove directory manually
         await this.removeDirectory(worktreePath);
         console.log(`Removed worktree directory: ${worktreePath}`);
       }
-      
+
     } catch (error) {
       console.warn(`Warning: Could not cleanup worktree at ${worktreePath}: ${error.message}`);
       // Don't throw - this is cleanup, continue with creation
@@ -777,14 +804,22 @@ class GitWorktreeManager {
   }
 
   /**
-   * Prune stale worktree registrations
+   * Prune stale worktree registrations from the owning repository.
+   * @param {string|import('simple-git').SimpleGit} [worktreePathOrGit] - A worktree path to
+   *   resolve the owning repo from, or a SimpleGit instance directly. Falls back to process.cwd().
    * @returns {Promise<void>}
    */
-  async pruneWorktrees() {
+  async pruneWorktrees(worktreePathOrGit) {
     try {
-      // Find the parent git repository to prune from
-      // We need to find any git repo to run the prune command
-      const git = simpleGit(process.cwd());
+      let git;
+      if (worktreePathOrGit && typeof worktreePathOrGit === 'object') {
+        git = worktreePathOrGit;
+      } else if (typeof worktreePathOrGit === 'string') {
+        git = await this.resolveOwningRepo(worktreePathOrGit);
+      }
+      if (!git) {
+        git = simpleGit(process.cwd());
+      }
       await git.raw(['worktree', 'prune']);
       console.log('Pruned stale worktree registrations');
     } catch (error) {
@@ -892,12 +927,31 @@ class GitWorktreeManager {
 
       console.log(`[pair-review] Found ${staleWorktrees.length} stale worktrees older than ${retentionDays} days`);
 
+      // Resolve owning repos BEFORE cleanup removes directories
+      const owningRepos = new Map();
+      for (const worktree of staleWorktrees) {
+        try {
+          const repo = await this.resolveOwningRepo(worktree.path);
+          if (repo) {
+            const repoPath = (await repo.raw(['rev-parse', '--git-dir'])).trim();
+            if (!owningRepos.has(repoPath)) {
+              owningRepos.set(repoPath, repo);
+            }
+          }
+        } catch {
+          // ignore - will fall back to manual removal
+        }
+      }
+
       for (const worktree of staleWorktrees) {
         try {
           // Try to remove via git worktree remove first
           try {
-            const git = simpleGit(path.dirname(worktree.path));
-            await git.raw(['worktree', 'remove', '--force', worktree.path]);
+            const owningRepo = await this.resolveOwningRepo(worktree.path);
+            if (!owningRepo) {
+              throw new Error('Could not resolve owning repository');
+            }
+            await owningRepo.raw(['worktree', 'remove', '--force', worktree.path]);
             console.log(`[pair-review] Removed worktree via git: ${worktree.path}`);
           } catch (gitError) {
             // If git worktree remove fails, try manual directory removal
@@ -923,8 +977,10 @@ class GitWorktreeManager {
         }
       }
 
-      // Run git worktree prune to clean up orphaned registrations
-      await this.pruneWorktrees();
+      // Prune each unique owning repo
+      for (const repo of owningRepos.values()) {
+        await this.pruneWorktrees(repo);
+      }
 
       if (result.cleaned > 0) {
         console.log(`[pair-review] Cleaned up ${result.cleaned} stale worktrees (older than ${retentionDays} days)`);

package/src/local-review.js

@@ -658,7 +658,7 @@ async function computeLocalDiffDigest(localPath) {
   // Get unstaged diff (the actual content being reviewed)
   let unstagedDiff = '';
   try {
-    const result = await execAsync('git diff', {
+    const result = await execAsync('git diff --no-ext-diff', {
       cwd: localPath,
       encoding: 'utf8',
       maxBuffer: 50 * 1024 * 1024

package/src/main.js

@@ -662,10 +662,10 @@ async function performHeadlessReview(args, config, db, flags, options) {
         }
       }
 
-      diff = await git.diff([`${prData.base_sha}...${prData.head_sha}`, '--unified=3']);
+      diff = await git.diff([`${prData.base_sha}...${prData.head_sha}`, '--unified=3', '--no-ext-diff']);
 
       // Get changed files
-      const diffSummary = await git.diffSummary([`${prData.base_sha}...${prData.head_sha}`]);
+      const diffSummary = await git.diffSummary([`${prData.base_sha}...${prData.head_sha}`, '--no-ext-diff']);
       const gitattributes = await getGeneratedFilePatterns(worktreePath);
 
       changedFiles = diffSummary.files.map(file => {

package/src/routes/config.js

@@ -55,6 +55,7 @@ router.get('/api/config', (req, res) => {
     chat_enable_shortcuts: config.chat?.enable_shortcuts !== false,
     pi_available: getCachedAvailability('pi')?.available || false,
     assisted_by_url: config.assisted_by_url || 'https://github.com/in-the-loop-labs/pair-review',
+    enable_graphite: config.enable_graphite === true,
     // Share configuration for external review viewers.
     // - url: The base URL of the external share site
     // - method: Plumbed through for future use (e.g., POST-based share flows).

package/src/routes/github-collections.js

@@ -45,7 +45,7 @@ router.post('/api/github/review-requests/refresh', async (req, res) => {
     const db = req.app.get('db');
     const client = new GitHubClient(githubToken);
     const user = await client.getAuthenticatedUser();
-    const prs = await client.searchPullRequests(`is:pr is:open user-review-requested:${user.login}`);
+    const prs = await client.searchPullRequests(`is:pr is:open archived:false user-review-requested:${user.login}`);
 
     await withTransaction(db, async () => {
       await run(db, 'DELETE FROM github_pr_cache WHERE collection = ?', ['review-requests']);
@@ -99,7 +99,7 @@ router.post('/api/github/my-prs/refresh', async (req, res) => {
     const db = req.app.get('db');
     const client = new GitHubClient(githubToken);
     const user = await client.getAuthenticatedUser();
-    const prs = await client.searchPullRequests(`is:pr is:open author:${user.login}`);
+    const prs = await client.searchPullRequests(`is:pr is:open archived:false author:${user.login}`);
 
     await withTransaction(db, async () => {
       await run(db, 'DELETE FROM github_pr_cache WHERE collection = ?', ['my-prs']);

package/src/routes/pr.js

@@ -682,10 +682,10 @@ router.get('/api/pr/:owner/:repo/:number/diff', async (req, res) => {
 
         if (baseSha && headSha) {
           // Regenerate diff with -w flag to ignore whitespace changes
-          diffContent = await git.diff([`${baseSha}...${headSha}`, '--unified=3', '-w']);
+          diffContent = await git.diff([`${baseSha}...${headSha}`, '--unified=3', '-w', '--no-ext-diff']);
 
           // Regenerate changed files stats with -w flag
-          const diffSummary = await git.diffSummary([`${baseSha}...${headSha}`, '-w']);
+          const diffSummary = await git.diffSummary([`${baseSha}...${headSha}`, '-w', '--no-ext-diff']);
           const gitattributes = await getGeneratedFilePatterns(worktreePath);
           changedFiles = diffSummary.files.map(file => {
             const resolvedFile = resolveRenamedFile(file.file);

package/src/routes/worktrees.js

@@ -156,7 +156,8 @@ router.get('/api/worktrees/recent', async (req, res) => {
           w.created_at,
           pm.title as pr_title,
           pm.author,
-          pm.head_branch
+          pm.head_branch,
+          json_extract(pm.pr_data, '$.html_url') as html_url
         FROM worktrees w
         LEFT JOIN pr_metadata pm ON w.pr_number = pm.pr_number AND w.repository = pm.repository COLLATE NOCASE
         WHERE w.last_accessed_at < ?
@@ -176,7 +177,8 @@ router.get('/api/worktrees/recent', async (req, res) => {
           w.created_at,
           pm.title as pr_title,
           pm.author,
-          pm.head_branch
+          pm.head_branch,
+          json_extract(pm.pr_data, '$.html_url') as html_url
         FROM worktrees w
         LEFT JOIN pr_metadata pm ON w.pr_number = pm.pr_number AND w.repository = pm.repository COLLATE NOCASE
         ORDER BY w.last_accessed_at DESC
@@ -235,7 +237,8 @@ router.get('/api/worktrees/recent', async (req, res) => {
       branch: w.branch,
       head_branch: w.head_branch || w.branch,
       last_accessed_at: w.last_accessed_at,
-      created_at: w.created_at
+      created_at: w.created_at,
+      html_url: w.html_url || null
     }));
 
     res.json({

package/src/utils/diff-file-list.js

@@ -37,7 +37,7 @@ async function getDiffFileList(db, review) {
     try {
       const opts = { cwd: review.local_path };
       const [{ stdout: unstaged }, { stdout: untracked }] = await Promise.all([
-        execPromise('git diff --name-only', opts),
+        execPromise('git diff --no-ext-diff --name-only', opts),
         execPromise('git ls-files --others --exclude-standard', opts),
       ]);
       const combined = `${unstaged}\n${untracked}`