diff --git a/AGENTS.md b/AGENTS.md
index 26c34274..5f639690 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -124,6 +124,7 @@
   5. For responsive/mobile changes, run checks at 375x812 and 768x1024.
   6. Wait 2-3 seconds before capturing final screenshot(s).
   7. Save screenshots under `output/playwright/` with task-specific names.
+  8. Leave the dev server running after verification unless the user explicitly asks to stop it.
 - Capture screenshots only when Playwright verification is requested.
 - If the dev server fails to start due to pre-existing errors, fix them first or work around them before testing.
 - If requested Playwright assertions fail, do not report completion; fix and re-run until passing.
@@ -152,6 +153,7 @@
 - For dev-server fixes, verify the exact user-requested command afterwards (for example `npm run dev`), not only a fallback Vite invocation.
 - Never kill or stop the tmux-managed dev server bound to port `5173`.
 - Treat the `5173` tmux dev process as persistent infrastructure; restart it only when the user explicitly requests a restart.
+- Treat the `4173` verification dev server as reusable test infrastructure during active UI work; after tests or screenshots, leave it running unless the user explicitly asks to stop it.
 
 ## Dark Theme CSS Rule
 
diff --git a/src/App.vue b/src/App.vue
index 77a0b263..1087dc36 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -541,19 +541,25 @@
               :head-date="currentThreadHeadDate"
               :detached="isThreadDetachedHead"
               :dirty="isThreadWorktreeDirty"
+              :worktree-change-summary="threadWorktreeChangeSummary"
               :branches="threadBranchOptions"
               :commits-by-branch="threadBranchCommitsByBranch"
               :commits-loading-for="threadBranchCommitsLoadingFor"
               :commits-error="threadBranchCommitsError"
+              :commit-files-by-sha="threadCommitFilesBySha"
+              :commit-files-loading-for="threadCommitFilesLoadingFor"
+              :commit-files-error="threadCommitFilesError"
               :loading="isLoadingThreadBranches"
               :busy="isSwitchingThreadBranch"
               :error="threadBranchError"
               :review-open="isReviewPaneOpen"
               :show-review="route.name === 'thread' && selectedThreadId.length > 0"
-              @toggle-review="isReviewPaneOpen = !isReviewPaneOpen"
+              @toggle-review="onToggleContentHeaderReview"
               @checkout-branch="onCheckoutContentHeaderBranch"
               @reset-branch-to-commit="onResetContentHeaderBranchToCommit"
               @load-commits="loadThreadBranchCommits"
+              @load-commit-files="loadThreadCommitFiles"
+              @open-commit-file="onOpenContentHeaderCommitFile"
             />
           </template>
         </ContentHeader>
@@ -920,6 +926,8 @@
                 :thread-id="selectedThreadId"
                 :cwd="composerCwd"
                 :is-thread-in-progress="isSelectedThreadInProgress"
+                :initial-file-path="reviewInitialFilePath"
+                :commit-sha="reviewInitialCommitSha"
                 @close="isReviewPaneOpen = false"
               />
 
@@ -1097,7 +1105,9 @@ import {
   createProjectlessThreadDirectory,
   getGitBranchState,
   getGitBranchCommits,
+  getGitCommitFiles,
   getGitRepositoryStatus,
+  getReviewSummary,
   getWorktreeBranchOptions,
   getAccounts,
   completeCodexLogin,
@@ -1122,7 +1132,7 @@ import {
 } from './api/codexGateway'
 import type { ReasoningEffort, SpeedMode, UiAccountEntry, UiRateLimitWindow, UiServerRequest, UiServerRequestReply, UiThreadAutomation, UiThreadTokenUsage } from './types/codex'
 import type { ComposerDraftPayload, ThreadComposerExposed } from './components/content/ThreadComposer.vue'
-import type { GitCommitOption, LocalDirectoryEntry, TelegramStatus, ThreadTerminalQuickCommand, WorktreeBranchOption } from './api/codexGateway'
+import type { GitCommitFileChange, GitCommitOption, LocalDirectoryEntry, TelegramStatus, ThreadTerminalQuickCommand, WorktreeBranchOption } from './api/codexGateway'
 import { getFreeModeStatus, setFreeMode, setFreeModeCustomKey, setCustomProvider } from './api/codexGateway'
 import { getPathLeafName, getPathParent, isProjectlessChatPath, normalizePathForUi } from './pathUtils.js'
 
@@ -1426,11 +1436,15 @@ let threadSearchTimer: ReturnType<typeof setTimeout> | null = null
 let terminalKeyboardFocusFallbackTimer: ReturnType<typeof setTimeout> | null = null
 let threadBranchesRequestId = 0
 let threadBranchCommitsRequestId = 0
+let threadCommitFilesRequestId = 0
+let threadWorktreeSummaryRequestId = 0
 const defaultNewProjectName = ref('New Project (1)')
 const homeDirectory = ref('')
 const isSettingsOpen = ref(false)
 const isAccountsSectionCollapsed = ref(loadAccountsSectionCollapsed())
 const isReviewPaneOpen = ref(false)
+const reviewInitialFilePath = ref('')
+const reviewInitialCommitSha = ref('')
 const threadBranchOptions = ref<WorktreeBranchOption[]>([])
 const currentThreadBranch = ref<string | null>(null)
 const currentThreadHeadSha = ref<string | null>(null)
@@ -1438,12 +1452,21 @@ const currentThreadHeadSubject = ref<string | null>(null)
 const currentThreadHeadDate = ref<string | null>(null)
 const isThreadDetachedHead = ref(false)
 const isThreadWorktreeDirty = ref(false)
+const threadWorktreeChangeSummary = ref({ addedLineCount: 0, removedLineCount: 0 })
 const threadBranchError = ref('')
 const threadBranchCommitsByBranch = ref<Record<string, GitCommitOption[]>>({})
 const threadBranchCommitsLoadingFor = ref('')
 const threadBranchCommitsError = ref('')
+const threadCommitFilesBySha = ref<Record<string, GitCommitFileChange[]>>({})
+const threadCommitFilesLoadingFor = ref('')
+const threadCommitFilesError = ref('')
 const isLoadingThreadBranches = ref(false)
 const isSwitchingThreadBranch = ref(false)
+
+function toThreadBranchCommitsKey(branch: string, includeResetHistory: boolean): string {
+  return `${branch}\u0000${includeResetHistory ? 'with-reset-history' : 'without-reset-history'}`
+}
+
 const createFolderInputRef = ref<HTMLInputElement | null>(null)
 const accounts = ref<UiAccountEntry[]>([])
 const isRefreshingAccounts = ref(false)
@@ -3085,6 +3108,8 @@ function canLoadBranchStateForCwd(cwd: string): boolean {
 function resetThreadBranchState(): void {
   threadBranchesRequestId += 1
   threadBranchCommitsRequestId += 1
+  threadCommitFilesRequestId += 1
+  threadWorktreeSummaryRequestId += 1
   threadBranchOptions.value = []
   currentThreadBranch.value = null
   currentThreadHeadSha.value = null
@@ -3092,13 +3117,38 @@ function resetThreadBranchState(): void {
   currentThreadHeadDate.value = null
   isThreadDetachedHead.value = false
   isThreadWorktreeDirty.value = false
+  threadWorktreeChangeSummary.value = { addedLineCount: 0, removedLineCount: 0 }
   threadBranchCommitsByBranch.value = {}
   threadBranchCommitsLoadingFor.value = ''
   threadBranchCommitsError.value = ''
+  threadCommitFilesBySha.value = {}
+  threadCommitFilesLoadingFor.value = ''
+  threadCommitFilesError.value = ''
   threadBranchError.value = ''
   isLoadingThreadBranches.value = false
 }
 
+function loadThreadWorktreeChangeSummary(cwd: string): void {
+  const targetCwd = cwd.trim()
+  if (!targetCwd) {
+    threadWorktreeChangeSummary.value = { addedLineCount: 0, removedLineCount: 0 }
+    return
+  }
+  const requestId = ++threadWorktreeSummaryRequestId
+  void getReviewSummary(targetCwd, 'unstaged')
+    .then((summary) => {
+      if (requestId !== threadWorktreeSummaryRequestId || !canLoadBranchStateForCwd(targetCwd)) return
+      threadWorktreeChangeSummary.value = {
+        addedLineCount: summary.addedLineCount,
+        removedLineCount: summary.removedLineCount,
+      }
+    })
+    .catch(() => {
+      if (requestId !== threadWorktreeSummaryRequestId || !canLoadBranchStateForCwd(targetCwd)) return
+      threadWorktreeChangeSummary.value = { addedLineCount: 0, removedLineCount: 0 }
+    })
+}
+
 async function loadThreadBranches(cwd: string): Promise<void> {
   const targetCwd = cwd.trim()
   if (!targetCwd) {
@@ -3118,6 +3168,9 @@ async function loadThreadBranches(cwd: string): Promise<void> {
     currentThreadHeadDate.value = state.headDate
     isThreadDetachedHead.value = state.detached
     isThreadWorktreeDirty.value = state.dirty
+    loadThreadWorktreeChangeSummary(targetCwd)
+    const defaultBranchForCommits = state.currentBranch?.trim() || state.options[0]?.value?.trim() || ''
+    if (defaultBranchForCommits) loadThreadBranchCommits({ branch: defaultBranchForCommits, includeResetHistory: true })
   } catch {
     if (requestId !== threadBranchesRequestId || !canLoadBranchStateForCwd(targetCwd)) return
     threadBranchOptions.value = []
@@ -3127,6 +3180,7 @@ async function loadThreadBranches(cwd: string): Promise<void> {
     currentThreadHeadDate.value = null
     isThreadDetachedHead.value = false
     isThreadWorktreeDirty.value = false
+    threadWorktreeChangeSummary.value = { addedLineCount: 0, removedLineCount: 0 }
   } finally {
     if (requestId === threadBranchesRequestId) {
       isLoadingThreadBranches.value = false
@@ -3141,6 +3195,7 @@ function applyThreadGitState(state: { currentBranch: string | null; headSha: str
   currentThreadHeadDate.value = state.headDate
   isThreadDetachedHead.value = state.detached
   isThreadWorktreeDirty.value = state.dirty
+  loadThreadWorktreeChangeSummary(composerCwd.value)
 }
 
 function onCheckoutContentHeaderBranch(value: string): void {
@@ -3198,20 +3253,22 @@ function onResetContentHeaderBranchToCommit(payload: { branch: string; sha: stri
     })
 }
 
-function loadThreadBranchCommits(branch: string): void {
-  const targetBranch = branch.trim()
+function loadThreadBranchCommits(payload: string | { branch: string; includeResetHistory?: boolean }): void {
+  const targetBranch = (typeof payload === 'string' ? payload : payload.branch).trim()
+  const includeResetHistory = typeof payload === 'string' ? true : payload.includeResetHistory !== false
   const cwd = composerCwd.value.trim()
-  if (!targetBranch || !cwd || threadBranchCommitsLoadingFor.value === targetBranch) return
-  if (threadBranchCommitsByBranch.value[targetBranch]) return
+  const cacheKey = toThreadBranchCommitsKey(targetBranch, includeResetHistory)
+  if (!targetBranch || !cwd || threadBranchCommitsLoadingFor.value === cacheKey) return
+  if (threadBranchCommitsByBranch.value[cacheKey]) return
   const requestId = ++threadBranchCommitsRequestId
-  threadBranchCommitsLoadingFor.value = targetBranch
+  threadBranchCommitsLoadingFor.value = cacheKey
   threadBranchCommitsError.value = ''
-  void getGitBranchCommits(cwd, targetBranch)
+  void getGitBranchCommits(cwd, targetBranch, { includeResetHistory })
     .then((commits) => {
       if (requestId !== threadBranchCommitsRequestId || !canLoadBranchStateForCwd(cwd)) return
       threadBranchCommitsByBranch.value = {
         ...threadBranchCommitsByBranch.value,
-        [targetBranch]: commits,
+        [cacheKey]: commits,
       }
     })
     .catch((error: unknown) => {
@@ -3219,12 +3276,54 @@ function loadThreadBranchCommits(branch: string): void {
       threadBranchCommitsError.value = error instanceof Error ? error.message : 'Failed to load branch commits'
     })
     .finally(() => {
-      if (requestId === threadBranchCommitsRequestId && threadBranchCommitsLoadingFor.value === targetBranch) {
+      if (requestId === threadBranchCommitsRequestId && threadBranchCommitsLoadingFor.value === cacheKey) {
         threadBranchCommitsLoadingFor.value = ''
       }
     })
 }
 
+function loadThreadCommitFiles(sha: string): void {
+  const targetSha = sha.trim()
+  const cwd = composerCwd.value.trim()
+  if (!targetSha || !cwd || threadCommitFilesLoadingFor.value === targetSha) return
+  if (threadCommitFilesBySha.value[targetSha]) return
+  const requestId = ++threadCommitFilesRequestId
+  threadCommitFilesLoadingFor.value = targetSha
+  threadCommitFilesError.value = ''
+  void getGitCommitFiles(cwd, targetSha)
+    .then((files) => {
+      if (requestId !== threadCommitFilesRequestId || !canLoadBranchStateForCwd(cwd)) return
+      threadCommitFilesBySha.value = {
+        ...threadCommitFilesBySha.value,
+        [targetSha]: files,
+      }
+    })
+    .catch((error: unknown) => {
+      if (requestId !== threadCommitFilesRequestId || !canLoadBranchStateForCwd(cwd)) return
+      threadCommitFilesError.value = error instanceof Error ? error.message : 'Failed to load commit files'
+    })
+    .finally(() => {
+      if (requestId === threadCommitFilesRequestId && threadCommitFilesLoadingFor.value === targetSha) {
+        threadCommitFilesLoadingFor.value = ''
+      }
+    })
+}
+
+function onOpenContentHeaderCommitFile(payload: { sha: string; path: string }): void {
+  const targetPath = payload.path.trim()
+  const targetSha = payload.sha.trim()
+  if (!targetPath || !targetSha) return
+  reviewInitialFilePath.value = targetPath
+  reviewInitialCommitSha.value = targetSha
+  isReviewPaneOpen.value = true
+}
+
+function onToggleContentHeaderReview(): void {
+  reviewInitialFilePath.value = ''
+  reviewInitialCommitSha.value = ''
+  isReviewPaneOpen.value = !isReviewPaneOpen.value
+}
+
 async function onOpenProjectSetupModal(): Promise<void> {
   const baseDir = await resolveProjectBaseDirectory()
   if (!baseDir) return
diff --git a/src/api/codexGateway.ts b/src/api/codexGateway.ts
index 25a762d1..b54596da 100644
--- a/src/api/codexGateway.ts
+++ b/src/api/codexGateway.ts
@@ -49,6 +49,7 @@ import type {
   UiReviewResult,
   UiReviewScope,
   UiReviewSnapshot,
+  UiReviewSummary,
   UiReviewWorkspaceView,
   UiRateLimitSnapshot,
   UiRateLimitWindow,
@@ -332,6 +333,15 @@ export type GitCommitOption = {
   date: string
 }
 
+export type GitCommitFileChange = {
+  path: string
+  previousPath: string | null
+  status: string
+  label: string
+  addedLineCount: number | null
+  removedLineCount: number | null
+}
+
 export type GitRepositoryStatus = {
   isGitRepo: boolean
   gitRoot: string
@@ -937,7 +947,8 @@ function normalizeReviewSnapshot(payload: unknown): UiReviewSnapshot {
   const envelope = asRecord(payload)
   const data = asRecord(envelope?.data)
   const summaryRecord = asRecord(data?.summary)
-  const scope = readString(data?.scope) === 'baseBranch' ? 'baseBranch' : 'workspace'
+  const rawScope = readString(data?.scope)
+  const scope = rawScope === 'baseBranch' || rawScope === 'commit' ? rawScope : 'workspace'
   const workspaceView = readString(data?.workspaceView) === 'staged' ? 'staged' : 'unstaged'
 
   return {
@@ -952,6 +963,7 @@ function normalizeReviewSnapshot(payload: unknown): UiReviewSnapshot {
         .map((entry) => readString(entry))
         .filter((entry): entry is string => typeof entry === 'string' && entry.length > 0)
       : [],
+    commitSha: readString(data?.commitSha),
     headBranch: readString(data?.headBranch),
     mergeBaseSha: readString(data?.mergeBaseSha),
     generatedAtIso: readString(data?.generatedAtIso) ?? '',
@@ -968,6 +980,16 @@ function normalizeReviewSnapshot(payload: unknown): UiReviewSnapshot {
   }
 }
 
+function normalizeReviewSummary(payload: unknown): UiReviewSummary {
+  const envelope = asRecord(payload)
+  const data = asRecord(envelope?.data)
+  return {
+    fileCount: readNumber(data?.fileCount) ?? 0,
+    addedLineCount: readNumber(data?.addedLineCount) ?? 0,
+    removedLineCount: readNumber(data?.removedLineCount) ?? 0,
+  }
+}
+
 function parseReviewLocation(value: string): {
   absolutePath: string | null
   startLine: number | null
@@ -2673,11 +2695,15 @@ export async function checkoutGitBranch(cwd: string, branch: string): Promise<st
   return typeof branchName === 'string' && branchName.trim() ? branchName.trim() : null
 }
 
-export async function getGitBranchCommits(cwd: string, branch: string): Promise<GitCommitOption[]> {
+export async function getGitBranchCommits(cwd: string, branch: string, options: { includeResetHistory?: boolean } = {}): Promise<GitCommitOption[]> {
   const normalizedCwd = cwd.trim()
   const normalizedBranch = branch.trim()
   if (!normalizedCwd || !normalizedBranch) return []
-  const query = new URLSearchParams({ cwd: normalizedCwd, branch: normalizedBranch })
+  const query = new URLSearchParams({
+    cwd: normalizedCwd,
+    branch: normalizedBranch,
+    includeResetHistory: options.includeResetHistory === false ? 'false' : 'true',
+  })
   const response = await fetch(`/codex-api/git/branch-commits?${query.toString()}`)
   const payload = (await response.json()) as { data?: unknown; error?: string }
   if (!response.ok) {
@@ -2696,6 +2722,34 @@ export async function getGitBranchCommits(cwd: string, branch: string): Promise<
   })
 }
 
+export async function getGitCommitFiles(cwd: string, sha: string): Promise<GitCommitFileChange[]> {
+  const normalizedCwd = cwd.trim()
+  const normalizedSha = sha.trim()
+  if (!normalizedCwd || !normalizedSha) return []
+  const query = new URLSearchParams({
+    cwd: normalizedCwd,
+    sha: normalizedSha,
+  })
+  const response = await fetch(`/codex-api/git/commit-files?${query.toString()}`)
+  const payload = (await response.json()) as { data?: unknown; error?: string }
+  if (!response.ok) {
+    throw new Error(payload.error || 'Failed to load commit files')
+  }
+  const rawList = Array.isArray(payload.data) ? payload.data : []
+  return rawList.flatMap((item) => {
+    if (!item || typeof item !== 'object' || Array.isArray(item)) return []
+    const record = item as Record<string, unknown>
+    const path = typeof record.path === 'string' ? record.path : ''
+    const previousPath = typeof record.previousPath === 'string' && record.previousPath.length > 0 ? record.previousPath : null
+    const status = typeof record.status === 'string' ? record.status.trim() : ''
+    const label = typeof record.label === 'string' ? record.label.trim() : ''
+    const addedLineCount = typeof record.addedLineCount === 'number' && Number.isFinite(record.addedLineCount) ? record.addedLineCount : null
+    const removedLineCount = typeof record.removedLineCount === 'number' && Number.isFinite(record.removedLineCount) ? record.removedLineCount : null
+    if (!path || !status) return []
+    return [{ path, previousPath, status, label: label || status, addedLineCount, removedLineCount }]
+  })
+}
+
 export async function resetGitBranchToCommit(cwd: string, branch: string, sha: string): Promise<GitBranchState> {
   const response = await fetch('/codex-api/git/reset-to-commit', {
     method: 'POST',
@@ -2730,11 +2784,15 @@ export async function getReviewSnapshot(
   scope: UiReviewScope,
   workspaceView: UiReviewWorkspaceView,
   baseBranch?: string | null,
+  commitSha?: string | null,
 ): Promise<UiReviewSnapshot> {
   const query = new URLSearchParams({ cwd, scope, workspaceView })
   if (baseBranch && baseBranch.trim()) {
     query.set('baseBranch', baseBranch.trim())
   }
+  if (commitSha && commitSha.trim()) {
+    query.set('commitSha', commitSha.trim())
+  }
   const response = await fetch(`/codex-api/review/snapshot?${query.toString()}`)
   const payload = (await response.json()) as unknown
   if (!response.ok) {
@@ -2743,6 +2801,19 @@ export async function getReviewSnapshot(
   return normalizeReviewSnapshot(payload)
 }
 
+export async function getReviewSummary(
+  cwd: string,
+  workspaceView: UiReviewWorkspaceView,
+): Promise<UiReviewSummary> {
+  const query = new URLSearchParams({ cwd, workspaceView })
+  const response = await fetch(`/codex-api/review/summary?${query.toString()}`)
+  const payload = (await response.json()) as unknown
+  if (!response.ok) {
+    throw new Error(getErrorMessageFromPayload(payload, 'Failed to load review summary'))
+  }
+  return normalizeReviewSummary(payload)
+}
+
 export async function applyReviewAction(payload: {
   cwd: string
   scope: UiReviewScope
diff --git a/src/components/content/ContentHeader.vue b/src/components/content/ContentHeader.vue
index 848ce5ba..68390ed2 100644
--- a/src/components/content/ContentHeader.vue
+++ b/src/components/content/ContentHeader.vue
@@ -21,7 +21,7 @@ defineProps<{
 @reference "tailwindcss";
 
 .content-header {
-  @apply relative z-10 w-full min-w-0 min-h-12 sm:min-h-14 flex items-center gap-2 sm:gap-3 px-2 sm:px-3 pt-3 sm:pt-4 pb-2 bg-white;
+  @apply relative z-[250] w-full min-w-0 min-h-12 sm:min-h-14 flex items-center gap-2 sm:gap-3 px-2 sm:px-3 pt-3 sm:pt-4 pb-2 bg-white;
 }
 
 .content-title {
diff --git a/src/components/content/HeaderGitBranchDropdown.vue b/src/components/content/HeaderGitBranchDropdown.vue
index b605f87b..1d7cac3a 100644
--- a/src/components/content/HeaderGitBranchDropdown.vue
+++ b/src/components/content/HeaderGitBranchDropdown.vue
@@ -15,89 +15,172 @@
     </button>
 
     <div v-if="isOpen" class="header-git-menu-wrap">
-      <div class="header-git-menu">
-        <button v-if="showReview" class="header-git-review-row" type="button" @click="emit('toggleReview')">
+      <div class="header-git-menu" :class="{ 'has-commit-files': Boolean(selectedCommit) }">
+        <button v-if="showReview" class="header-git-review-row" type="button" @click="toggleReview">
           <IconTablerFilePencil class="header-git-row-icon" />
-          <span>{{ reviewOpen ? 'Review (Open)' : 'Review' }}</span>
+          <span class="header-git-review-label">{{ reviewOpen ? 'Review Worktree Changes (Open)' : 'Review Worktree Changes' }}</span>
+          <span class="header-git-review-delta">
+            <span class="header-git-file-added">+{{ worktreeChangeSummary.addedLineCount }}</span>
+            <span class="header-git-file-removed">-{{ worktreeChangeSummary.removedLineCount }}</span>
+          </span>
         </button>
 
         <div class="header-git-state">
           <span class="header-git-state-label">{{ detached ? 'Detached HEAD' : 'Current branch' }}</span>
           <span class="header-git-state-value">{{ displayLabel }}</span>
-          <span v-if="detachedCommitMeta" class="header-git-state-meta">{{ detachedCommitMeta }}</span>
+          <span v-if="currentCommitSummary" class="header-git-state-meta">{{ currentCommitSummary }}</span>
         </div>
 
         <div v-if="statusMessage" class="header-git-status" :class="{ 'is-error': statusKind === 'error' }">
           {{ statusMessage }}
         </div>
 
-        <div class="header-git-search-wrap">
-          <input
-            ref="searchInputRef"
-            v-model="searchQuery"
-            class="header-git-search"
-            type="text"
-            placeholder="Search branches..."
-            @keydown.esc.prevent="onEscapeSearch"
-          />
-        </div>
-
-        <ul class="header-git-branches" role="listbox">
-          <li v-for="branch in filteredBranches" :key="branch.value" class="header-git-branch-item">
-            <div class="header-git-branch-row">
-              <button
-                class="header-git-branch-expand"
-                type="button"
-                :aria-label="expandedBranch === branch.value ? 'Hide commits' : 'Show commits'"
-                @click="toggleBranchCommits(branch.value)"
-              >
-                <IconTablerChevronRight class="header-git-expand-icon" :class="{ 'is-expanded': expandedBranch === branch.value }" />
-              </button>
+        <div class="header-git-columns" :class="{ 'has-commit-files': Boolean(selectedCommit) }">
+          <section v-if="selectedCommit" class="header-git-commit-detail-panel" aria-label="Commit files">
+            <div class="header-git-commit-detail-head">
+              <div class="header-git-commit-detail-title">
+                <button
+                  class="header-git-ref"
+                  type="button"
+                  :title="copiedCommitSha === selectedCommit.sha ? 'Copied commit ref' : `Copy ${selectedCommit.sha}`"
+                  @click.stop="copyCommitRef(selectedCommit)"
+                >
+                  {{ selectedCommit.shortSha }}
+                </button>
+                <span>{{ selectedCommit.date }}</span>
+              </div>
+              <p class="header-git-commit-detail-subject">{{ selectedCommit.subject }}</p>
               <button
-                class="header-git-branch-button"
-                :class="{ 'is-current': branch.value === currentBranch }"
+                class="header-git-reset-commit"
                 type="button"
-                :disabled="busy"
-                @click="emit('checkoutBranch', branch.value)"
+                :disabled="busy || selectedBranchIsRemote || !selectedBranch"
+                @click="resetSelectedCommit"
               >
-                <span class="header-git-branch-name">{{ branch.label }}</span>
-                <span v-if="branch.value === currentBranch" class="header-git-branch-meta">current</span>
-                <span v-else-if="branch.isRemote" class="header-git-branch-meta">remote</span>
+                Reset
               </button>
             </div>
 
-            <div v-if="expandedBranch === branch.value" class="header-git-commits">
-              <div v-if="commitsLoadingFor === branch.value" class="header-git-commits-empty">Loading commits...</div>
+            <div class="header-git-file-list">
+              <div v-if="commitFilesLoadingFor === selectedCommit.sha" class="header-git-files-empty">Loading files...</div>
+              <div v-else-if="commitFilesError" class="header-git-files-empty is-error">{{ commitFilesError }}</div>
+              <template v-else>
+                <button
+                  v-for="file in selectedCommitFiles"
+                  :key="`${file.status}:${file.previousPath ?? ''}:${file.path}`"
+                  class="header-git-file"
+                  type="button"
+                  :title="file.previousPath ? `${file.previousPath} → ${file.path}` : file.path"
+                  @click="openCommitFile(file.path)"
+                >
+                  <span class="header-git-file-meta-row">
+                    <span class="header-git-file-status">{{ file.label }}</span>
+                    <span class="header-git-file-delta">
+                      <span class="header-git-file-added">+{{ formatFileLineCount(file.addedLineCount) }}</span>
+                      <span class="header-git-file-removed">-{{ formatFileLineCount(file.removedLineCount) }}</span>
+                    </span>
+                  </span>
+                  <span class="header-git-file-path">{{ file.path }}</span>
+                  <span v-if="file.previousPath" class="header-git-file-previous-path">← {{ file.previousPath }}</span>
+                </button>
+                <div v-if="selectedCommitFiles.length === 0" class="header-git-files-empty">No file changes.</div>
+              </template>
+            </div>
+          </section>
+
+          <section class="header-git-commit-panel" aria-label="Branch commits">
+            <div class="header-git-search-wrap">
+              <input
+                v-model="commitSearchQuery"
+                class="header-git-search"
+                type="text"
+                placeholder="Search commits..."
+                @keydown.esc.prevent="onEscapeCommitSearch"
+              />
+            </div>
+            <label class="header-git-toggle-row">
+              <input v-model="showResetHistoryRefs" type="checkbox" @change="reloadSelectedBranchCommits" />
+              <span>Reset-history refs</span>
+            </label>
+            <div class="header-git-commit-list">
+              <div v-if="!selectedBranch" class="header-git-commits-empty">Select a branch.</div>
+              <div v-else-if="commitsLoadingFor === selectedBranchCommitsKey" class="header-git-commits-empty">Loading commits...</div>
               <div v-else-if="commitsError" class="header-git-commits-empty is-error">{{ commitsError }}</div>
-              <button
-                v-for="commit in commitsByBranch[branch.value] || []"
-                :key="commit.sha"
-                class="header-git-commit"
-                :class="{ 'is-current': isCurrentCommit(commit) }"
-                type="button"
-                :disabled="busy || branch.isRemote"
-                :title="commitActionTitle(branch, commit)"
-                @click="onSelectCommit(branch, commit)"
-              >
-                <span class="header-git-commit-top">
-                  <code>{{ commit.shortSha }}</code>
-                  <span class="header-git-commit-meta">
-                    <span v-if="isCurrentCommit(commit)" class="header-git-branch-meta">current</span>
-                    <span>{{ commit.date }}</span>
+              <template v-else>
+                <button
+                  v-for="commit in filteredSelectedBranchCommits"
+                  :key="commit.sha"
+                  class="header-git-commit"
+                  :class="{ 'is-current': isCurrentCommit(commit), 'is-selected': commit.sha === selectedCommitSha }"
+                  type="button"
+                  :disabled="busy"
+                  :title="selectedBranchCommitActionTitle(commit)"
+                  @click="onSelectCommit(commit)"
+                >
+                  <span class="header-git-commit-top">
+                    <span
+                      class="header-git-ref"
+                      role="button"
+                      tabindex="0"
+                      :title="copiedCommitSha === commit.sha ? 'Copied commit ref' : `Copy ${commit.sha}`"
+                      @click.stop="copyCommitRef(commit)"
+                      @keydown.enter.prevent.stop="copyCommitRef(commit)"
+                      @keydown.space.prevent.stop="copyCommitRef(commit)"
+                    >
+                      {{ commit.shortSha }}
+                    </span>
+                    <span class="header-git-commit-meta">
+                      <span v-if="isCurrentCommit(commit)" class="header-git-branch-meta">current</span>
+                      <span>{{ commit.date }}</span>
+                    </span>
                   </span>
-                </span>
-                <span class="header-git-commit-subject">{{ commit.subject }}</span>
-              </button>
-              <div
-                v-if="commitsLoadingFor !== branch.value && !commitsError && (commitsByBranch[branch.value] || []).length === 0"
-                class="header-git-commits-empty"
-              >
-                No commits found.
-              </div>
+                  <span class="header-git-commit-subject">{{ commit.subject }}</span>
+                </button>
+                <div v-if="filteredSelectedBranchCommits.length === 0" class="header-git-commits-empty">No commits found.</div>
+              </template>
+            </div>
+          </section>
+
+          <section class="header-git-branch-panel" aria-label="Branches">
+            <div class="header-git-search-wrap">
+              <input
+                ref="searchInputRef"
+                v-model="searchQuery"
+                class="header-git-search"
+                type="text"
+                placeholder="Search branches..."
+                @keydown.esc.prevent="onEscapeSearch"
+              />
             </div>
-          </li>
-          <li v-if="filteredBranches.length === 0" class="header-git-empty">No branches found.</li>
-        </ul>
+
+            <ul class="header-git-branches" role="listbox">
+              <li v-for="branch in filteredBranches" :key="branch.value" class="header-git-branch-item">
+                <div class="header-git-branch-row">
+                  <button
+                    class="header-git-branch-button"
+                    :class="{ 'is-current': branch.value === currentBranch, 'is-selected': branch.value === selectedBranch }"
+                    type="button"
+                    :disabled="busy"
+                    @click="selectBranch(branch.value)"
+                  >
+                    <span class="header-git-branch-name">{{ branch.label }}</span>
+                    <span v-if="branch.value === currentBranch" class="header-git-branch-meta">current</span>
+                    <span v-else-if="branch.isRemote" class="header-git-branch-meta">remote</span>
+                  </button>
+                  <button
+                    v-if="branch.value === selectedBranch && branch.value !== currentBranch && !branch.isRemote"
+                    class="header-git-branch-checkout"
+                    type="button"
+                    :disabled="busy"
+                    @click="emit('checkoutBranch', branch.value)"
+                  >
+                    Checkout
+                  </button>
+                </div>
+              </li>
+              <li v-if="filteredBranches.length === 0" class="header-git-empty">No branches found.</li>
+            </ul>
+          </section>
+        </div>
       </div>
     </div>
   </div>
@@ -105,9 +188,8 @@
 
 <script setup lang="ts">
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import type { GitCommitOption, WorktreeBranchOption } from '../../api/codexGateway'
+import type { GitCommitFileChange, GitCommitOption, WorktreeBranchOption } from '../../api/codexGateway'
 import IconTablerChevronDown from '../icons/IconTablerChevronDown.vue'
-import IconTablerChevronRight from '../icons/IconTablerChevronRight.vue'
 import IconTablerFilePencil from '../icons/IconTablerFilePencil.vue'
 import IconTablerGitFork from '../icons/IconTablerGitFork.vue'
 
@@ -118,10 +200,14 @@ const props = defineProps<{
   headDate: string | null
   detached: boolean
   dirty: boolean
+  worktreeChangeSummary: { addedLineCount: number; removedLineCount: number }
   branches: WorktreeBranchOption[]
   commitsByBranch: Record<string, GitCommitOption[]>
   commitsLoadingFor: string
   commitsError: string
+  commitFilesBySha: Record<string, GitCommitFileChange[]>
+  commitFilesLoadingFor: string
+  commitFilesError: string
   loading: boolean
   busy: boolean
   error: string
@@ -133,14 +219,21 @@ const emit = defineEmits<{
   toggleReview: []
   checkoutBranch: [branch: string]
   resetBranchToCommit: [payload: { branch: string; sha: string }]
-  loadCommits: [branch: string]
+  loadCommits: [payload: { branch: string; includeResetHistory: boolean }]
+  loadCommitFiles: [sha: string]
+  openCommitFile: [payload: { sha: string; path: string }]
 }>()
 
 const rootRef = ref<HTMLElement | null>(null)
 const searchInputRef = ref<HTMLInputElement | null>(null)
 const isOpen = ref(false)
 const searchQuery = ref('')
-const expandedBranch = ref('')
+const commitSearchQuery = ref('')
+const selectedBranch = ref('')
+const selectedCommitSha = ref('')
+const copiedCommitSha = ref('')
+const lastCurrentBranch = ref('')
+const showResetHistoryRefs = ref(true)
 const showReview = computed(() => props.showReview !== false)
 
 const displayLabel = computed(() => {
@@ -149,9 +242,11 @@ const displayLabel = computed(() => {
   if (props.headSha) return `Detached ${props.headSha}`
   return props.loading ? 'Loading branch...' : 'Detached HEAD'
 })
-const detachedCommitMeta = computed(() => {
-  if (!props.detached) return ''
-  return [props.headSha, props.headDate].filter(Boolean).join(' · ')
+const currentCommitSummary = computed(() => {
+  const details = [props.headSha, props.headDate].filter(Boolean).join(' · ')
+  const subject = props.headSubject?.trim() ?? ''
+  if (subject && details) return `${subject} (${details})`
+  return subject || details
 })
 const triggerLabel = computed(() => `Git branch: ${displayLabel.value}`)
 const disabled = computed(() => props.loading && props.branches.length === 0)
@@ -160,19 +255,55 @@ const statusMessage = computed(() => props.error || (props.dirty ? 'Tracked chan
 const statusKind = computed(() => props.error ? 'error' : 'info')
 const filteredBranches = computed(() => {
   const query = searchQuery.value.trim().toLowerCase()
-  const branches = props.branches
+  const branches = [...props.branches].sort((a, b) => {
+    if (a.isRemote === true && b.isRemote !== true) return 1
+    if (a.isRemote !== true && b.isRemote === true) return -1
+    return 0
+  })
   if (!query) return branches
   return branches.filter((branch) => branch.label.toLowerCase().includes(query) || branch.value.toLowerCase().includes(query))
 })
+const selectedBranchOption = computed(() => props.branches.find((branch) => branch.value === selectedBranch.value) ?? null)
+const selectedBranchIsRemote = computed(() => selectedBranchOption.value?.isRemote === true)
+const selectedBranchCommitsKey = computed(() => {
+  if (!selectedBranch.value) return ''
+  return `${selectedBranch.value}\u0000${showResetHistoryRefs.value ? 'with-reset-history' : 'without-reset-history'}`
+})
+const selectedBranchCommits = computed(() => selectedBranchCommitsKey.value ? props.commitsByBranch[selectedBranchCommitsKey.value] || [] : [])
+const selectedCommit = computed(() => selectedBranchCommits.value.find((commit) => commit.sha === selectedCommitSha.value) ?? null)
+const selectedCommitFiles = computed(() => selectedCommit.value ? props.commitFilesBySha[selectedCommit.value.sha] || [] : [])
+const filteredSelectedBranchCommits = computed(() => {
+  const query = commitSearchQuery.value.trim().toLowerCase()
+  const commits = selectedBranchCommits.value
+  if (!query) return commits
+  return commits.filter((commit) => {
+    return (
+      commit.sha.toLowerCase().includes(query) ||
+      commit.shortSha.toLowerCase().includes(query) ||
+      commit.subject.toLowerCase().includes(query) ||
+      commit.date.toLowerCase().includes(query)
+    )
+  })
+})
 
 function toggleOpen(): void {
   if (disabled.value) return
   isOpen.value = !isOpen.value
 }
 
-function toggleBranchCommits(branch: string): void {
-  expandedBranch.value = expandedBranch.value === branch ? '' : branch
-  if (expandedBranch.value) emit('loadCommits', branch)
+function toggleReview(): void {
+  emit('toggleReview')
+}
+
+function selectBranch(branch: string): void {
+  selectedBranch.value = branch
+  selectedCommitSha.value = ''
+  emit('loadCommits', { branch, includeResetHistory: showResetHistoryRefs.value })
+}
+
+function reloadSelectedBranchCommits(): void {
+  if (!selectedBranch.value) return
+  emit('loadCommits', { branch: selectedBranch.value, includeResetHistory: showResetHistoryRefs.value })
 }
 
 function isCurrentCommit(commit: GitCommitOption): boolean {
@@ -181,14 +312,63 @@ function isCurrentCommit(commit: GitCommitOption): boolean {
   return commit.sha === headSha || commit.shortSha === headSha || commit.sha.startsWith(headSha)
 }
 
-function commitActionTitle(branch: WorktreeBranchOption, commit: GitCommitOption): string {
-  if (branch.isRemote) return 'Remote branches cannot be reset from this menu'
-  return `Reset ${branch.value} to ${commit.shortSha}`
+function selectedBranchCommitActionTitle(commit: GitCommitOption): string {
+  return `Show ${commit.shortSha} files`
+}
+
+function onSelectCommit(commit: GitCommitOption): void {
+  selectedCommitSha.value = commit.sha
+  emit('loadCommitFiles', commit.sha)
+}
+
+function copyCommitRef(commit: GitCommitOption): void {
+  const value = commit.sha.trim() || commit.shortSha.trim()
+  if (!value) return
+  copiedCommitSha.value = commit.sha
+  void copyTextToClipboard(value).catch(() => {
+    copiedCommitSha.value = ''
+  })
+}
+
+async function copyTextToClipboard(value: string): Promise<void> {
+  try {
+    if (navigator.clipboard?.writeText) {
+      await navigator.clipboard.writeText(value)
+      return
+    }
+  } catch {
+    // Fall back for embedded browser contexts without clipboard permission.
+  }
+  const textarea = document.createElement('textarea')
+  textarea.value = value
+  textarea.setAttribute('readonly', 'true')
+  textarea.style.position = 'fixed'
+  textarea.style.top = '-9999px'
+  textarea.style.left = '-9999px'
+  document.body.appendChild(textarea)
+  textarea.select()
+  const copied = document.execCommand('copy')
+  textarea.remove()
+  if (!copied) throw new Error('Copy failed')
+}
+
+function resetSelectedCommit(): void {
+  if (!selectedBranch.value || !selectedCommit.value || selectedBranchIsRemote.value) return
+  emit('resetBranchToCommit', { branch: selectedBranch.value, sha: selectedCommit.value.sha })
+}
+
+function formatFileLineCount(value: number | null): string {
+  return typeof value === 'number' && Number.isFinite(value) ? String(value) : '-'
 }
 
-function onSelectCommit(branch: WorktreeBranchOption, commit: GitCommitOption): void {
-  if (branch.isRemote) return
-  emit('resetBranchToCommit', { branch: branch.value, sha: commit.sha })
+function openCommitFile(filePath: string): void {
+  if (!selectedCommit.value) return
+  emit('openCommitFile', { sha: selectedCommit.value.sha, path: filePath })
+  isOpen.value = false
+  searchQuery.value = ''
+  commitSearchQuery.value = ''
+  selectedCommitSha.value = ''
+  copiedCommitSha.value = ''
 }
 
 function onEscapeSearch(): void {
@@ -197,6 +377,18 @@ function onEscapeSearch(): void {
     return
   }
   isOpen.value = false
+  selectedCommitSha.value = ''
+  copiedCommitSha.value = ''
+}
+
+function onEscapeCommitSearch(): void {
+  if (commitSearchQuery.value) {
+    commitSearchQuery.value = ''
+    return
+  }
+  isOpen.value = false
+  selectedCommitSha.value = ''
+  copiedCommitSha.value = ''
 }
 
 function onDocumentPointerDown(event: PointerEvent): void {
@@ -206,10 +398,56 @@ function onDocumentPointerDown(event: PointerEvent): void {
   if (!root || !(target instanceof Node) || root.contains(target)) return
   isOpen.value = false
   searchQuery.value = ''
+  commitSearchQuery.value = ''
+  selectedCommitSha.value = ''
+}
+
+function preferredBranch(): string {
+  const currentBranch = props.currentBranch?.trim()
+  if (currentBranch) return currentBranch
+  return props.branches[0]?.value ?? ''
+}
+
+function ensureSelectedBranchCommits(): void {
+  const targetBranch = selectedBranch.value || preferredBranch()
+  if (!targetBranch) return
+  selectedBranch.value = targetBranch
+  emit('loadCommits', { branch: targetBranch, includeResetHistory: showResetHistoryRefs.value })
 }
 
 watch(isOpen, (open) => {
-  if (open) void nextTick(() => searchInputRef.value?.focus())
+  if (!open) return
+  ensureSelectedBranchCommits()
+  void nextTick(() => searchInputRef.value?.focus())
+})
+
+watch(
+  () => [props.currentBranch, props.branches.map((branch) => branch.value).join('\n')] as const,
+  () => {
+    const targetBranch = preferredBranch()
+    if (!targetBranch) {
+      selectedBranch.value = ''
+      lastCurrentBranch.value = ''
+      return
+    }
+    const currentBranch = props.currentBranch?.trim() ?? ''
+    const currentBranchChanged = currentBranch !== lastCurrentBranch.value
+    lastCurrentBranch.value = currentBranch
+    if (currentBranchChanged || !selectedBranch.value || !props.branches.some((branch) => branch.value === selectedBranch.value)) {
+      selectedBranch.value = targetBranch
+    }
+    if (isOpen.value && selectedBranch.value) {
+      emit('loadCommits', { branch: selectedBranch.value, includeResetHistory: showResetHistoryRefs.value })
+    }
+  },
+  { immediate: true },
+)
+
+watch(selectedBranchCommits, (commits) => {
+  if (!selectedCommitSha.value) return
+  if (!commits.some((commit) => commit.sha === selectedCommitSha.value)) {
+    selectedCommitSha.value = ''
+  }
 })
 
 onMounted(() => window.addEventListener('pointerdown', onDocumentPointerDown))
@@ -246,21 +484,35 @@ onBeforeUnmount(() => window.removeEventListener('pointerdown', onDocumentPointe
 }
 
 .header-git-menu-wrap {
-  @apply absolute right-0 top-[calc(100%+8px)] z-50;
+  @apply fixed right-3 top-[4.25rem] z-[1000];
 }
 
 .header-git-menu {
-  @apply w-80 max-w-[calc(100vw-1.5rem)] rounded-xl border border-zinc-200 bg-white p-1 shadow-lg;
+  @apply w-[42rem] max-w-[calc(100vw-1.5rem)] rounded-xl border border-zinc-200 bg-white p-1 shadow-lg;
+}
+
+.header-git-menu.has-commit-files {
+  @apply w-[58rem];
 }
 
 .header-git-review-row,
 .header-git-branch-button,
-.header-git-commit {
+.header-git-branch-checkout,
+.header-git-commit,
+.header-git-file {
   @apply flex w-full border-0 bg-transparent text-left transition;
 }
 
 .header-git-review-row {
-  @apply items-center gap-2 rounded-lg px-2 py-1.5 text-sm text-zinc-800 hover:bg-zinc-100;
+  @apply mb-1 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-2.5 py-2 text-sm font-medium text-zinc-800 shadow-sm hover:bg-zinc-50;
+}
+
+.header-git-review-label {
+  @apply min-w-0 flex-1 truncate;
+}
+
+.header-git-review-delta {
+  @apply ml-auto inline-flex shrink-0 items-center gap-1 text-xs font-medium;
 }
 
 .header-git-state {
@@ -295,6 +547,36 @@ onBeforeUnmount(() => window.removeEventListener('pointerdown', onDocumentPointe
   @apply w-full rounded-md border border-zinc-200 bg-white px-2 py-1.5 text-xs text-zinc-800 outline-none transition focus:border-zinc-400;
 }
 
+.header-git-toggle-row {
+  @apply mx-1 mb-1 flex items-center gap-2 rounded-md px-1 py-1 text-xs text-zinc-500;
+}
+
+.header-git-toggle-row input {
+  @apply h-3.5 w-3.5 shrink-0;
+}
+
+.header-git-columns {
+  @apply grid min-h-80 grid-cols-[minmax(0,1.15fr)_minmax(13rem,0.85fr)] gap-1;
+}
+
+.header-git-columns.has-commit-files {
+  @apply grid-cols-[minmax(0,1.1fr)_minmax(12rem,0.75fr)_minmax(13rem,0.8fr)];
+}
+
+.header-git-commit-panel,
+.header-git-branch-panel,
+.header-git-commit-detail-panel {
+  @apply min-w-0 rounded-lg border border-zinc-100 bg-zinc-50 p-1;
+}
+
+.header-git-commit-list {
+  @apply max-h-80 overflow-y-auto;
+}
+
+.header-git-file-list {
+  @apply max-h-64 overflow-y-auto;
+}
+
 .header-git-branches {
   @apply m-0 max-h-80 list-none overflow-y-auto p-0;
 }
@@ -307,24 +589,21 @@ onBeforeUnmount(() => window.removeEventListener('pointerdown', onDocumentPointe
   @apply flex items-stretch gap-1;
 }
 
-.header-git-branch-expand {
-  @apply flex w-7 shrink-0 items-center justify-center rounded-lg border-0 bg-transparent text-zinc-500 transition hover:bg-zinc-100;
-}
-
-.header-git-expand-icon {
-  @apply h-4 w-4 transition-transform;
+.header-git-branch-button {
+  @apply min-w-0 flex-1 items-center justify-between gap-2 rounded-lg px-2 py-1.5 text-sm text-zinc-700 hover:bg-zinc-100 disabled:cursor-wait;
 }
 
-.header-git-expand-icon.is-expanded {
-  @apply rotate-90;
+.header-git-branch-button.is-current,
+.header-git-branch-button.is-selected {
+  @apply bg-zinc-100 text-zinc-950;
 }
 
-.header-git-branch-button {
-  @apply min-w-0 flex-1 items-center justify-between gap-2 rounded-lg px-2 py-1.5 text-sm text-zinc-700 hover:bg-zinc-100 disabled:cursor-wait;
+.header-git-branch-button.is-selected {
+  @apply ring-1 ring-zinc-300;
 }
 
-.header-git-branch-button.is-current {
-  @apply bg-zinc-100 text-zinc-950;
+.header-git-branch-checkout {
+  @apply w-auto shrink-0 items-center rounded-lg px-2 py-1.5 text-xs text-zinc-500 hover:bg-zinc-100 hover:text-zinc-800 disabled:cursor-wait;
 }
 
 .header-git-branch-name,
@@ -337,7 +616,7 @@ onBeforeUnmount(() => window.removeEventListener('pointerdown', onDocumentPointe
 }
 
 .header-git-commits {
-  @apply ml-8 mr-1 mb-1 rounded-lg border border-zinc-100 bg-zinc-50 p-1;
+  @apply rounded-lg border border-zinc-100 bg-zinc-50 p-1;
 }
 
 .header-git-commit {
@@ -348,6 +627,10 @@ onBeforeUnmount(() => window.removeEventListener('pointerdown', onDocumentPointe
   @apply bg-white ring-1 ring-zinc-300;
 }
 
+.header-git-commit.is-selected {
+  @apply bg-white ring-1 ring-zinc-400;
+}
+
 .header-git-commit-top {
   @apply flex items-center justify-between gap-2 text-[0.68rem] text-zinc-500;
 }
@@ -356,8 +639,8 @@ onBeforeUnmount(() => window.removeEventListener('pointerdown', onDocumentPointe
   @apply flex shrink-0 items-center gap-1.5;
 }
 
-.header-git-commit-top code {
-  @apply rounded bg-zinc-200 px-1 py-0.5 font-mono text-[0.68rem] text-zinc-700;
+.header-git-ref {
+  @apply inline-flex w-fit max-w-full items-center rounded border-0 bg-zinc-200 px-1 py-0.5 font-mono text-[0.68rem] text-zinc-700 outline-none transition hover:bg-zinc-300 focus-visible:ring-1 focus-visible:ring-zinc-500;
 }
 
 .header-git-empty,
@@ -368,4 +651,102 @@ onBeforeUnmount(() => window.removeEventListener('pointerdown', onDocumentPointe
 .header-git-commits-empty.is-error {
   @apply text-red-700;
 }
+
+.header-git-commit-detail-head {
+  @apply rounded-lg bg-white p-2;
+}
+
+.header-git-commit-detail-title {
+  @apply flex items-center justify-between gap-2 text-[0.68rem] text-zinc-500;
+}
+
+.header-git-commit-detail-subject {
+  @apply m-0 mt-1 line-clamp-2 text-xs text-zinc-800;
+}
+
+.header-git-reset-commit {
+  @apply mt-2 w-full rounded-md border border-zinc-200 bg-zinc-900 px-2 py-1.5 text-xs font-medium text-white transition hover:bg-zinc-800 disabled:cursor-wait disabled:border-zinc-200 disabled:bg-zinc-100 disabled:text-zinc-400;
+}
+
+.header-git-file {
+  @apply mt-1 flex-col gap-1 rounded-md px-2 py-1.5 text-xs text-zinc-700 hover:bg-white;
+}
+
+.header-git-file-meta-row {
+  @apply flex min-w-0 items-center justify-between gap-2;
+}
+
+.header-git-file-status {
+  @apply w-fit rounded bg-zinc-200 px-1.5 py-0.5 text-[0.65rem] uppercase text-zinc-600;
+}
+
+.header-git-file-delta {
+  @apply flex shrink-0 items-center gap-1 font-mono text-[0.68rem];
+}
+
+.header-git-file-added {
+  @apply text-emerald-600;
+}
+
+.header-git-file-removed {
+  @apply text-red-600;
+}
+
+.header-git-file-path {
+  @apply min-w-0 truncate;
+}
+
+.header-git-file-previous-path {
+  @apply min-w-0 truncate text-[0.68rem] text-zinc-500;
+}
+
+.header-git-files-empty {
+  @apply px-2 py-2 text-xs text-zinc-500;
+}
+
+.header-git-files-empty.is-error {
+  @apply text-red-700;
+}
+
+@media (max-width: 640px) {
+  .header-git-menu-wrap {
+    @apply left-2 right-2 top-[4.5rem];
+  }
+
+  .header-git-menu,
+  .header-git-menu.has-commit-files {
+    @apply w-auto max-w-none overflow-y-auto;
+    max-height: calc(100vh - 5.25rem);
+  }
+
+  .header-git-review-row {
+    @apply px-3 py-2.5;
+  }
+
+  .header-git-columns {
+    @apply min-h-0 grid-cols-1;
+  }
+
+  .header-git-columns.has-commit-files {
+    @apply grid-cols-1;
+  }
+
+  .header-git-branch-panel {
+    @apply order-1;
+  }
+
+  .header-git-commit-panel {
+    @apply order-2;
+  }
+
+  .header-git-commit-detail-panel {
+    @apply order-3;
+  }
+
+  .header-git-commit-list,
+  .header-git-branches,
+  .header-git-file-list {
+    @apply max-h-48;
+  }
+}
 </style>
diff --git a/src/components/content/ReviewPane.vue b/src/components/content/ReviewPane.vue
index 3d446699..b943748a 100644
--- a/src/components/content/ReviewPane.vue
+++ b/src/components/content/ReviewPane.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="review-pane" :class="{ 'is-mobile': isMobile }" @click.stop>
+  <section class="review-pane" :class="{ 'is-mobile': isMobile }" @pointerdown.stop @click.stop>
     <header class="review-pane-header">
       <div class="review-pane-heading">
         <p class="review-pane-eyebrow">{{ t('Review') }}</p>
@@ -7,7 +7,7 @@
       </div>
       <div class="review-pane-header-actions">
         <button
-          v-if="isMobile && activeTab === 'changes' && snapshot?.files.length"
+          v-if="isMobile && snapshot?.files.length"
           type="button"
           class="review-pane-mobile-files-button"
           @click="isFileSheetOpen = true"
@@ -21,23 +21,8 @@
     </header>
 
     <div class="review-pane-toolbar">
-      <div class="review-pane-toolbar-tabs">
-        <div class="review-pane-segmented review-pane-segmented-primary">
-          <button
-            v-for="tab in reviewTabs"
-            :key="tab.value"
-            type="button"
-            class="review-pane-segmented-button review-pane-tab"
-            :data-active="activeTab === tab.value"
-            @click="activeTab = tab.value"
-          >
-            {{ tab.label }}
-          </button>
-        </div>
-      </div>
-
       <div class="review-pane-toolbar-controls">
-        <div class="review-pane-control-cluster">
+        <div v-if="!isCommitReview" class="review-pane-control-cluster">
           <span class="review-pane-control-label">{{ t('Compare') }}</span>
           <div class="review-pane-segmented">
             <button
@@ -60,7 +45,7 @@
           </div>
         </div>
 
-        <div v-if="activeScope === 'baseBranch' && snapshot?.baseBranchOptions.length" class="review-pane-control-cluster">
+        <div v-if="!isCommitReview && activeScope === 'baseBranch' && snapshot?.baseBranchOptions.length" class="review-pane-control-cluster">
           <span class="review-pane-control-label">{{ t('Branch') }}</span>
           <label class="review-pane-branch-select-wrap">
             <select
@@ -78,7 +63,7 @@
           </label>
         </div>
 
-        <div v-if="activeScope === 'workspace'" class="review-pane-control-cluster">
+        <div v-if="!isCommitReview && activeScope === 'workspace'" class="review-pane-control-cluster">
           <span class="review-pane-control-label">{{ t('Changes') }}</span>
           <div class="review-pane-segmented">
             <button
@@ -102,14 +87,6 @@
       </div>
 
       <div class="review-pane-toolbar-actions">
-        <button
-          type="button"
-          class="review-pane-run"
-          :disabled="!canRunReview || isRunningReview"
-          @click="runReview"
-        >
-          {{ isRunningReview ? t('Reviewing…') : t('Run review') }}
-        </button>
         <button type="button" class="review-pane-refresh" :disabled="isLoadingSnapshot" @click="reloadAll">
           {{ t('Refresh') }}
         </button>
@@ -125,10 +102,11 @@
       <span class="review-pane-summary-pill review-pane-summary-pill-add">+{{ snapshot.summary.addedLineCount }}</span>
       <span class="review-pane-summary-pill review-pane-summary-pill-remove">-{{ snapshot.summary.removedLineCount }}</span>
       <span v-if="snapshot.headBranch">{{ snapshot.headBranch }}</span>
+      <span v-if="isCommitReview && snapshot.commitSha">{{ shortCommitSha(snapshot.commitSha) }}</span>
       <span v-if="activeScope === 'baseBranch' && snapshot.baseBranch">vs {{ snapshot.baseBranch }}</span>
     </div>
 
-    <div v-if="activeTab === 'changes'" class="review-pane-content">
+    <div class="review-pane-content">
       <template v-if="!snapshot">
         <div class="review-pane-empty">
           <p class="review-pane-empty-title">{{ t('Loading review state') }}</p>
@@ -145,7 +123,7 @@
         </div>
       </template>
 
-      <template v-else-if="activeScope === 'baseBranch' && !snapshot.baseBranch">
+      <template v-else-if="!isCommitReview && activeScope === 'baseBranch' && !snapshot.baseBranch">
         <div class="review-pane-empty">
           <p class="review-pane-empty-title">{{ t('Base branch unavailable') }}</p>
           <p class="review-pane-empty-text">{{ t('Could not resolve `origin/HEAD`, `main`, or `master` for this repository.') }}</p>
@@ -169,7 +147,7 @@
         <div v-if="!snapshot.files.length" class="review-pane-empty">
           <p class="review-pane-empty-title">{{ t('No changes in this scope') }}</p>
           <p class="review-pane-empty-text">
-            {{ activeScope === 'workspace' ? t('Your current workspace is clean.') : t('No merge diff found against the base branch.') }}
+            {{ emptyReviewMessage }}
           </p>
         </div>
 
@@ -193,18 +171,15 @@
                 v-else
                 type="button"
                 class="review-pane-file review-pane-tree-file"
-                :style="treeIndentStyle(node.depth)"
+                :style="treeFileIndentStyle()"
                 :data-active="selectedFile?.id === node.file.id"
                 :title="node.file.path"
                 @click="selectFile(node.file.id)"
               >
                 <span class="review-pane-file-meta-row">
-                  <span class="review-pane-file-main">
-                    <span class="review-pane-file-op" :data-operation="node.file.operation">{{ formatOperation(node.file.operation) }}</span>
-                    <span class="review-pane-file-path">
-                      {{ node.name }}
-                      <template v-if="node.file.previousPath"> ← {{ fileBaseName(node.file.previousPath) }}</template>
-                    </span>
+                  <span class="review-pane-file-path">
+                    {{ node.name }}
+                    <template v-if="node.file.previousPath"> ← {{ fileBaseName(node.file.previousPath) }}</template>
                   </span>
                   <span class="review-pane-file-delta">
                     <span class="review-pane-delta-add">+{{ node.file.addedLineCount }}</span>
@@ -212,6 +187,7 @@
                     <span class="review-pane-delta-remove">-{{ node.file.removedLineCount }}</span>
                   </span>
                 </span>
+                <span class="review-pane-file-op" :data-operation="node.file.operation">{{ formatOperation(node.file.operation) }}</span>
               </button>
             </template>
           </aside>
@@ -259,7 +235,6 @@
                 <article
                   v-for="hunk in selectedFile.hunks"
                   :key="hunk.id"
-                  :ref="(element) => bindHunkRef(hunk.id, element)"
                   class="review-pane-hunk"
                   :data-active="selectedHunkId === hunk.id"
                   @click="selectedHunkId = hunk.id"
@@ -304,36 +279,6 @@
       </template>
     </div>
 
-    <div v-else class="review-pane-findings">
-      <div v-if="currentReviewResult?.summary" class="review-pane-summary-card">
-        <p class="review-pane-summary-title">Summary</p>
-        <pre class="review-pane-summary-text">{{ currentReviewResult.summary }}</pre>
-      </div>
-
-      <div v-if="currentReviewResult?.findings.length" class="review-pane-findings-list">
-        <button
-          v-for="finding in currentReviewResult.findings"
-          :key="finding.id"
-          type="button"
-          class="review-pane-finding"
-          @click="openFinding(finding)"
-        >
-          <span class="review-pane-finding-title">{{ finding.title }}</span>
-          <span v-if="finding.absolutePath" class="review-pane-finding-location">
-            {{ formatFindingLocation(finding) }}
-          </span>
-          <span v-if="finding.body" class="review-pane-finding-body">{{ finding.body }}</span>
-        </button>
-      </div>
-
-      <div v-else class="review-pane-empty">
-        <p class="review-pane-empty-title">No structured findings yet</p>
-        <p class="review-pane-empty-text">
-          {{ currentReviewResult?.summary ? 'The latest review only returned summary text.' : 'Run review to populate this pane.' }}
-        </p>
-      </div>
-    </div>
-
     <Transition name="review-pane-sheet">
       <div
         v-if="isMobile && isFileSheetOpen && snapshot?.files.length"
@@ -365,18 +310,15 @@
                 v-else
                 type="button"
                 class="review-pane-file review-pane-tree-file"
-                :style="treeIndentStyle(node.depth)"
+                :style="treeFileIndentStyle()"
                 :data-active="selectedFile?.id === node.file.id"
                 :title="node.file.path"
                 @click="selectFile(node.file.id)"
               >
                 <span class="review-pane-file-meta-row">
-                  <span class="review-pane-file-main">
-                    <span class="review-pane-file-op" :data-operation="node.file.operation">{{ formatOperation(node.file.operation) }}</span>
-                    <span class="review-pane-file-path">
-                      {{ node.name }}
-                      <template v-if="node.file.previousPath"> ← {{ fileBaseName(node.file.previousPath) }}</template>
-                    </span>
+                  <span class="review-pane-file-path">
+                    {{ node.name }}
+                    <template v-if="node.file.previousPath"> ← {{ fileBaseName(node.file.previousPath) }}</template>
                   </span>
                   <span class="review-pane-file-delta">
                     <span class="review-pane-delta-add">+{{ node.file.addedLineCount }}</span>
@@ -384,6 +326,7 @@
                     <span class="review-pane-delta-remove">-{{ node.file.removedLineCount }}</span>
                   </span>
                 </span>
+                <span class="review-pane-file-op" :data-operation="node.file.operation">{{ formatOperation(node.file.operation) }}</span>
               </button>
             </template>
           </div>
@@ -394,13 +337,11 @@
 </template>
 
 <script setup lang="ts">
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import {
   applyReviewAction,
   getReviewSnapshot,
-  getThreadReviewResult,
   initializeReviewGit,
-  startThreadReview,
   subscribeCodexNotifications,
   type RpcNotification,
 } from '../../api/codexGateway'
@@ -408,11 +349,8 @@ import { useMobile } from '../../composables/useMobile'
 import { useUiLanguage } from '../../composables/useUiLanguage'
 import type {
   UiReviewAction,
-  UiReviewFinding,
-  UiReviewResult,
   UiReviewScope,
   UiReviewSnapshot,
-  UiReviewTab,
   UiReviewWorkspaceView,
   UiReviewFile,
   UiReviewHunk,
@@ -423,6 +361,8 @@ const props = defineProps<{
   threadId: string
   cwd: string
   isThreadInProgress: boolean
+  initialFilePath?: string
+  commitSha?: string
 }>()
 
 defineEmits<{
@@ -432,7 +372,6 @@ defineEmits<{
 const { isMobile } = useMobile()
 const { t } = useUiLanguage()
 
-const activeTab = ref<UiReviewTab>('changes')
 const activeScope = ref<UiReviewScope>('workspace')
 const workspaceView = ref<UiReviewWorkspaceView>('unstaged')
 const snapshot = ref<UiReviewSnapshot | null>(null)
@@ -443,22 +382,13 @@ const selectedHunkId = ref('')
 const isFileSheetOpen = ref(false)
 const isLoadingSnapshot = ref(false)
 const isApplyingAction = ref(false)
-const isRunningReview = ref(false)
 const isInitializingGit = ref(false)
 const snapshotError = ref('')
 const reviewError = ref('')
 const reviewStatusLabel = ref('')
-const reviewResultsByKey = ref<Record<string, UiReviewResult | null>>({})
-const pendingReviewKey = ref('')
-const hunkRefs = new Map<string, HTMLElement>()
 let stopNotifications: (() => void) | null = null
 let stopResizeTracking: (() => void) | null = null
 
-const reviewTabs = [
-  { value: 'changes' as const, label: t('Changes') },
-  { value: 'findings' as const, label: t('Findings') },
-]
-
 type ReviewTreeFolderNode = {
   kind: 'folder'
   treeKey: string
@@ -493,29 +423,56 @@ type MutableReviewTreeFolder = {
   files: MutableReviewTreeFile[]
 }
 
-const reviewKey = computed(() => `${activeScope.value}:${workspaceView.value}`)
-const currentReviewResult = computed(() => reviewResultsByKey.value[reviewKey.value] ?? null)
 const selectedFile = computed(() => snapshot.value?.files.find((file) => file.id === selectedFileId.value) ?? snapshot.value?.files[0] ?? null)
 const folderExpansionState = ref<Record<string, boolean>>({})
+const isCommitReview = computed(() => Boolean(props.commitSha?.trim()))
+const emptyReviewMessage = computed(() => {
+  if (snapshot.value?.scope === 'commit' || isCommitReview.value) {
+    return t('No file changes in this commit.')
+  }
+  return activeScope.value === 'workspace'
+    ? t('Your current workspace is clean.')
+    : t('No merge diff found against the base branch.')
+})
+
+function normalizeReviewPath(filePath: string): string {
+  return filePath.trim().replace(/\\/g, '/')
+}
+
+function findFileByPath(filePath: string): UiReviewFile | null {
+  const targetPath = normalizeReviewPath(filePath)
+  if (!targetPath || !snapshot.value) return null
+  return snapshot.value.files.find((file) => {
+    return [
+      file.path,
+      file.absolutePath,
+      file.previousPath,
+      file.previousAbsolutePath,
+    ].some((candidate) => typeof candidate === 'string' && normalizeReviewPath(candidate) === targetPath)
+  }) ?? null
+}
+
+function selectInitialFilePath(): boolean {
+  const targetFile = findFileByPath(props.initialFilePath ?? '')
+  if (!targetFile) return false
+  selectFile(targetFile.id)
+  return true
+}
 
 const headerTitle = computed(() => {
   if (!snapshot.value?.isGitRepo) return t('Repository review')
+  if (isCommitReview.value) {
+    return snapshot.value.commitSha ? `${t('Commit')} ${shortCommitSha(snapshot.value.commitSha)}` : t('Commit')
+  }
   if (activeScope.value === 'workspace') {
     return workspaceView.value === 'staged' ? t('Staged changes') : t('Workspace changes')
   }
   return snapshot.value?.baseBranch ? `${t('Against')} ${snapshot.value.baseBranch}` : t('Base branch')
 })
 
-const canRunReview = computed(() => (
-  props.threadId.trim().length > 0
-  && props.cwd.trim().length > 0
-  && snapshot.value?.isGitRepo === true
-  && !props.isThreadInProgress
-  && !(activeScope.value === 'baseBranch' && !snapshot.value?.baseBranch)
-))
-
 const showBulkActions = computed(() => (
-  activeScope.value === 'workspace'
+  !isCommitReview.value
+  && activeScope.value === 'workspace'
   && snapshot.value?.isGitRepo === true
   && snapshot.value.files.length > 0
 ))
@@ -758,6 +715,12 @@ function treeIndentStyle(depth: number): Record<string, string> {
   }
 }
 
+function treeFileIndentStyle(): Record<string, string> {
+  return {
+    paddingLeft: isMobile.value ? '8px' : '10px',
+  }
+}
+
 function formatOperation(operation: string): string {
   if (operation === 'add') return 'Added'
   if (operation === 'delete') return 'Deleted'
@@ -765,14 +728,6 @@ function formatOperation(operation: string): string {
   return 'Modified'
 }
 
-function bindHunkRef(hunkId: string, element: unknown): void {
-  if (!(element instanceof HTMLElement)) {
-    hunkRefs.delete(hunkId)
-    return
-  }
-  hunkRefs.set(hunkId, element)
-}
-
 function extractNotificationThreadId(notification: RpcNotification): string {
   const params = notification.params !== null && typeof notification.params === 'object' && !Array.isArray(notification.params)
     ? notification.params as Record<string, unknown>
@@ -786,11 +741,13 @@ async function loadSnapshot(): Promise<void> {
   snapshotError.value = ''
   try {
     const desiredBaseBranch = activeScope.value === 'baseBranch' ? selectedBaseBranch.value.trim() : ''
+    const desiredCommitSha = props.commitSha?.trim() ?? ''
     const nextSnapshot = await getReviewSnapshot(
       props.cwd,
-      activeScope.value,
+      isCommitReview.value ? 'commit' : activeScope.value,
       workspaceView.value,
       desiredBaseBranch || null,
+      desiredCommitSha || null,
     )
     if (nextSnapshot.baseBranchOptions.length > 0) {
       const normalizedBaseBranch = nextSnapshot.baseBranch ?? nextSnapshot.baseBranchOptions[0] ?? ''
@@ -806,7 +763,7 @@ async function loadSnapshot(): Promise<void> {
     }
     snapshot.value = nextSnapshot
     const hasSelectedFile = nextSnapshot.files.some((file) => file.id === selectedFileId.value)
-    if (!hasSelectedFile) {
+    if (!selectInitialFilePath() && !hasSelectedFile) {
       selectedFileId.value = nextSnapshot.files[0]?.id ?? ''
       selectedHunkId.value = nextSnapshot.files[0]?.hunks[0]?.id ?? ''
     }
@@ -817,26 +774,8 @@ async function loadSnapshot(): Promise<void> {
   }
 }
 
-async function loadLatestReviewResult(): Promise<void> {
-  if (!props.threadId.trim()) return
-  try {
-    const reviewState = await getThreadReviewResult(props.threadId)
-    if (reviewState.result) {
-      reviewResultsByKey.value = {
-        ...reviewResultsByKey.value,
-        [reviewKey.value]: reviewState.result,
-      }
-    }
-  } catch {
-    // Keep the pane usable even if thread history refresh fails.
-  }
-}
-
 async function reloadAll(): Promise<void> {
-  await Promise.all([
-    loadSnapshot(),
-    loadLatestReviewResult(),
-  ])
+  await loadSnapshot()
 }
 
 function selectFile(fileId: string): void {
@@ -849,6 +788,10 @@ function selectFile(fileId: string): void {
   }
 }
 
+function shortCommitSha(value: string): string {
+  return value.trim().slice(0, 7)
+}
+
 async function applyAction(action: UiReviewAction, level: 'all' | 'file' | 'hunk', patch = ''): Promise<void> {
   if (!snapshot.value) return
   isApplyingAction.value = true
@@ -902,77 +845,6 @@ async function initializeGit(): Promise<void> {
   }
 }
 
-async function runReview(): Promise<void> {
-  if (!canRunReview.value || isRunningReview.value) return
-  reviewError.value = ''
-  reviewStatusLabel.value = activeScope.value === 'workspace'
-    ? 'Reviewing current changes'
-    : `Reviewing against ${snapshot.value?.baseBranch ?? 'base branch'}`
-  isRunningReview.value = true
-  pendingReviewKey.value = reviewKey.value
-
-  try {
-    await startThreadReview(
-      props.threadId,
-      activeScope.value,
-      workspaceView.value,
-      selectedBaseBranch.value || (snapshot.value?.baseBranch ?? null),
-    )
-  } catch (error) {
-    isRunningReview.value = false
-    reviewStatusLabel.value = ''
-    reviewError.value = error instanceof Error ? error.message : 'Failed to start review'
-  }
-}
-
-function formatFindingLocation(finding: UiReviewFinding): string {
-  if (!finding.absolutePath) return ''
-  const lineSuffix = finding.startLine ? `:${finding.startLine}${finding.endLine && finding.endLine !== finding.startLine ? `-${finding.endLine}` : ''}` : ''
-  return `${finding.absolutePath}${lineSuffix}`
-}
-
-function findMatchingHunk(file: UiReviewFile, finding: UiReviewFinding): UiReviewHunk | null {
-  if (!finding.startLine) return file.hunks[0] ?? null
-  for (const hunk of file.hunks) {
-    if (hunk.newStart !== null) {
-      const newEnd = hunk.newStart + Math.max(hunk.newLineCount, 1) - 1
-      if (finding.startLine >= hunk.newStart && finding.startLine <= newEnd) {
-        return hunk
-      }
-    }
-    if (hunk.oldStart !== null) {
-      const oldEnd = hunk.oldStart + Math.max(hunk.oldLineCount, 1) - 1
-      if (finding.startLine >= hunk.oldStart && finding.startLine <= oldEnd) {
-        return hunk
-      }
-    }
-  }
-  return file.hunks[0] ?? null
-}
-
-async function scrollToHunk(hunkId: string): Promise<void> {
-  await nextTick()
-  const element = hunkRefs.get(hunkId)
-  element?.scrollIntoView({ block: 'center', behavior: 'smooth' })
-}
-
-async function openFinding(finding: UiReviewFinding): Promise<void> {
-  activeTab.value = 'changes'
-  const file = snapshot.value?.files.find((entry) => (
-    entry.absolutePath === finding.absolutePath
-    || entry.previousAbsolutePath === finding.absolutePath
-  )) ?? null
-  if (!file) return
-
-  expandFileAncestors(file.id)
-  selectedFileId.value = file.id
-  const matchedHunk = findMatchingHunk(file, finding)
-  selectedHunkId.value = matchedHunk?.id ?? ''
-  if (matchedHunk?.id) {
-    await scrollToHunk(matchedHunk.id)
-  }
-}
-
 function handleNotification(notification: RpcNotification): void {
   if (extractNotificationThreadId(notification) !== props.threadId) return
   const params = notification.params !== null && typeof notification.params === 'object' && !Array.isArray(notification.params)
@@ -984,40 +856,20 @@ function handleNotification(notification: RpcNotification): void {
   const itemType = typeof item?.type === 'string' ? item.type : ''
 
   if (notification.method === 'item/started' && itemType === 'enteredReviewMode') {
-    isRunningReview.value = true
     reviewStatusLabel.value = typeof item?.review === 'string' ? item.review : 'Review in progress'
     return
   }
 
   if (notification.method === 'item/completed' && itemType === 'exitedReviewMode') {
-    const targetKey = pendingReviewKey.value || reviewKey.value
-    isRunningReview.value = false
     reviewStatusLabel.value = ''
-    void getThreadReviewResult(props.threadId)
-      .then((reviewState) => {
-        if (!reviewState.result) return
-        reviewResultsByKey.value = {
-          ...reviewResultsByKey.value,
-          [targetKey]: reviewState.result,
-        }
-        activeTab.value = 'findings'
-      })
-      .catch((error) => {
-        reviewError.value = error instanceof Error ? error.message : 'Failed to load review result'
-      })
-      .finally(() => {
-        pendingReviewKey.value = ''
-      })
   }
 }
 
 watch(
-  () => [props.threadId, props.cwd] as const,
+  () => [props.threadId, props.cwd, props.commitSha] as const,
   () => {
     selectedFileId.value = ''
     selectedHunkId.value = ''
-    reviewResultsByKey.value = {}
-    pendingReviewKey.value = ''
     reviewError.value = ''
     reviewStatusLabel.value = ''
     void reloadAll()
@@ -1025,6 +877,13 @@ watch(
   { immediate: true },
 )
 
+watch(
+  () => [props.initialFilePath, props.commitSha] as const,
+  () => {
+    selectInitialFilePath()
+  },
+)
+
 watch(
   () => [activeScope.value, workspaceView.value] as const,
   () => {
@@ -1054,11 +913,6 @@ watch(selectedFile, (file) => {
   }
 })
 
-watch(selectedHunkId, (hunkId) => {
-  if (!hunkId) return
-  void scrollToHunk(hunkId)
-})
-
 onMounted(() => {
   stopNotifications = subscribeCodexNotifications(handleNotification)
 })
@@ -1076,11 +930,11 @@ onBeforeUnmount(() => {
 @reference "tailwindcss";
 
 .review-pane {
-  @apply flex h-full min-h-0 min-w-0 flex-col overflow-hidden rounded-2xl border border-zinc-200 bg-white;
+  @apply fixed inset-3 z-[1200] flex min-h-0 min-w-0 flex-col overflow-hidden rounded-2xl border border-zinc-200 bg-white shadow-2xl;
 }
 
 .review-pane.is-mobile {
-  @apply fixed inset-0 z-40 rounded-none border-0;
+  @apply inset-0 rounded-none border-0;
 }
 
 .review-pane-header {
@@ -1088,7 +942,7 @@ onBeforeUnmount(() => {
 }
 
 .review-pane-heading {
-  @apply min-w-0;
+  @apply min-w-0 flex-1;
 }
 
 .review-pane-eyebrow {
@@ -1100,13 +954,12 @@ onBeforeUnmount(() => {
 }
 
 .review-pane-header-actions {
-  @apply flex items-center gap-2;
+  @apply flex shrink-0 items-center gap-2;
 }
 
 .review-pane-close,
 .review-pane-mobile-files-button,
 .review-pane-refresh,
-.review-pane-run,
 .review-pane-bulk-button,
 .review-pane-row-button,
 .review-pane-primary-cta {
@@ -1114,17 +967,13 @@ onBeforeUnmount(() => {
 }
 
 .review-pane-close {
-  @apply flex h-7.5 w-7.5 items-center justify-center rounded-full p-0;
+  @apply flex h-7.5 w-7.5 shrink-0 items-center justify-center rounded-full p-0;
 }
 
 .review-pane-toolbar {
   @apply flex flex-col gap-2 border-b border-zinc-100 px-3 py-2.5;
 }
 
-.review-pane-toolbar-tabs {
-  @apply min-w-0;
-}
-
 .review-pane-toolbar-controls {
   @apply flex flex-wrap items-center gap-2;
 }
@@ -1149,10 +998,6 @@ onBeforeUnmount(() => {
   @apply inline-flex min-w-0 items-center gap-1 rounded-full bg-zinc-100 p-1;
 }
 
-.review-pane-segmented-primary {
-  @apply flex-1 bg-zinc-100/80;
-}
-
 .review-pane-segmented-button {
   @apply relative min-w-0 rounded-full border border-transparent px-2.5 py-1.25 text-[11px] font-medium text-zinc-500 transition-colors;
 }
@@ -1178,10 +1023,6 @@ onBeforeUnmount(() => {
   @apply flex shrink-0 items-center gap-1.5;
 }
 
-.review-pane-run {
-  @apply border-emerald-600 bg-emerald-600 text-white hover:bg-emerald-700;
-}
-
 .review-pane-refresh {
   @apply border-amber-300 bg-amber-50 text-amber-900 hover:bg-amber-100;
 }
@@ -1210,8 +1051,7 @@ onBeforeUnmount(() => {
   @apply bg-rose-100 text-rose-700;
 }
 
-.review-pane-content,
-.review-pane-findings {
+.review-pane-content {
   @apply min-h-0 flex-1 overflow-hidden;
 }
 
@@ -1225,6 +1065,7 @@ onBeforeUnmount(() => {
 
 .review-pane-file-list {
   @apply hidden min-w-0 overflow-y-auto border-r border-zinc-100 bg-zinc-50/60 p-2 md:flex md:flex-col md:gap-1.5;
+  container-type: inline-size;
 }
 
 .review-pane-tree-folder {
@@ -1274,8 +1115,7 @@ onBeforeUnmount(() => {
   @apply bg-sky-500;
 }
 
-.review-pane-file,
-.review-pane-finding {
+.review-pane-file {
   @apply flex w-full flex-col gap-0.75 rounded-xl border border-transparent px-2.5 py-2 text-left transition hover:border-zinc-200 hover:bg-white;
 }
 
@@ -1284,11 +1124,7 @@ onBeforeUnmount(() => {
 }
 
 .review-pane-file-meta-row {
-  @apply flex items-start justify-between gap-2;
-}
-
-.review-pane-file-main {
-  @apply flex min-w-0 items-center gap-1.5;
+  @apply flex min-w-0 items-start justify-between gap-2;
 }
 
 .review-pane-file[data-active='true'] {
@@ -1316,13 +1152,23 @@ onBeforeUnmount(() => {
 }
 
 .review-pane-file-path {
-  @apply min-w-0 break-all text-sm text-zinc-800;
+  @apply min-w-0 truncate text-sm text-zinc-800;
 }
 
 .review-pane-file-delta {
   @apply inline-flex shrink-0 items-center gap-1 whitespace-nowrap text-[11px];
 }
 
+@container (max-width: 14rem) {
+  .review-pane-file-list .review-pane-file-meta-row {
+    @apply flex-col items-stretch gap-1;
+  }
+
+  .review-pane-file-list .review-pane-file-delta {
+    @apply self-start;
+  }
+}
+
 .review-pane-delta-add {
   @apply text-emerald-600;
 }
@@ -1353,8 +1199,7 @@ onBeforeUnmount(() => {
 }
 
 .review-pane-file-subtitle,
-.review-pane-hunk-meta,
-.review-pane-finding-location {
+.review-pane-hunk-meta {
   @apply m-0 text-[11px] text-zinc-500;
 }
 
@@ -1432,35 +1277,10 @@ onBeforeUnmount(() => {
   @apply overflow-x-auto rounded-2xl border border-zinc-200 bg-zinc-950 p-3 text-xs text-zinc-100;
 }
 
-.review-pane-raw-diff pre,
-.review-pane-summary-text {
+.review-pane-raw-diff pre {
   @apply m-0 whitespace-pre-wrap break-all font-mono;
 }
 
-.review-pane-summary-card {
-  @apply mx-3 mt-3 rounded-2xl border border-zinc-200 bg-zinc-50 px-3 py-2.5;
-}
-
-.review-pane-summary-title {
-  @apply m-0 mb-2 text-sm font-medium text-zinc-900;
-}
-
-.review-pane-findings-list {
-  @apply flex h-full flex-col gap-2.5 overflow-y-auto px-3 py-3;
-}
-
-.review-pane-finding {
-  @apply border-zinc-200 bg-white hover:border-zinc-300;
-}
-
-.review-pane-finding-title {
-  @apply text-sm font-medium text-zinc-900;
-}
-
-.review-pane-finding-body {
-  @apply text-sm text-zinc-600 whitespace-pre-wrap;
-}
-
 .review-pane-empty {
   @apply flex h-full min-h-0 flex-col items-center justify-center px-6 text-center;
 }
@@ -1544,8 +1364,7 @@ onBeforeUnmount(() => {
 
   .review-pane-close,
   .review-pane-mobile-files-button,
-  .review-pane-refresh,
-  .review-pane-run {
+  .review-pane-refresh {
     @apply px-2.5 py-1 text-[12px];
   }
 
@@ -1589,8 +1408,7 @@ onBeforeUnmount(() => {
     @apply w-auto gap-1;
   }
 
-  .review-pane-refresh,
-  .review-pane-run {
+  .review-pane-refresh {
     @apply px-2.5 py-1 text-[12px];
   }
 
@@ -1615,7 +1433,7 @@ onBeforeUnmount(() => {
   }
 
   .review-pane-main {
-    @apply block;
+    @apply flex h-full min-h-0 flex-col;
   }
 
   .review-pane-resizer {
@@ -1623,7 +1441,9 @@ onBeforeUnmount(() => {
   }
 
   .review-pane-diff {
-    @apply px-2 py-2.5;
+    @apply min-h-0 flex-1 overflow-y-auto px-2 py-2.5;
+    -webkit-overflow-scrolling: touch;
+    overscroll-behavior: contain;
   }
 
   .review-pane-file-header,
@@ -1675,10 +1495,6 @@ onBeforeUnmount(() => {
     @apply px-1.5 py-0.25 text-[9px];
   }
 
-  .review-pane-sheet-list .review-pane-file-main {
-    @apply gap-1;
-  }
-
   .review-pane-sheet-list .review-pane-file-path {
     @apply text-[13px] leading-5;
   }
@@ -1693,10 +1509,6 @@ onBeforeUnmount(() => {
     @apply flex-row items-center gap-2.5;
   }
 
-  .review-pane-toolbar-tabs {
-    @apply flex-1;
-  }
-
   .review-pane-toolbar-controls {
     @apply min-w-0 flex-nowrap;
   }
diff --git a/src/components/layout/DesktopLayout.vue b/src/components/layout/DesktopLayout.vue
index abfe3aae..cc6f6a23 100644
--- a/src/components/layout/DesktopLayout.vue
+++ b/src/components/layout/DesktopLayout.vue
@@ -110,14 +110,14 @@ function onResizeHandleMouseDown(event: MouseEvent): void {
 @reference "tailwindcss";
 
 .desktop-layout {
-  @apply grid bg-slate-100 text-slate-900 overflow-hidden;
+  @apply isolate grid bg-slate-100 text-slate-900 overflow-hidden;
   height: 100vh;
   height: 100dvh;
   grid-template-columns: var(--layout-columns);
 }
 
 .desktop-sidebar {
-  @apply bg-slate-100 min-h-0 overflow-hidden;
+  @apply relative z-0 bg-slate-100 min-h-0 overflow-hidden;
 }
 
 .desktop-resize-handle {
@@ -130,7 +130,7 @@ function onResizeHandleMouseDown(event: MouseEvent): void {
 }
 
 .desktop-main {
-  @apply bg-white min-h-0 overflow-y-hidden overflow-x-visible;
+  @apply relative z-[100] bg-white min-h-0 overflow-y-hidden overflow-x-visible;
 }
 
 .mobile-drawer-backdrop {
diff --git a/src/composables/useUiLanguage.ts b/src/composables/useUiLanguage.ts
index 954ebec9..7c5e5c3f 100644
--- a/src/composables/useUiLanguage.ts
+++ b/src/composables/useUiLanguage.ts
@@ -149,12 +149,11 @@ const zhCN: Record<string, string> = {
   'No diff available': '没有可用 diff',
   'This summary was restored from the final answer text, but the thread history does not include patch diff content for this file.': '此摘要是从最终回答文本恢复的，但线程历史中不包含该文件的补丁 diff 内容。',
   'Review': '审查',
+  'Commit': '提交',
   'Close review pane': '关闭审查面板',
   'Compare': '比较',
   'Branch': '分支',
   'Changes': '更改',
-  'Reviewing…': '审查中…',
-  'Run review': '运行审查',
   'Loading review state': '加载审查状态中',
   'This folder is not a Git repository': '此文件夹不是 Git 仓库',
   'Initialize Git to review local changes and run Codex review.': '初始化 Git 后即可审查本地更改并运行 Codex review。',
@@ -163,14 +162,11 @@ const zhCN: Record<string, string> = {
   'Base branch unavailable': '基础分支不可用',
   'Could not resolve `origin/HEAD`, `main`, or `master` for this repository.': '无法为此仓库解析 `origin/HEAD`、`main` 或 `master`。',
   'No changes in this scope': '此范围内没有更改',
+  'No file changes in this commit.': '此提交中没有文件更改。',
   'Your current workspace is clean.': '当前工作区很干净。',
   'No merge diff found against the base branch.': '未找到相对基础分支的合并 diff。',
   'No unified diff available.': '没有可用的统一 diff。',
   'Summary': '摘要',
-  'No structured findings yet': '暂时没有结构化发现',
-  'The latest review only returned summary text.': '最近一次审查仅返回了摘要文本。',
-  'Run review to populate this pane.': '运行审查后会填充此面板。',
-  'Findings': '发现',
   'Added': '新增',
   'Deleted': '删除',
   'Renamed': '重命名',
diff --git a/src/server/codexAppServerBridge.ts b/src/server/codexAppServerBridge.ts
index 0dde66bb..b1e8f874 100644
--- a/src/server/codexAppServerBridge.ts
+++ b/src/server/codexAppServerBridge.ts
@@ -2800,6 +2800,10 @@ async function ensureRepoHasInitialCommit(repoRoot: string): Promise<void> {
 }
 
 async function runCommandCapture(command: string, args: string[], options: { cwd?: string } = {}): Promise<string> {
+  return (await runCommandCaptureRaw(command, args, options)).trim()
+}
+
+async function runCommandCaptureRaw(command: string, args: string[], options: { cwd?: string } = {}): Promise<string> {
   return await new Promise<string>((resolve, reject) => {
     const proc = spawn(command, args, {
       cwd: options.cwd,
@@ -2813,7 +2817,7 @@ async function runCommandCapture(command: string, args: string[], options: { cwd
     proc.on('error', reject)
     proc.on('close', (code) => {
       if (code === 0) {
-        resolve(stdout.trim())
+        resolve(stdout)
         return
       }
       const details = [stderr.trim(), stdout.trim()].filter(Boolean).join('\n')
@@ -2836,12 +2840,48 @@ function toHeaderGitResetHistoryRef(branchName: string, commitSha: string): stri
 }
 
 const HEADER_GIT_RESET_HISTORY_REF_LIMIT = 25
+const HEADER_GIT_UNTRACKED_BACKUP_DIR = '.codex/untracked-backups'
 
 async function assertLocalGitBranch(repoRoot: string, branchName: string): Promise<void> {
   await runCommandCapture('git', ['show-ref', '--verify', `refs/heads/${branchName}`], { cwd: repoRoot })
 }
 
+function splitGitPathList(raw: string): string[] {
+  return raw
+    .split('\0')
+    .filter((entry) => entry.length > 0)
+}
+
+function isSafeGitRelativePath(filePath: string): boolean {
+  return Boolean(filePath) && !isAbsolute(filePath) && !filePath.split('/').includes('..')
+}
+
+function resolveGitRelativePath(repoRoot: string, filePath: string): string {
+  return join(repoRoot, ...filePath.split('/'))
+}
+
+async function preserveUntrackedFilesForGitTarget(repoRoot: string, targetRef: string): Promise<string[]> {
+  const [untrackedRaw, targetTreeRaw] = await Promise.all([
+    runCommandCaptureRaw('git', ['ls-files', '--others', '--exclude-standard', '-z'], { cwd: repoRoot }),
+    runCommandCaptureRaw('git', ['ls-tree', '-r', '--name-only', '-z', `${targetRef}^{tree}`], { cwd: repoRoot }),
+  ])
+  const targetPaths = new Set(splitGitPathList(targetTreeRaw))
+  const conflictingUntrackedPaths = splitGitPathList(untrackedRaw)
+    .filter((filePath) => targetPaths.has(filePath) && isSafeGitRelativePath(filePath))
+  if (conflictingUntrackedPaths.length === 0) return []
+
+  const backupRoot = join(repoRoot, HEADER_GIT_UNTRACKED_BACKUP_DIR, new Date().toISOString().replace(/[:.]/g, '-'))
+  for (const filePath of conflictingUntrackedPaths) {
+    const sourcePath = resolveGitRelativePath(repoRoot, filePath)
+    const backupPath = join(backupRoot, ...filePath.split('/'))
+    await mkdir(dirname(backupPath), { recursive: true })
+    await rename(sourcePath, backupPath)
+  }
+  return conflictingUntrackedPaths
+}
+
 async function checkoutGitBranchWithWorktreeRecovery(repoRoot: string, branchName: string): Promise<void> {
+  await preserveUntrackedFilesForGitTarget(repoRoot, branchName)
   try {
     await runCommand('git', ['checkout', branchName], { cwd: repoRoot })
   } catch (checkoutError) {
@@ -6910,6 +6950,7 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
         try {
           const gitRoot = await runCommandCapture('git', ['rev-parse', '--show-toplevel'], { cwd })
           await assertNoTrackedGitChanges(gitRoot)
+          await assertLocalGitBranch(gitRoot, targetBranch)
           await checkoutGitBranchWithWorktreeRecovery(gitRoot, targetBranch)
           setJson(res, 200, { data: await readGitHeaderState(gitRoot) })
         } catch (error) {
@@ -6921,6 +6962,7 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
       if (req.method === 'GET' && url.pathname === '/codex-api/git/branch-commits') {
         const rawCwd = (url.searchParams.get('cwd') ?? '').trim()
         const branch = (url.searchParams.get('branch') ?? '').trim()
+        const includeResetHistory = url.searchParams.get('includeResetHistory') !== 'false'
         if (!rawCwd) {
           setJson(res, 400, { error: 'Missing cwd' })
           return
@@ -6933,20 +6975,23 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
         try {
           const gitRoot = await runCommandCapture('git', ['rev-parse', '--show-toplevel'], { cwd })
           await runCommandCapture('git', ['rev-parse', '--verify', `${branch}^{commit}`], { cwd: gitRoot })
-          const resetHistoryRefPrefix = `refs/codex/header-git-reset-history/${branch}/`
-          const resetHistoryRefsRaw = await runCommandCapture(
-            'git',
-            ['for-each-ref', '--sort=-creatordate', '--format=%(refname)', resetHistoryRefPrefix],
-            { cwd: gitRoot },
-          ).catch(() => '')
-          const resetHistoryRefs = resetHistoryRefsRaw
-            .split('\n')
-            .map((entry) => entry.trim())
-            .filter(Boolean)
-            .slice(0, HEADER_GIT_RESET_HISTORY_REF_LIMIT)
+          let resetHistoryRefs: string[] = []
+          if (includeResetHistory) {
+            const resetHistoryRefPrefix = `refs/codex/header-git-reset-history/${branch}/`
+            const resetHistoryRefsRaw = await runCommandCapture(
+              'git',
+              ['for-each-ref', '--sort=-creatordate', '--format=%(refname)', resetHistoryRefPrefix],
+              { cwd: gitRoot },
+            ).catch(() => '')
+            resetHistoryRefs = resetHistoryRefsRaw
+              .split('\n')
+              .map((entry) => entry.trim())
+              .filter(Boolean)
+              .slice(0, HEADER_GIT_RESET_HISTORY_REF_LIMIT)
+          }
           const output = await runCommandCapture(
             'git',
-            ['log', '-n', '12', '--date=short', '--format=%H%x09%h%x09%cd%x09%s', branch, ...resetHistoryRefs],
+            ['log', '-n', '50', '--date=short', '--format=%H%x09%h%x09%cd%x09%s', branch, ...resetHistoryRefs],
             { cwd: gitRoot },
           )
           const commits = output.split('\n').flatMap((line) => {
@@ -6963,6 +7008,94 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
         return
       }
 
+      if (req.method === 'GET' && url.pathname === '/codex-api/git/commit-files') {
+        const rawCwd = (url.searchParams.get('cwd') ?? '').trim()
+        const sha = (url.searchParams.get('sha') ?? '').trim()
+        if (!rawCwd) {
+          setJson(res, 400, { error: 'Missing cwd' })
+          return
+        }
+        if (!sha) {
+          setJson(res, 400, { error: 'Missing sha' })
+          return
+        }
+        const cwd = isAbsolute(rawCwd) ? rawCwd : resolve(rawCwd)
+        try {
+          const gitRoot = await runCommandCapture('git', ['rev-parse', '--show-toplevel'], { cwd })
+          await runCommandCapture('git', ['rev-parse', '--verify', `${sha}^{commit}`], { cwd: gitRoot })
+          const output = await runCommandCaptureRaw(
+            'git',
+            ['diff-tree', '--root', '--no-commit-id', '--name-status', '-r', '-M', '-z', sha],
+            { cwd: gitRoot },
+          )
+          const numstatOutput = await runCommandCaptureRaw(
+            'git',
+            ['diff-tree', '--root', '--no-commit-id', '--numstat', '-r', '-M', '-z', sha],
+            { cwd: gitRoot },
+          )
+          const splitNumstatRecord = (record: string): { addedRaw: string; removedRaw: string; path: string } | null => {
+            const firstTab = record.indexOf('\t')
+            if (firstTab < 0) return null
+            const secondTab = record.indexOf('\t', firstTab + 1)
+            if (secondTab < 0) return null
+            return {
+              addedRaw: record.slice(0, firstTab),
+              removedRaw: record.slice(firstTab + 1, secondTab),
+              path: record.slice(secondTab + 1),
+            }
+          }
+          const lineCountsByPath = new Map<string, { addedLineCount: number | null; removedLineCount: number | null }>()
+          const numstatRecords = splitGitPathList(numstatOutput)
+          for (let index = 0; index < numstatRecords.length; index += 1) {
+            const record = splitNumstatRecord(numstatRecords[index] ?? '')
+            if (!record) continue
+            const { addedRaw, removedRaw } = record
+            const path = record.path || numstatRecords[index + 2] || numstatRecords[index + 1] || ''
+            if (!record.path) index += 2
+            if (!path) continue
+            const addedLineCount = /^\d+$/.test(addedRaw) ? Number(addedRaw) : null
+            const removedLineCount = /^\d+$/.test(removedRaw) ? Number(removedRaw) : null
+            lineCountsByPath.set(path, { addedLineCount, removedLineCount })
+          }
+          const nameStatusRecords = splitGitPathList(output)
+          const files: Array<{
+            path: string
+            previousPath: string | null
+            status: string
+            label: string
+            addedLineCount: number | null
+            removedLineCount: number | null
+          }> = []
+          for (let index = 0; index < nameStatusRecords.length; index += 1) {
+            const status = nameStatusRecords[index] ?? ''
+            if (!status) continue
+            const statusKind = status.charAt(0)
+            const isRenameOrCopy = statusKind === 'R' || statusKind === 'C'
+            const previousPath = isRenameOrCopy ? nameStatusRecords[index + 1] || null : null
+            const path = isRenameOrCopy ? nameStatusRecords[index + 2] || '' : nameStatusRecords[index + 1] || ''
+            index += isRenameOrCopy ? 2 : 1
+            if (!path) continue
+            const label = statusKind === 'A'
+              ? 'Added'
+              : statusKind === 'D'
+                ? 'Deleted'
+                : statusKind === 'R'
+                  ? 'Renamed'
+                  : statusKind === 'C'
+                    ? 'Copied'
+                    : statusKind === 'M'
+                      ? 'Modified'
+                      : status
+            const lineCounts = lineCountsByPath.get(path) ?? { addedLineCount: null, removedLineCount: null }
+            files.push({ path, previousPath, status, label, ...lineCounts })
+          }
+          setJson(res, 200, { data: files })
+        } catch (error) {
+          setJson(res, 500, { error: getErrorMessage(error, 'Failed to load commit files') })
+        }
+        return
+      }
+
       if (req.method === 'POST' && url.pathname === '/codex-api/git/reset-to-commit') {
         const payload = await readJsonBody(req)
         const record = asRecord(payload)
@@ -7000,6 +7133,7 @@ export function createCodexBridgeMiddleware(): CodexBridgeMiddleware {
           const targetSha = await runCommandCapture('git', ['rev-parse', '--verify', `${sha}^{commit}`], { cwd: gitRoot })
           await runCommand('git', ['update-ref', toHeaderGitResetHistoryRef(branch, previousTip.trim()), previousTip.trim()], { cwd: gitRoot })
           await pruneHeaderGitResetHistoryRefs(gitRoot, branch)
+          await preserveUntrackedFilesForGitTarget(gitRoot, targetSha.trim())
           await runCommand('git', ['reset', '--hard', targetSha.trim()], { cwd: gitRoot })
           setJson(res, 200, { data: await readGitHeaderState(gitRoot) })
         } catch (error) {
diff --git a/src/server/reviewGit.ts b/src/server/reviewGit.ts
index 358ff293..25eb6459 100644
--- a/src/server/reviewGit.ts
+++ b/src/server/reviewGit.ts
@@ -1,10 +1,10 @@
 import { spawn } from 'node:child_process'
-import { mkdir, rm, stat, writeFile } from 'node:fs/promises'
+import { mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises'
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import { tmpdir } from 'node:os'
 import { isAbsolute, join, resolve } from 'node:path'
 
-type ReviewScope = 'workspace' | 'baseBranch'
+type ReviewScope = 'workspace' | 'baseBranch' | 'commit'
 type ReviewWorkspaceView = 'unstaged' | 'staged'
 type ReviewAction = 'stage' | 'unstage' | 'revert'
 type ReviewActionLevel = 'all' | 'file' | 'hunk'
@@ -51,6 +51,7 @@ type ReviewSnapshot = {
   workspaceView: ReviewWorkspaceView
   baseBranch: string | null
   baseBranchOptions: string[]
+  commitSha: string | null
   headBranch: string | null
   mergeBaseSha: string | null
   generatedAtIso: string
@@ -62,6 +63,8 @@ type ReviewSnapshot = {
   files: ReviewSnapshotFile[]
 }
 
+type ReviewSummary = ReviewSnapshot['summary']
+
 type ReviewRouteContext = {
   readJsonBody: (req: IncomingMessage) => Promise<unknown>
 }
@@ -160,6 +163,31 @@ async function runCommandCapture(command: string, args: string[], options: { cwd
   throw new Error(`Command failed (${command} ${args.join(' ')})${suffix}`)
 }
 
+async function runCommandCaptureRaw(command: string, args: string[], options: { cwd?: string } = {}): Promise<string> {
+  return await new Promise<string>((resolve, reject) => {
+    const proc = spawn(command, args, {
+      cwd: options.cwd,
+      env: process.env,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    })
+    let stdout = ''
+    let stderr = ''
+
+    proc.stdout.on('data', (chunk: Buffer) => { stdout += chunk.toString() })
+    proc.stderr.on('data', (chunk: Buffer) => { stderr += chunk.toString() })
+    proc.on('error', reject)
+    proc.on('close', (code) => {
+      if (code === 0) {
+        resolve(stdout)
+        return
+      }
+      const details = [stderr.trim(), stdout.trim()].filter(Boolean).join('\n')
+      const suffix = details ? `: ${details}` : ''
+      reject(new Error(`Command failed (${command} ${args.join(' ')})${suffix}`))
+    })
+  })
+}
+
 function isNotGitRepositoryError(error: unknown): boolean {
   const message = getErrorMessage(error, '').toLowerCase()
   return message.includes('not a git repository') || message.includes('fatal: not a git repository')
@@ -275,16 +303,17 @@ async function detectHeadBranch(repoRoot: string): Promise<string | null> {
   return result.code === 0 && result.stdout !== 'HEAD' ? result.stdout : null
 }
 
-function parseUntrackedPaths(statusOutput: string): string[] {
-  const paths: string[] = []
-  for (const line of statusOutput.split(/\r?\n/u)) {
-    if (!line.startsWith('?? ')) continue
-    const path = line.slice(3).trim()
-    if (path && !paths.includes(path)) {
-      paths.push(path)
-    }
-  }
-  return paths
+function splitGitPathList(raw: string): string[] {
+  return raw.split('\0').filter((entry) => entry.length > 0)
+}
+
+function isSafeGitRelativePath(filePath: string): boolean {
+  return Boolean(filePath) && !isAbsolute(filePath) && !filePath.split('/').includes('..')
+}
+
+async function listUntrackedPaths(repoRoot: string): Promise<string[]> {
+  const output = await runCommandCaptureRaw('git', ['ls-files', '--others', '--exclude-standard', '-z'], { cwd: repoRoot })
+  return splitGitPathList(output).filter(isSafeGitRelativePath)
 }
 
 async function diffUntrackedFile(repoRoot: string, path: string): Promise<string> {
@@ -303,6 +332,83 @@ async function diffUntrackedFile(repoRoot: string, path: string): Promise<string
   return result.stdout
 }
 
+function parseNumstatSummary(output: string): ReviewSummary {
+  let fileCount = 0
+  let addedLineCount = 0
+  let removedLineCount = 0
+  for (const line of output.split(/\r?\n/u)) {
+    const trimmed = line.trim()
+    if (!trimmed) continue
+    const [addedRaw, removedRaw] = trimmed.split(/\s+/u)
+    if (addedRaw === undefined || removedRaw === undefined) continue
+    fileCount += 1
+    const added = Number(addedRaw)
+    const removed = Number(removedRaw)
+    if (Number.isFinite(added)) addedLineCount += added
+    if (Number.isFinite(removed)) removedLineCount += removed
+  }
+  return { fileCount, addedLineCount, removedLineCount }
+}
+
+function addReviewSummary(left: ReviewSummary, right: ReviewSummary): ReviewSummary {
+  return {
+    fileCount: left.fileCount + right.fileCount,
+    addedLineCount: left.addedLineCount + right.addedLineCount,
+    removedLineCount: left.removedLineCount + right.removedLineCount,
+  }
+}
+
+async function summarizeUntrackedFile(repoRoot: string, path: string): Promise<ReviewSummary> {
+  const absolutePath = join(repoRoot, ...path.split('/'))
+  let info
+  try {
+    info = await stat(absolutePath)
+  } catch (error) {
+    const code = typeof error === 'object' && error && 'code' in error ? String((error as { code?: unknown }).code) : ''
+    if (code === 'ENOENT' || code === 'ENOTDIR') {
+      return { fileCount: 0, addedLineCount: 0, removedLineCount: 0 }
+    }
+    throw error
+  }
+  if (!info.isFile()) {
+    return { fileCount: 0, addedLineCount: 0, removedLineCount: 0 }
+  }
+  const content = await readFile(absolutePath)
+  const addedLineCount = content.length === 0
+    ? 0
+    : content.reduce((count, byte) => count + (byte === 10 ? 1 : 0), content[content.length - 1] === 10 ? 0 : 1)
+  return { fileCount: 1, addedLineCount, removedLineCount: 0 }
+}
+
+async function buildWorkspaceDiffSummary(repoRoot: string, workspaceView: ReviewWorkspaceView): Promise<ReviewSummary> {
+  if (workspaceView === 'staged') {
+    try {
+      const output = await runCommandCapture('git', ['diff', '--cached', '--no-ext-diff', '--find-renames', '--numstat'], { cwd: repoRoot })
+      return parseNumstatSummary(output)
+    } catch (error) {
+      if (isMissingHeadError(error)) {
+        return { fileCount: 0, addedLineCount: 0, removedLineCount: 0 }
+      }
+      throw error
+    }
+  }
+
+  let summary: ReviewSummary = { fileCount: 0, addedLineCount: 0, removedLineCount: 0 }
+  try {
+    const output = await runCommandCapture('git', ['diff', '--no-ext-diff', '--find-renames', '--numstat'], { cwd: repoRoot })
+    summary = addReviewSummary(summary, parseNumstatSummary(output))
+  } catch (error) {
+    if (!isMissingHeadError(error)) {
+      throw error
+    }
+  }
+
+  for (const path of await listUntrackedPaths(repoRoot)) {
+    summary = addReviewSummary(summary, await summarizeUntrackedFile(repoRoot, path))
+  }
+  return summary
+}
+
 async function buildWorkspaceDiff(repoRoot: string, workspaceView: ReviewWorkspaceView): Promise<string> {
   if (workspaceView === 'staged') {
     try {
@@ -324,9 +430,8 @@ async function buildWorkspaceDiff(repoRoot: string, workspaceView: ReviewWorkspa
     }
   }
 
-  const statusOutput = await runCommandCapture('git', ['status', '--porcelain=v1', '--untracked-files=all'], { cwd: repoRoot })
   const untrackedDiffs = await Promise.all(
-    parseUntrackedPaths(statusOutput).map(async (path) => await diffUntrackedFile(repoRoot, path)),
+    (await listUntrackedPaths(repoRoot)).map(async (path) => await diffUntrackedFile(repoRoot, path)),
   )
 
   return [trackedDiff, ...untrackedDiffs]
@@ -356,6 +461,16 @@ async function buildBaseBranchDiff(
   }
 }
 
+async function buildCommitDiff(repoRoot: string, commitSha: string): Promise<{ diffText: string; commitSha: string }> {
+  const resolvedSha = await runCommandCapture('git', ['rev-parse', '--verify', `${commitSha}^{commit}`], { cwd: repoRoot })
+  const diffText = await runCommandCapture(
+    'git',
+    ['diff-tree', '--root', '-r', '--no-commit-id', '--no-ext-diff', '--find-renames', '--patch', resolvedSha],
+    { cwd: repoRoot },
+  )
+  return { diffText, commitSha: resolvedSha }
+}
+
 function normalizeDiffPath(value: string): string | null {
   const trimmed = value.trim()
   if (!trimmed || trimmed === '/dev/null') return null
@@ -617,6 +732,7 @@ async function buildReviewSnapshot(
   scope: ReviewScope,
   workspaceView: ReviewWorkspaceView,
   requestedBaseBranch = '',
+  requestedCommitSha = '',
 ): Promise<ReviewSnapshot> {
   const normalizedCwd = normalizeInputCwd(cwd)
   await ensureDirectory(normalizedCwd)
@@ -631,6 +747,7 @@ async function buildReviewSnapshot(
       workspaceView,
       baseBranch: null,
       baseBranchOptions: [],
+      commitSha: null,
       headBranch: null,
       mergeBaseSha: null,
       generatedAtIso: new Date().toISOString(),
@@ -651,8 +768,16 @@ async function buildReviewSnapshot(
 
   let diffText = ''
   let mergeBaseSha: string | null = null
+  let commitSha: string | null = null
 
-  if (scope === 'baseBranch') {
+  if (scope === 'commit') {
+    if (!requestedCommitSha.trim()) {
+      throw new Error('Missing commit')
+    }
+    const commitDiff = await buildCommitDiff(gitRoot, requestedCommitSha.trim())
+    diffText = commitDiff.diffText
+    commitSha = commitDiff.commitSha
+  } else if (scope === 'baseBranch') {
     if (baseBranch) {
       const baseDiff = await buildBaseBranchDiff(gitRoot, baseBranch)
       diffText = baseDiff.diffText
@@ -671,6 +796,7 @@ async function buildReviewSnapshot(
     workspaceView,
     baseBranch: baseBranch?.displayName ?? null,
     baseBranchOptions,
+    commitSha,
     headBranch,
     mergeBaseSha,
     generatedAtIso: new Date().toISOString(),
@@ -683,6 +809,18 @@ async function buildReviewSnapshot(
   }
 }
 
+async function buildReviewSummary(cwd: string, workspaceView: ReviewWorkspaceView): Promise<ReviewSummary> {
+  const normalizedCwd = normalizeInputCwd(cwd)
+  await ensureDirectory(normalizedCwd)
+
+  const gitRoot = await resolveGitRoot(normalizedCwd)
+  if (!gitRoot) {
+    return { fileCount: 0, addedLineCount: 0, removedLineCount: 0 }
+  }
+
+  return await buildWorkspaceDiffSummary(gitRoot, workspaceView)
+}
+
 async function writePatchFile(patch: string): Promise<string> {
   const dir = await mkdir(join(tmpdir(), 'codexui-review-patches'), { recursive: true }).then(() => join(tmpdir(), 'codexui-review-patches'))
   const filePath = join(dir, `${Date.now()}-${Math.random().toString(16).slice(2)}.patch`)
@@ -756,7 +894,7 @@ async function applyReviewAction(payload: unknown): Promise<ReviewSnapshot> {
   }
 
   const cwd = readString(record.cwd)
-  const scope = record.scope === 'baseBranch' ? 'baseBranch' : 'workspace'
+  const scope = record.scope === 'baseBranch' ? 'baseBranch' : record.scope === 'commit' ? 'commit' : 'workspace'
   const workspaceView = record.workspaceView === 'staged' ? 'staged' : 'unstaged'
   const action = readString(record.action)
   const level = readString(record.level)
@@ -800,11 +938,34 @@ export async function handleReviewRoutes(
   url: URL,
   context: ReviewRouteContext,
 ): Promise<boolean> {
+  if (req.method === 'GET' && url.pathname === '/codex-api/review/summary') {
+    const cwd = url.searchParams.get('cwd')?.trim() ?? ''
+    const workspaceView = url.searchParams.get('workspaceView') === 'staged' ? 'staged' : 'unstaged'
+    if (!cwd) {
+      setJson(res, 400, { error: 'Missing cwd' })
+      return true
+    }
+
+    try {
+      setJson(res, 200, {
+        data: await buildReviewSummary(cwd, workspaceView),
+      })
+    } catch (error) {
+      setJson(res, 500, { error: getErrorMessage(error, 'Failed to load review summary') })
+    }
+    return true
+  }
+
   if (req.method === 'GET' && url.pathname === '/codex-api/review/snapshot') {
     const cwd = url.searchParams.get('cwd')?.trim() ?? ''
-    const scope = url.searchParams.get('scope') === 'baseBranch' ? 'baseBranch' : 'workspace'
+    const scope = url.searchParams.get('scope') === 'baseBranch'
+      ? 'baseBranch'
+      : url.searchParams.get('scope') === 'commit'
+        ? 'commit'
+        : 'workspace'
     const workspaceView = url.searchParams.get('workspaceView') === 'staged' ? 'staged' : 'unstaged'
     const baseBranch = url.searchParams.get('baseBranch')?.trim() ?? ''
+    const commitSha = url.searchParams.get('commitSha')?.trim() ?? ''
     if (!cwd) {
       setJson(res, 400, { error: 'Missing cwd' })
       return true
@@ -812,7 +973,7 @@ export async function handleReviewRoutes(
 
     try {
       setJson(res, 200, {
-        data: await buildReviewSnapshot(cwd, scope, workspaceView, baseBranch),
+        data: await buildReviewSnapshot(cwd, scope, workspaceView, baseBranch, commitSha),
       })
     } catch (error) {
       setJson(res, 500, { error: getErrorMessage(error, 'Failed to load review snapshot') })
diff --git a/src/style.css b/src/style.css
index b900cd8d..90d6b389 100644
--- a/src/style.css
+++ b/src/style.css
@@ -891,58 +891,102 @@
   @apply border-zinc-700 bg-zinc-900;
 }
 
+:root.dark .header-git-review-row {
+  @apply border-zinc-700 bg-zinc-800 shadow-none;
+}
+
 :root.dark .header-git-review-row,
 :root.dark .header-git-branch-button,
-:root.dark .header-git-commit {
+:root.dark .header-git-branch-checkout,
+:root.dark .header-git-commit,
+:root.dark .header-git-file {
   @apply text-zinc-200;
 }
 
 :root.dark .header-git-review-row:hover,
-:root.dark .header-git-branch-expand:hover,
 :root.dark .header-git-branch-button:hover,
+:root.dark .header-git-branch-checkout:hover,
 :root.dark .header-git-commit:hover,
+:root.dark .header-git-file:hover,
 :root.dark .header-git-commit.is-current,
+:root.dark .header-git-commit.is-selected,
+:root.dark .header-git-branch-button.is-selected,
 :root.dark .header-git-branch-button.is-current {
   @apply bg-zinc-800;
 }
 
+:root.dark .header-git-branch-button.is-selected,
+:root.dark .header-git-commit.is-selected {
+  @apply ring-zinc-600;
+}
+
 :root.dark .header-git-commit.is-current {
   @apply ring-zinc-600;
 }
 
 :root.dark .header-git-state,
+:root.dark .header-git-commit-panel,
+:root.dark .header-git-branch-panel,
+:root.dark .header-git-commit-detail-panel,
 :root.dark .header-git-commits {
   @apply border-zinc-700 bg-zinc-800;
 }
 
-:root.dark .header-git-state-value {
+:root.dark .header-git-state-value,
+:root.dark .header-git-commit-detail-subject {
   @apply text-zinc-100;
 }
 
 :root.dark .header-git-state-label,
 :root.dark .header-git-state-meta,
+:root.dark .header-git-toggle-row,
 :root.dark .header-git-branch-meta,
 :root.dark .header-git-commit-top,
 :root.dark .header-git-empty,
-:root.dark .header-git-commits-empty {
+:root.dark .header-git-commits-empty,
+:root.dark .header-git-commit-detail-title,
+:root.dark .header-git-files-empty,
+:root.dark .header-git-file-previous-path {
   @apply text-zinc-400;
 }
 
+:root.dark .header-git-file-added {
+  @apply text-emerald-400;
+}
+
+:root.dark .header-git-file-removed {
+  @apply text-red-400;
+}
+
 :root.dark .header-git-search {
   @apply border-zinc-700 bg-zinc-800 text-zinc-100 focus:border-zinc-600;
 }
 
-:root.dark .header-git-commit-top code,
+:root.dark .header-git-ref,
+:root.dark .header-git-file-status,
 :root.dark .header-git-branch-meta {
   @apply bg-zinc-700 text-zinc-200;
 }
 
+:root.dark .header-git-ref:hover {
+  @apply bg-zinc-600;
+}
+
+:root.dark .header-git-commit-detail-head {
+  @apply bg-zinc-900;
+}
+
+:root.dark .header-git-reset-commit {
+  @apply border-zinc-600 bg-zinc-100 text-zinc-900 hover:bg-white disabled:border-zinc-700 disabled:bg-zinc-800 disabled:text-zinc-500;
+}
+
 :root.dark .header-git-status {
   @apply bg-amber-950/40 text-amber-300;
 }
 
 :root.dark .header-git-status.is-error,
-:root.dark .header-git-commits-empty.is-error {
+:root.dark .header-git-commits-empty.is-error,
+:root.dark .header-git-files-empty.is-error {
   @apply bg-red-950/40 text-red-300;
 }
 
@@ -959,11 +1003,14 @@
 
 :root.dark .review-pane-header,
 :root.dark .review-pane-toolbar,
+:root.dark .review-pane-content,
+:root.dark .review-pane-main,
+:root.dark .review-pane-diff,
 :root.dark .review-pane-hunk-header,
 :root.dark .review-pane-summary-card,
 :root.dark .review-pane-file-header,
 :root.dark .review-pane-hunk,
-:root.dark .review-pane-finding,
+:root.dark .review-pane-sheet-list,
 :root.dark .review-pane-sheet {
   @apply bg-zinc-900;
 }
@@ -984,8 +1031,7 @@
 :root.dark .review-pane-empty-text,
 :root.dark .review-pane-file-subtitle,
 :root.dark .review-pane-hunk-meta,
-:root.dark .review-pane-finding-location,
-:root.dark .review-pane-finding-body {
+:root.dark .review-pane-hunk-title {
   @apply text-zinc-400;
 }
 
@@ -1030,7 +1076,6 @@
   @apply bg-white;
 }
 
-:root.dark .review-pane-run,
 :root.dark .review-pane-primary-cta {
   @apply border-emerald-500 bg-emerald-500 text-white hover:bg-emerald-400;
 }
@@ -1081,7 +1126,7 @@
 }
 
 :root.dark .review-pane-file {
-  @apply hover:border-zinc-600 hover:bg-zinc-800;
+  @apply text-zinc-100 hover:border-zinc-600 hover:bg-zinc-800;
 }
 
 :root.dark .review-pane-file[data-active='true'] {
@@ -1092,6 +1137,10 @@
   @apply text-zinc-100;
 }
 
+:root.dark .review-pane-tree-folder-name {
+  @apply text-inherit;
+}
+
 :root.dark .review-pane-file-op[data-operation='update'] {
   @apply bg-amber-500/15 text-amber-200;
 }
@@ -1127,8 +1176,7 @@
 
 :root.dark .review-pane-file-header,
 :root.dark .review-pane-hunk,
-:root.dark .review-pane-summary-card,
-:root.dark .review-pane-finding {
+:root.dark .review-pane-summary-card {
   @apply border-zinc-700;
 }
 
diff --git a/src/types/codex.ts b/src/types/codex.ts
index ec3b629b..9c4d6fa1 100644
--- a/src/types/codex.ts
+++ b/src/types/codex.ts
@@ -112,8 +112,7 @@ export type UiFileChange = {
   removedLineCount: number
 }
 
-export type UiReviewTab = 'changes' | 'findings'
-export type UiReviewScope = 'workspace' | 'baseBranch'
+export type UiReviewScope = 'workspace' | 'baseBranch' | 'commit'
 export type UiReviewWorkspaceView = 'unstaged' | 'staged'
 export type UiReviewAction = 'stage' | 'unstage' | 'revert'
 export type UiReviewActionLevel = 'all' | 'file' | 'hunk'
@@ -161,6 +160,7 @@ export type UiReviewSnapshot = {
   workspaceView: UiReviewWorkspaceView
   baseBranch: string | null
   baseBranchOptions: string[]
+  commitSha: string | null
   headBranch: string | null
   mergeBaseSha: string | null
   generatedAtIso: string
@@ -172,6 +172,8 @@ export type UiReviewSnapshot = {
   files: UiReviewFile[]
 }
 
+export type UiReviewSummary = UiReviewSnapshot['summary']
+
 export type UiReviewFinding = {
   id: string
   title: string
diff --git a/tests.md b/tests.md
index 7c59f535..acbf92fd 100644
--- a/tests.md
+++ b/tests.md
@@ -773,7 +773,7 @@ Skills Sync skips unchanged manifest writes and does not fail parent commits whe
 ### Header Git branch dropdown with commit reset
 
 #### Feature/Change Name
-Thread header Git dropdown replaces the simple review action with branch search, Review access, safe branch switching, branch reset-to-commit, and reset-history commit preservation.
+Thread header Git dropdown replaces the simple review action with a commits/branches picker, Review access, safe branch switching, selected-commit file details, branch reset-to-commit, and reset-history commit preservation.
 
 #### Prerequisites/Setup
 1. Dev server running (`pnpm run dev`)
@@ -785,33 +785,93 @@ Thread header Git dropdown replaces the simple review action with branch search,
 #### Steps
 1. In light theme, open the Git dropdown in the thread header.
 2. Confirm the trigger shows the current branch, or the detached commit subject if the repository is already detached.
-3. Click `Review` and confirm the review pane opens; click it again and confirm the pane toggles.
-4. Type part of a branch name in search and confirm the branch list filters.
-5. Select a different branch with a clean worktree and confirm the header updates to that branch.
-6. Expand a branch row and confirm recent commits load with short SHA, subject, and date.
-7. Expand a remote branch row and confirm its commit rows are disabled with a tooltip explaining remote branches cannot be reset.
-8. Select an older commit on the disposable local branch and confirm the header stays on that branch instead of entering detached HEAD.
-9. Confirm `git -C <thread-cwd> rev-parse --abbrev-ref HEAD` still prints the branch name and `git -C <thread-cwd> rev-parse --short HEAD` matches the selected commit.
-10. Reopen/expand the same branch and confirm commits that were ahead of the reset target still appear, with the selected branch HEAD marked `current`.
-11. Repeat reset on the same branch several times and confirm the dropdown still opens quickly and shows recent reset-history commits.
-12. Create a tracked uncommitted change, try to switch branch or reset to a commit, and confirm the dropdown shows a dirty-worktree error instead of switching or resetting.
-13. Create only an untracked file, try to reset to a commit, and confirm the reset proceeds unless Git reports the untracked file would be overwritten.
-14. Switch to dark theme and repeat steps 1, 2, 4, 6, 7, 10, 12, and 13.
-
-#### Expected Results
-- The header dropdown exposes Review, current checkout state, searchable branches, and inline commits.
-- Branch switching and branch reset-to-commit are blocked by tracked uncommitted changes, but untracked-only changes are allowed unless Git would overwrite them.
-- Commit selection resets the local branch to that commit instead of detaching HEAD.
-- Remote branch commit rows are inspectable but cannot trigger local branch reset.
+3. Confirm the menu initially shows only commits on the left and branches on the right, with no commit-files panel before a commit is selected.
+4. Confirm the left column defaults to the current branch and shows no more than 50 recent commits with short SHA, subject, and date.
+5. Confirm the open dropdown visually layers above the sidebar and above the Review pane if the pane is already open.
+6. Confirm the top action is styled as a button, reads `Review Worktree Changes`, and shows `+`/`-` line counts; click it and confirm the dropdown stays open while the review pane opens above it directly to changes without showing a `Findings` tab or `Run review` button; click the Review pane `X` and confirm only the pane closes while the dropdown stays open; click `Review Worktree Changes` again and confirm the pane toggles open.
+7. Type part of a commit subject or short SHA in the left commit search and confirm the commit list filters.
+8. Turn off `Reset-history refs` and confirm the commit list reloads without saved reset-history refs.
+9. Turn `Reset-history refs` back on and confirm saved reset-history commits reappear when available.
+10. Toggle `Reset-history refs` while the commit list is still loading and confirm the list reloads for the new toggle state instead of staying on the previous result.
+11. Type part of a branch name in search and confirm the branch list filters.
+12. Click a different branch row and confirm the left commit list changes to that branch without immediately switching checkout.
+13. Use the branch row `Checkout` action with a clean worktree and confirm the header updates to that branch.
+14. Confirm local branches appear first and remote branches appear at the end of the branch list.
+15. Select a remote branch row and confirm it can load commits but does not show a `Checkout` action.
+16. Select an older commit on the disposable local branch and confirm the dropdown widens and shows a left-side file panel with that commit subject, file changes, per-file `+`/`-` line counts, and a `Reset` button without changing HEAD.
+17. Click a commit ref badge and confirm the full commit SHA is copied to the clipboard without changing the selected commit.
+18. Click a file in the selected commit details and confirm the dropdown closes, clears the selected commit state for the next open, and the Review pane opens in commit mode with that file selected without auto-centering the first hunk.
+19. Click `Reset` for the selected commit and confirm the header stays on that branch instead of entering detached HEAD.
+20. Confirm `git -C <thread-cwd> rev-parse --abbrev-ref HEAD` still prints the branch name and `git -C <thread-cwd> rev-parse --short HEAD` matches the selected commit.
+21. Reopen/select the same branch and confirm commits that were ahead of the reset target still appear, with the selected branch HEAD marked `current`.
+22. Repeat reset on the same branch several times and confirm the dropdown still opens quickly and shows recent reset-history commits.
+23. Create a tracked uncommitted change, try to switch branch or reset to a commit, and confirm the dropdown shows a dirty-worktree error instead of switching or resetting.
+24. Create only an untracked file whose path includes leading/trailing whitespace and does not exist in the target commit, try to reset to a commit, and confirm the reset proceeds while the exact untracked filename remains in place.
+25. Create only an untracked file whose path includes leading/trailing whitespace and exists in the target commit, try to reset to that target, and confirm the reset proceeds and the exact untracked filename is moved under `.codex/untracked-backups/` instead of being overwritten or renamed incorrectly.
+26. Add or inspect a commit that changes a file whose name includes leading/trailing whitespace, then select that commit and confirm the commit file list shows the exact path, correct `+`/`-` counts, and opens the same path in the Review pane.
+27. At a mobile viewport around 375px wide, select a commit and confirm the dropdown fits inside the viewport with branches first, commits second, and selected-commit files last, stacked vertically instead of squeezed into columns.
+28. Narrow the Review pane file list and confirm changed-file rows do not inherit folder-depth indentation, long names truncate on one line instead of wrapping vertically, and the `+`/`-` counts remain visible.
+29. At a mobile viewport around 375px wide, open the Review pane, scroll the diff content vertically, and confirm the `X` close button remains visible and tappable in the top-right corner.
+30. Switch to dark theme and repeat steps 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 21, 23, 24, 25, 26, 27, 28, and 29.
+
+#### Preserved Prior Coverage
+1. Click `Review Worktree Changes` and confirm the review pane opens; click it again and confirm the pane toggles.
+2. Type part of a branch name in search and confirm the branch list filters.
+3. Select a different branch with a clean worktree using the checkout action and confirm the header updates to that branch.
+4. Select a branch row and confirm recent commits load with short SHA, subject, and date.
+5. Confirm remote branch rows are inspectable, appear after local branches, and do not trigger local reset without a supported local branch action.
+6. Select an older commit on the disposable local branch and confirm the header stays on that branch instead of entering detached HEAD.
+7. Confirm `git -C <thread-cwd> rev-parse --abbrev-ref HEAD` still prints the branch name and `git -C <thread-cwd> rev-parse --short HEAD` matches the selected commit after reset.
+8. Reopen/select the same branch and confirm commits that were ahead of the reset target still appear, with the selected branch HEAD marked `current`.
+9. Repeat reset on the same branch several times and confirm the dropdown still opens quickly and shows recent reset-history commits.
+10. Create a tracked uncommitted change, try to switch branch or reset to a commit, and confirm the dropdown shows a dirty-worktree error instead of switching or resetting.
+11. Create only an untracked file, try to reset to a commit, and confirm the reset proceeds while preserving the untracked file in place or moving it to `.codex/untracked-backups/` if the target would overwrite it.
+12. Switch to dark theme and repeat the branch filtering, commit loading, reset-history, dirty-worktree, and untracked-file checks.
+
+#### Expected Results
+- The header dropdown exposes Review, current checkout state, a left-side commit list, and a right-side searchable branch list before a commit is selected.
+- The selected-commit file panel is hidden until commit selection, then appears on the left and expands the dropdown width.
+- Each selected-commit file row shows added and removed line counts, using `-` for binary or unavailable counts.
+- The dropdown layer is viewport-positioned and appears above the sidebar when open.
+- The Review pane renders above the open dropdown and app chrome.
+- Clicking the dropdown `Review Worktree Changes` button keeps the dropdown open while toggling the Review pane.
+- Clicking the Review pane `X` while the dropdown is open closes only the Review pane and leaves the dropdown open.
+- The `Review Worktree Changes` button shows current worktree added and removed line counts.
+- The Review pane toolbar keeps `Refresh` but does not show a `Findings` tab or `Run review` button.
+- The current branch commit list loads by default and is capped at 50 commits.
+- The commit list can be searched by SHA, subject, or date without changing the selected branch.
+- Reset-history refs can be shown or hidden from the commit list without changing the selected branch.
+- Reset-history toggles are keyed by both branch and reset-history state, so an in-flight load for one state does not suppress loading the other state.
+- Branch switching and branch reset-to-commit are blocked by tracked uncommitted changes, but untracked-only changes are preserved and allowed.
+- Commit selection opens file details without resetting or detaching HEAD.
+- Commit ref badges copy the full SHA to the clipboard without triggering commit selection.
+- Commit file names and untracked file names with leading/trailing whitespace are parsed from NUL-delimited Git output and are not trimmed before display, counting, backup, or Review-pane navigation.
+- The selected commit `Reset` button resets the local branch to that commit instead of detaching HEAD.
+- Remote branches are inspectable but cannot be checked out directly from this control.
+- Clicking a selected commit file opens the Review pane against that commit diff and selects that path without auto-centering the selected hunk.
+- Clicking a selected commit file clears the dropdown commit selection before closing, so reopening starts without the stale file panel.
+- Changed-file rows in the Review pane file list do not inherit folder-depth indentation, so long names have enough room to truncate horizontally instead of wrapping one character per line when the list is narrow.
+- Remote branches appear after local branches in the branch list.
+- Prior branch-search, inline-commit, remote-branch inspection, reset-to-commit, dirty-worktree, and untracked-file manual coverage remains represented in the section.
 - The branch commit list still shows commits that were ahead of the reset target by reading saved internal reset-history refs.
 - Reset-history refs are bounded so repeated resets do not grow commit-list inputs without limit.
-- The selected branch HEAD commit is marked `current` in expanded commit lists.
+- Untracked files that would collide with target tracked files are moved to `.codex/untracked-backups/` before checkout/reset, preserving exact Git path bytes from NUL-delimited output.
+- The selected branch HEAD commit is marked `current` in the commit list.
+- The mobile Review pane keeps its close button visible above the app chrome in both light theme and dark theme.
+- The mobile Review pane diff area scrolls vertically without moving or hiding the pane header.
+- The Review pane overlay, toolbar, file list, file sheet, and diff surfaces use dark backgrounds and borders in dark theme instead of showing light surfaces.
+- On mobile, branches, commits, and selected-commit file details stack vertically in that order and stay inside the viewport in both light theme and dark theme.
 - Loading and error messages remain visible in the dropdown without using browser alerts.
 - Dropdown surfaces, text, badges, and errors are readable in both light theme and dark theme.
 
 #### Rollback/Cleanup
-- Restore any dirty-worktree file changed for validation.
-- Restore or delete the disposable branch used for reset validation.
+- Switch back to the original branch used before the test.
+- Reset or delete the disposable local branch used for commit reset validation.
+- Revert or discard the tracked dirty-worktree file created for the blocked-switch validation.
+- Delete any untracked files created for untracked preservation validation.
+- Delete any tracked test commits/files created for whitespace-path commit-list validation.
+- Inspect and remove test-only files under `.codex/untracked-backups/` after confirming backup behavior.
+- Clear any copied commit SHA from the clipboard if the test environment requires clipboard cleanup.
 
 ---