diff --git a/src/renderer/src/components/ChangesTab.tsx b/src/renderer/src/components/ChangesTab.tsx
index 3279162..9319dd7 100644
--- a/src/renderer/src/components/ChangesTab.tsx
+++ b/src/renderer/src/components/ChangesTab.tsx
@@ -5,6 +5,7 @@ import { invoke, isMac } from '../api';
 import * as actions from '../state/actions';
 import { openDialog, patchChanges, store, useAppStore } from '../state/store';
 import { liveFindings, SEVERITY_ICON, SEVERITY_TONE } from './review/ReviewView';
+import { onListKeyDown } from '../lib/listKeys';
 import { Avatar, Button, Checkbox, Icon, PathLabel, Spinner, openContextMenu, statusIcon, statusLabel, type MenuItem } from './ui';
 
 const SUMMARY_LIMIT = 72;
@@ -81,7 +82,7 @@ export function ChangesTab(): React.JSX.Element {
           </span>
         ) : null}
       </div>
-      <div className="file-list" onContextMenu={(e) => { if ((e.target as HTMLElement).closest('.file-row')) return; if (files.length) openContextMenu(e, [{ label: 'Discard all changes…', danger: true, onClick: () => actions.requestDiscard(files.map((f) => f.path), true) }, { label: 'Stash all changes', onClick: () => void actions.stashAll() }]); }}>
+      <div className="file-list" role="listbox" aria-multiselectable aria-label="Changed files" onKeyDown={onListKeyDown} onContextMenu={(e) => { if ((e.target as HTMLElement).closest('.file-row')) return; if (files.length) openContextMenu(e, [{ label: 'Discard all changes…', danger: true, onClick: () => actions.requestDiscard(files.map((f) => f.path), true) }, { label: 'Stash all changes', onClick: () => void actions.stashAll() }]); }}>
         {status && files.length === 0 ? (
           <div className="empty-state" style={{ padding: 24 }}>
             <Icon name="check-circle" size={28} />
@@ -95,6 +96,9 @@ export function ChangesTab(): React.JSX.Element {
           return (
             <div
               key={file.path}
+              tabIndex={0}
+              role="option"
+              aria-selected={selected}
               className={`file-row ${selected ? 'selected' : ''} ${selected && !focused ? 'inactive' : ''}`}
               onClick={(e) => actions.selectWorkingFile(file.path, { toggle: e.ctrlKey || e.metaKey, range: e.shiftKey })}
               onContextMenu={(e) => contextMenu(e, file)}
@@ -201,7 +205,7 @@ function PrecommitFindingRow({ finding, stale, active }: { finding: ReviewFindin
 
 export function CommitFileRow({ file, selected, onSelect, onContextMenu }: { file: CommitFile; selected: boolean; onSelect: () => void; onContextMenu?: (e: React.MouseEvent) => void }): React.JSX.Element {
   return (
-    <div className={`file-row ${selected ? 'selected' : ''}`} onClick={onSelect} onContextMenu={onContextMenu}>
+    <div tabIndex={0} role="option" aria-selected={selected} className={`file-row ${selected ? 'selected' : ''}`} onClick={onSelect} onContextMenu={onContextMenu}>
       <PathLabel path={file.path} />
       {file.lfs ? <Icon name="download" size={12} className="muted" title="Git LFS pointer" /> : null}
       {file.additions !== null || file.deletions !== null ? (
@@ -299,33 +303,6 @@ function CommitForm(): React.JSX.Element {
           spellCheck
           autoComplete="off"
         />
-        {willSign ? <Icon name="lock" size={14} className="muted" title="Commits are signed" /> : null}
-        {settings?.ai.provider !== 'disabled' ? (
-          <Button variant="ghost" iconOnly icon="sparkle" className="sparkle" loading={aiCommitBusy} title="Generate commit message with AI" onClick={() => void actions.generateCommitMessage()} disabled={included.length === 0 || changes.committing} />
-        ) : null}
-        {settings?.ai.provider !== 'disabled' ? (
-          <Button variant="ghost" iconOnly icon="eye" loading={precommitReview.running} title="Review changes with AI before committing" onClick={() => void actions.reviewChangesBeforeCommit()} disabled={included.length === 0 || changes.committing} />
-        ) : null}
-        {actions.splitEntryVisible() ? (
-          <Button
-            variant="ghost"
-            iconOnly
-            icon="kebab"
-            title="More AI actions"
-            disabled={changes.committing}
-            onClick={(e) =>
-              openContextMenu(e, [
-                {
-                  label: 'Split into commits with AI…',
-                  icon: 'sparkle',
-                  disabled: !actions.splitEntryEnabled(),
-                  title: actions.splitEntryEnabled() ? undefined : 'At least two changed files are needed to split into commits.',
-                  onClick: () => actions.openSplitDialog(),
-                },
-              ])
-            }
-          />
-        ) : null}
       </div>
       {summaryTooLong && settings?.showCommitLengthWarning !== false ? (
         <span className="length-warning">
@@ -366,6 +343,33 @@ function CommitForm(): React.JSX.Element {
       <div className="form-actions">
         <div className="left">
           <Button variant="ghost" size="sm" icon="person" title={changes.showCoAuthors ? 'Remove co-authors' : 'Add co-authors'} onClick={() => patchChanges((c) => ({ showCoAuthors: !c.showCoAuthors }))} />
+          {willSign ? <Icon name="lock" size={14} className="muted" title="Commits are signed" /> : null}
+          {settings?.ai.provider !== 'disabled' ? (
+            <Button variant="ghost" iconOnly icon="sparkle" className="sparkle" loading={aiCommitBusy} title="Generate commit message with AI" onClick={() => void actions.generateCommitMessage()} disabled={included.length === 0 || changes.committing} />
+          ) : null}
+          {settings?.ai.provider !== 'disabled' ? (
+            <Button variant="ghost" iconOnly icon="eye" loading={precommitReview.running} title="Review changes with AI before committing" onClick={() => void actions.reviewChangesBeforeCommit()} disabled={included.length === 0 || changes.committing} />
+          ) : null}
+          {actions.splitEntryVisible() ? (
+            <Button
+              variant="ghost"
+              iconOnly
+              icon="kebab"
+              title="More AI actions"
+              disabled={changes.committing}
+              onClick={(e) =>
+                openContextMenu(e, [
+                  {
+                    label: 'Split into commits with AI…',
+                    icon: 'sparkle',
+                    disabled: !actions.splitEntryEnabled(),
+                    title: actions.splitEntryEnabled() ? undefined : 'At least two changed files are needed to split into commits.',
+                    onClick: () => actions.openSplitDialog(),
+                  },
+                ])
+              }
+            />
+          ) : null}
           {repo?.github ? <Button variant="ghost" size="sm" icon="issue" title="Reference an issue" onClick={() => actions.openIssuesDialog()}>#</Button> : null}
           <Checkbox checked={changes.amend} onChange={(v) => void actions.setAmend(v)} label="Amend last commit" disabled={changes.committing || !!status?.branch.unborn || inMerge} />
         </div>
diff --git a/src/renderer/src/components/HealthView.tsx b/src/renderer/src/components/HealthView.tsx
index 380830c..d16441d 100644
--- a/src/renderer/src/components/HealthView.tsx
+++ b/src/renderer/src/components/HealthView.tsx
@@ -77,20 +77,22 @@ function LargeFilesCard(): React.JSX.Element {
   const [status, setStatus] = useState<CardStatus>('idle');
   const [error, setError] = useState<string | null>(null);
   const [blobs, setBlobs] = useState<LargeBlob[]>([]);
+  const [cancelled, setCancelled] = useState(false);
   const [lfsInstalled, setLfsInstalled] = useState(false);
 
   const load = async (): Promise<void> => {
     if (!repo) return;
     setStatus('loading');
+    setCancelled(false);
     try {
       const [result, tools] = await Promise.all([invoke('repo.health.largeFiles', repo.path, LARGE_FILE_LIMIT), invoke('app.tools', false)]);
       setBlobs(result);
       setLfsInstalled(tools.gitLfs.installed);
       setStatus('idle');
     } catch (err) {
-      // A cancelled scan returns to idle with no partial results, rather than showing an error.
+      // A cancelled scan returns to idle, keeping whatever results the previous scan found.
       if (errorInfo(err).code === 'cancelled') {
-        setBlobs([]);
+        setCancelled(true);
         setStatus('idle');
       } else {
         setError(errorMessage(err));
@@ -100,6 +102,7 @@ function LargeFilesCard(): React.JSX.Element {
   };
 
   useEffect(() => {
+    setBlobs([]);
     void load();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [repo?.path]);
@@ -111,6 +114,8 @@ function LargeFilesCard(): React.JSX.Element {
           <Spinner /> Scanning history…
           <Button size="sm" variant="ghost" onClick={() => void invoke('app.operations.cancel', progress.id)}>Cancel</Button>
         </div>
+      ) : cancelled && !blobs.length ? (
+        <p className="muted">Scan cancelled.</p>
       ) : !blobs.length ? (
         <p className="muted">No large blobs found in history.</p>
       ) : (
diff --git a/src/renderer/src/components/HistoryTab.tsx b/src/renderer/src/components/HistoryTab.tsx
index 2cf4f7e..a0fbe18 100644
--- a/src/renderer/src/components/HistoryTab.tsx
+++ b/src/renderer/src/components/HistoryTab.tsx
@@ -5,6 +5,7 @@ import * as actions from '../state/actions';
 import { historyFilterActive, historyReorderDisabled } from '../state/actions';
 import { openDialog, patchHistory, setPopover, store, useAppStore } from '../state/store';
 import { CommitFileRow } from './ChangesTab';
+import { onListKeyDown } from '../lib/listKeys';
 import { Avatar, Badge, Button, Checkbox, FilterInput, Icon, RelativeTime, Spinner, TextField, openContextMenu, type IconName, type MenuItem } from './ui';
 
 const SIGNATURE_BADGES: Partial<Record<SignatureStatus, { icon: IconName; className: string; label: (signer: string | null) => string }>> = {
@@ -133,6 +134,10 @@ export function HistoryTab(): React.JSX.Element {
       ) : null}
       <div
         className="commit-list"
+        role="listbox"
+        aria-multiselectable
+        aria-label="Commits"
+        onKeyDown={onListKeyDown}
         onDragOver={(e) => {
           if (history.dragging) {
             e.preventDefault();
@@ -148,7 +153,24 @@ export function HistoryTab(): React.JSX.Element {
             <Spinner /> Loading history…
           </div>
         ) : null}
-        {!history.loading && !history.commits.length ? <div className="list-empty">{filterActive ? 'No commits match your search.' : status?.branch.unborn ? 'No commits yet.' : 'No history to show.'}</div> : null}
+        {!history.loading && !history.commits.length ? (
+          <div className="list-empty">
+            {history.error ? (
+              <>
+                {history.error}
+                <div>
+                  <Button size="sm" onClick={() => void actions.loadHistory(true)}>Retry</Button>
+                </div>
+              </>
+            ) : filterActive ? (
+              'No commits match your search.'
+            ) : status?.branch.unborn ? (
+              'No commits yet.'
+            ) : (
+              'No history to show.'
+            )}
+          </div>
+        ) : null}
         {dragOver === 'top' && history.dragging ? <div style={{ height: 2, background: 'var(--accent)' }} /> : null}
         {history.commits.map((c, index) => {
           const selected = history.selectedShas.includes(c.sha);
@@ -158,6 +180,9 @@ export function HistoryTab(): React.JSX.Element {
           return (
             <div
               key={c.sha}
+              tabIndex={0}
+              role="option"
+              aria-selected={selected}
               className={`commit-row ${selected ? 'selected' : ''} ${selected && !focused ? 'inactive' : ''} ${dragOver === c.sha ? 'drag-over' : ''}`}
               onClick={(e) => actions.selectCommit(c.sha, { toggle: e.ctrlKey || e.metaKey, range: e.shiftKey })}
               onContextMenu={(e) => {
@@ -307,8 +332,11 @@ export function CommitDetailsPane(): React.JSX.Element {
   if (!details) {
     return (
       <div className="empty-state">
-        {history.detailsLoading ? <Spinner large /> : <Icon name="history" size={32} />}
-        <p>{history.detailsLoading ? 'Loading commit…' : 'Select a commit to view its changes.'}</p>
+        {history.detailsLoading ? <Spinner large /> : <Icon name={history.detailsError ? 'alert' : 'history'} size={32} />}
+        <p>{history.detailsLoading ? 'Loading commit…' : history.detailsError ?? 'Select a commit to view its changes.'}</p>
+        {history.detailsError ? (
+          <Button size="sm" onClick={() => void actions.loadCommitDetails(history.selectedShas[0])}>Retry</Button>
+        ) : null}
       </div>
     );
   }
@@ -370,7 +398,7 @@ export function CommitDetailsPane(): React.JSX.Element {
               {visibleFiles.length} {history.matchingFiles ? 'matching' : 'changed'} file{visibleFiles.length === 1 ? '' : 's'}
             </span>
           </div>
-          <div className="file-list">
+          <div className="file-list" role="listbox" aria-label="Changed files" onKeyDown={onListKeyDown}>
             {visibleFiles.map((f) => (
               <CommitFileRow
                 key={f.path}
diff --git a/src/renderer/src/components/StashesTab.tsx b/src/renderer/src/components/StashesTab.tsx
index 1e9de3f..c4eae94 100644
--- a/src/renderer/src/components/StashesTab.tsx
+++ b/src/renderer/src/components/StashesTab.tsx
@@ -3,6 +3,7 @@ import type { Stash } from '@shared/types';
 import * as actions from '../state/actions';
 import { openDialog, useAppStore } from '../state/store';
 import { CommitFileRow } from './ChangesTab';
+import { onListKeyDown } from '../lib/listKeys';
 import { Button, Icon, RelativeTime, Spinner, openContextMenu, type MenuItem } from './ui';
 
 const FILE_PAGE = 2000;
@@ -48,7 +49,7 @@ export function StashesView(): React.JSX.Element {
           <span style={{ flex: 1 }} />
           <Button size="sm" variant="ghost" iconOnly icon="x" title="Back to changes" onClick={() => actions.setView('changes')} />
         </div>
-        <div className="file-list">
+        <div className="file-list" role="listbox" aria-label="Stashes" onKeyDown={onListKeyDown}>
           {view.loading && !stashes.length ? (
             <div className="list-empty">
               <Spinner /> Loading stashes…
@@ -64,6 +65,9 @@ export function StashesView(): React.JSX.Element {
           {sorted.map((st) => (
             <div
               key={st.sha}
+              tabIndex={0}
+              role="option"
+              aria-selected={view.selectedSha === st.sha}
               className={`list-row ${view.selectedSha === st.sha ? 'selected' : ''}`}
               onClick={() => void actions.selectStash(st.sha)}
               onContextMenu={(e) => {
@@ -90,7 +94,7 @@ export function StashesView(): React.JSX.Element {
             <div className="changes-header">
               <span className="count">{view.files.length} changed file{view.files.length === 1 ? '' : 's'}</span>
             </div>
-            <div className="file-list">
+            <div className="file-list" role="listbox" aria-label="Changed files" onKeyDown={onListKeyDown}>
               {view.filesLoading ? (
                 <div className="list-empty">
                   <Spinner />
diff --git a/src/renderer/src/components/Welcome.tsx b/src/renderer/src/components/Welcome.tsx
index f927b47..a5153ba 100644
--- a/src/renderer/src/components/Welcome.tsx
+++ b/src/renderer/src/components/Welcome.tsx
@@ -6,6 +6,7 @@ import { Button, Icon, RelativeTime } from './ui';
 export function Welcome(): React.JSX.Element {
   const repos = useAppStore((s) => s.repos);
   const work = useAppStore((s) => s.work);
+  const workError = useAppStore((s) => s.workError);
   const account = useAppStore((s) => s.tools?.ghAccount ?? null);
   const recent = [...repos].sort((a, b) => b.lastOpened - a.lastOpened).slice(0, 6);
 
@@ -77,6 +78,12 @@ export function Welcome(): React.JSX.Element {
               </div>
             ))}
           </div>
+        ) : workError ? (
+          <div className="welcome-recent">
+            <h3>Repository health</h3>
+            <p className="muted">{workError}</p>
+            <Button size="sm" onClick={() => void actions.loadWork()}>Retry</Button>
+          </div>
         ) : null}
       </div>
     </div>
diff --git a/src/renderer/src/components/dialogs/SettingsDialog.tsx b/src/renderer/src/components/dialogs/SettingsDialog.tsx
index e3b312d..81d703a 100644
--- a/src/renderer/src/components/dialogs/SettingsDialog.tsx
+++ b/src/renderer/src/components/dialogs/SettingsDialog.tsx
@@ -179,8 +179,8 @@ function GitTab({ settings, update }: { settings: AppSettings; update: (p: Parti
       <WatchedFoldersCard settings={settings} update={update} />
       <h4>Pull behavior</h4>
       <div className="settings-row">
-        <label>When pulling</label>
-        <select value={settings.pullBehavior} onChange={(e) => update({ pullBehavior: e.target.value as AppSettings['pullBehavior'] })}>
+        <label htmlFor="settings-pull-behavior">When pulling</label>
+        <select id="settings-pull-behavior" value={settings.pullBehavior} onChange={(e) => update({ pullBehavior: e.target.value as AppSettings['pullBehavior'] })}>
           <option value="git-config">Follow Git config (pull.rebase)</option>
           <option value="merge">Merge remote changes</option>
           <option value="rebase">Rebase local commits on top</option>
@@ -188,8 +188,8 @@ function GitTab({ settings, update }: { settings: AppSettings; update: (p: Parti
       </div>
       <h4>Background fetch</h4>
       <div className="settings-row">
-        <label>Fetch every</label>
-        <select value={settings.autoFetchIntervalMinutes} onChange={(e) => update({ autoFetchIntervalMinutes: Number(e.target.value) })}>
+        <label htmlFor="settings-fetch-interval">Fetch every</label>
+        <select id="settings-fetch-interval" value={settings.autoFetchIntervalMinutes} onChange={(e) => update({ autoFetchIntervalMinutes: Number(e.target.value) })}>
           <option value={0}>Never</option>
           <option value={5}>5 minutes</option>
           <option value={10}>10 minutes</option>
@@ -199,12 +199,13 @@ function GitTab({ settings, update }: { settings: AppSettings; update: (p: Parti
       </div>
       <h4>Repository health</h4>
       <div className="settings-row">
-        <label>A branch is inactive after</label>
-        <input type="number" min={1} max={3650} value={settings.staleBranchDays} onChange={(e) => update({ staleBranchDays: Math.max(1, Number(e.target.value) || 90) })} style={{ flex: '0 0 80px' }} /> days without a commit
+        <label htmlFor="settings-stale-branch-days">A branch is inactive after</label>
+        <input id="settings-stale-branch-days" type="number" min={1} max={3650} value={settings.staleBranchDays} onChange={(e) => update({ staleBranchDays: Math.max(1, Number(e.target.value) || 90) })} style={{ flex: '0 0 80px' }} /> days without a commit
       </div>
       <div className="settings-row">
-        <label>Warn about blobs at or above</label>
+        <label htmlFor="settings-large-file-threshold">Warn about blobs at or above</label>
         <input
+          id="settings-large-file-threshold"
           type="number"
           min={1}
           max={2048}
@@ -528,15 +529,15 @@ function AppearanceTab({ settings, update }: { settings: AppSettings; update: (p
       </div>
       <h4>Diff</h4>
       <div className="settings-row">
-        <label>Default view</label>
-        <select value={settings.diffViewMode} onChange={(e) => update({ diffViewMode: e.target.value as 'unified' | 'split' })}>
+        <label htmlFor="settings-diff-view-mode">Default view</label>
+        <select id="settings-diff-view-mode" value={settings.diffViewMode} onChange={(e) => update({ diffViewMode: e.target.value as 'unified' | 'split' })}>
           <option value="unified">Unified</option>
           <option value="split">Split (side by side)</option>
         </select>
       </div>
       <div className="settings-row">
-        <label>Font size</label>
-        <input type="number" min={9} max={24} value={settings.diffFontSize} onChange={(e) => update({ diffFontSize: Math.max(9, Math.min(24, Number(e.target.value) || 12)) })} style={{ flex: '0 0 80px' }} />
+        <label htmlFor="settings-diff-font-size">Font size</label>
+        <input id="settings-diff-font-size" type="number" min={9} max={24} value={settings.diffFontSize} onChange={(e) => update({ diffFontSize: Math.max(9, Math.min(24, Number(e.target.value) || 12)) })} style={{ flex: '0 0 80px' }} />
       </div>
       <Checkbox checked={settings.diffSyntaxHighlighting} onChange={(v) => update({ diffSyntaxHighlighting: v })} label="Syntax highlighting" />
       <Checkbox checked={settings.diffShowIntraline} onChange={(v) => update({ diffShowIntraline: v })} label="Highlight word-level changes within modified lines" />
@@ -710,8 +711,8 @@ function AiTab({ settings, update }: { settings: AppSettings; update: (p: Partia
       <h3>AI conflict resolution</h3>
       <p className="muted" style={{ fontSize: 12, marginTop: 0 }}>One click asks Claude to reconcile both sides of every conflict block in a file. Only the conflicted regions, some surrounding context and the commit subjects on each side are sent. Results are written to the file and can be undone.</p>
       <div className="settings-row">
-        <label>Provider</label>
-        <select value={ai.provider} onChange={(e) => updateAi({ provider: e.target.value as AppSettings['ai']['provider'] })}>
+        <label htmlFor="settings-ai-provider">Provider</label>
+        <select id="settings-ai-provider" value={ai.provider} onChange={(e) => updateAi({ provider: e.target.value as AppSettings['ai']['provider'] })}>
           <option value="anthropic">Anthropic API (API key)</option>
           <option value="claude-cli">Claude Code CLI (uses your existing login)</option>
           <option value="disabled">Disabled</option>
@@ -737,11 +738,11 @@ function AiTab({ settings, update }: { settings: AppSettings; update: (p: Partia
       {ai.provider !== 'disabled' ? (
         <>
           <div className="settings-row">
-            <label>Model</label>
+            <label htmlFor="settings-ai-model">Model</label>
             {customModel ? (
-              <input value={ai.model} onChange={(e) => updateAi({ model: e.target.value })} spellCheck={false} />
+              <input id="settings-ai-model" value={ai.model} onChange={(e) => updateAi({ model: e.target.value })} spellCheck={false} />
             ) : (
-              <select value={ai.model} onChange={(e) => updateAi({ model: e.target.value })}>
+              <select id="settings-ai-model" value={ai.model} onChange={(e) => updateAi({ model: e.target.value })}>
                 {MODELS.map((m) => (
                   <option key={m.id} value={m.id}>{m.label}</option>
                 ))}
@@ -750,8 +751,8 @@ function AiTab({ settings, update }: { settings: AppSettings; update: (p: Partia
             <Button size="sm" variant="ghost" onClick={() => setCustomModel((v) => !v)}>{customModel ? 'Presets' : 'Custom'}</Button>
           </div>
           <div className="settings-row">
-            <label>Effort</label>
-            <select value={ai.effort} onChange={(e) => updateAi({ effort: e.target.value as AppSettings['ai']['effort'] })}>
+            <label htmlFor="settings-ai-effort">Effort</label>
+            <select id="settings-ai-effort" value={ai.effort} onChange={(e) => updateAi({ effort: e.target.value as AppSettings['ai']['effort'] })}>
               <option value="low">Low (fastest)</option>
               <option value="medium">Medium</option>
               <option value="high">High (default)</option>
@@ -763,16 +764,16 @@ function AiTab({ settings, update }: { settings: AppSettings; update: (p: Partia
           <PostResolveCheckSettings ai={ai} updateAi={updateAi} />
           <h4 style={{ margin: '16px 0 6px', fontSize: 12, textTransform: 'uppercase', color: 'var(--fg-muted)' }}>Pull request review</h4>
           <div className="settings-row">
-            <label>Strictness</label>
-            <select value={ai.reviewStrictness} onChange={(e) => updateAi({ reviewStrictness: e.target.value as AppSettings['ai']['reviewStrictness'] })}>
+            <label htmlFor="settings-ai-review-strictness">Strictness</label>
+            <select id="settings-ai-review-strictness" value={ai.reviewStrictness} onChange={(e) => updateAi({ reviewStrictness: e.target.value as AppSettings['ai']['reviewStrictness'] })}>
               <option value="strict">Strict — only confident blockers and warnings (default)</option>
               <option value="balanced">Balanced — adds test gaps and readability</option>
               <option value="thorough">Thorough — includes style nits</option>
             </select>
           </div>
           <div className="settings-row">
-            <label>Review file limit</label>
-            <input type="number" min={1} max={200} value={ai.reviewMaxFiles} onChange={(e) => updateAi({ reviewMaxFiles: Math.max(1, Math.min(200, parseInt(e.target.value, 10) || 40)) })} style={{ width: 80 }} />
+            <label htmlFor="settings-ai-review-max-files">Review file limit</label>
+            <input id="settings-ai-review-max-files" type="number" min={1} max={200} value={ai.reviewMaxFiles} onChange={(e) => updateAi({ reviewMaxFiles: Math.max(1, Math.min(200, parseInt(e.target.value, 10) || 40)) })} style={{ width: 80 }} />
             <span className="hint">Files beyond this limit are listed as skipped in the pre-flight card.</span>
           </div>
           <Checkbox checked={ai.reviewPostFooter} onChange={(v) => updateAi({ reviewPostFooter: v })} label="Append an “AI-assisted” footer to reviews posted to GitHub" />
@@ -782,8 +783,8 @@ function AiTab({ settings, update }: { settings: AppSettings; update: (p: Partia
           <p className="muted" style={{ fontSize: 12, marginTop: 0 }}>Triage sends pull request metadata only (titles, bodies, labels, review and check state) — never a diff.</p>
           <h4 style={{ margin: '16px 0 6px', fontSize: 12, textTransform: 'uppercase', color: 'var(--fg-muted)' }}>Release notes</h4>
           <div className="settings-row">
-            <label>Audience</label>
-            <select value={ai.releaseNotesAudience} onChange={(e) => updateAi({ releaseNotesAudience: e.target.value as AppSettings['ai']['releaseNotesAudience'] })}>
+            <label htmlFor="settings-ai-release-notes-audience">Audience</label>
+            <select id="settings-ai-release-notes-audience" value={ai.releaseNotesAudience} onChange={(e) => updateAi({ releaseNotesAudience: e.target.value as AppSettings['ai']['releaseNotesAudience'] })}>
               <option value="users">Users — skip internal refactors and CI-only changes</option>
               <option value="developers">Developers — include implementation detail</option>
             </select>
@@ -793,8 +794,8 @@ function AiTab({ settings, update }: { settings: AppSettings; update: (p: Partia
           <p className="muted" style={{ fontSize: 12, marginTop: 0 }}>Runs the AI review on the exact patch Commit would apply. If it finds anything, a dialog lets you commit anyway or go back; committing is never blocked.</p>
           <h4 style={{ margin: '16px 0 6px', fontSize: 12, textTransform: 'uppercase', color: 'var(--fg-muted)' }}>Agent for fixes</h4>
           <div className="settings-row">
-            <label>Fix with agent runs</label>
-            <select value={ai.agentCommand} onChange={(e) => updateAi({ agentCommand: e.target.value as AppSettings['ai']['agentCommand'] })}>
+            <label htmlFor="settings-ai-agent-command">Fix with agent runs</label>
+            <select id="settings-ai-agent-command" value={ai.agentCommand} onChange={(e) => updateAi({ agentCommand: e.target.value as AppSettings['ai']['agentCommand'] })}>
               {AGENT_PRESETS.map((p) => <option key={p.id} value={p.id}>{p.label} ({p.binary})</option>)}
               <option value="custom">Custom command…</option>
             </select>
@@ -889,8 +890,8 @@ function AdvancedTab({ settings, update }: { settings: AppSettings; update: (p:
       <Checkbox checked={settings.autoDownloadUpdates} onChange={(v) => update({ autoDownloadUpdates: v })} label="Automatically download updates once found" disabled={!settings.checkForUpdatesAutomatically} />
       <p className="muted" style={{ fontSize: 12, marginTop: 0 }}>This build can only detect and link to new releases; it cannot download or install them yet. Automatic download will take effect once that ships.</p>
       <div className="settings-row">
-        <label>Channel</label>
-        <select value={settings.updateChannel} onChange={(e) => update({ updateChannel: e.target.value as AppSettings['updateChannel'] })}>
+        <label htmlFor="settings-update-channel">Channel</label>
+        <select id="settings-update-channel" value={settings.updateChannel} onChange={(e) => update({ updateChannel: e.target.value as AppSettings['updateChannel'] })}>
           <option value="stable">Stable</option>
           <option value="beta">Beta (includes prereleases)</option>
         </select>
diff --git a/src/renderer/src/components/review/ReviewView.tsx b/src/renderer/src/components/review/ReviewView.tsx
index bd6f365..18b8e1c 100644
--- a/src/renderer/src/components/review/ReviewView.tsx
+++ b/src/renderer/src/components/review/ReviewView.tsx
@@ -3,6 +3,7 @@ import type { ReviewFinding, ReviewRun, ReviewSeverity } from '@shared/types';
 import { isMac } from '../../api';
 import * as actions from '../../state/actions';
 import { useAppStore, type PrReviewRun } from '../../state/store';
+import { onListKeyDown } from '../../lib/listKeys';
 import { CommitFileRow } from '../ChangesTab';
 import { Badge, Button, Icon, PathLabel, Spinner, openContextMenu, type IconName } from '../ui';
 
@@ -67,7 +68,7 @@ export function ReviewView(): React.JSX.Element {
           <span className="count truncate" title={run.target.kind === 'pr' ? run.target.title : undefined}>{targetLabel(run)}</span>
           <Button size="sm" variant="ghost" iconOnly icon="x" title="Close review" onClick={() => actions.closeReview()} />
         </div>
-        <div className="file-list">
+        <div className="file-list" role="listbox" aria-label="Reviewed files" onKeyDown={onListKeyDown}>
           {reviewedFiles.map((entry) => {
             const f = entry.file;
             const c = countByPath.get(f.path);
diff --git a/src/renderer/src/components/ui.tsx b/src/renderer/src/components/ui.tsx
index 056ba46..b6dc17d 100644
--- a/src/renderer/src/components/ui.tsx
+++ b/src/renderer/src/components/ui.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useLayoutEffect, useMemo, useRef, useState, type ButtonHTMLAttributes, type InputHTMLAttributes, type ReactNode } from 'react';
+import React, { useEffect, useId, useLayoutEffect, useMemo, useRef, useState, type ButtonHTMLAttributes, type InputHTMLAttributes, type ReactNode } from 'react';
 import { formatRelativeTime } from '@shared/util';
 import { invoke } from '../api';
 import { store, useAppStore } from '../state/store';
@@ -131,18 +131,22 @@ interface FieldProps extends InputHTMLAttributes<HTMLInputElement> {
 }
 
 export function TextField({ label, hint, error, trailing, className, ...rest }: FieldProps): React.JSX.Element {
+  const autoId = useId();
+  const id = rest.id ?? autoId;
+  const message = error ?? hint;
+  const messageId = message ? `${id}-message` : undefined;
   return (
     <div className={`field ${className ?? ''}`}>
-      {label ? <label>{label}</label> : null}
+      {label ? <label htmlFor={id}>{label}</label> : null}
       {trailing ? (
         <div className="field-row">
-          <input {...rest} />
+          <input {...rest} id={id} aria-invalid={error ? true : undefined} aria-describedby={messageId} />
           {trailing}
         </div>
       ) : (
-        <input {...rest} />
+        <input {...rest} id={id} aria-invalid={error ? true : undefined} aria-describedby={messageId} />
       )}
-      {error ? <span className="error">{error}</span> : hint ? <span className="hint">{hint}</span> : null}
+      {error ? <span id={messageId} className="error">{error}</span> : hint ? <span id={messageId} className="hint">{hint}</span> : null}
     </div>
   );
 }
@@ -237,11 +241,13 @@ interface ContextMenuState {
 }
 
 let menuState: ContextMenuState | null = null;
+let menuOpener: HTMLElement | null = null;
 const menuListeners = new Set<() => void>();
 
 export function openContextMenu(e: { clientX: number; clientY: number; preventDefault(): void; stopPropagation(): void }, items: MenuItem[]): void {
   e.preventDefault();
   e.stopPropagation();
+  menuOpener = document.activeElement as HTMLElement | null;
   menuState = { x: e.clientX, y: e.clientY, items };
   for (const l of menuListeners) l();
 }
@@ -264,11 +270,19 @@ export function ContextMenuHost(): React.JSX.Element | null {
   }, []);
   useEffect(() => {
     if (!menuState) return;
+    const opener = menuOpener;
+    ref.current?.querySelector<HTMLElement>('button:not(:disabled)')?.focus();
     const onDown = (ev: MouseEvent) => {
       if (ref.current && !ref.current.contains(ev.target as Node)) closeContextMenu();
     };
     const onKey = (ev: KeyboardEvent) => {
       if (ev.key === 'Escape') closeContextMenu();
+      if (ev.key !== 'ArrowDown' && ev.key !== 'ArrowUp') return;
+      ev.preventDefault();
+      const items = [...(ref.current?.querySelectorAll<HTMLElement>('button:not(:disabled)') ?? [])];
+      if (!items.length) return;
+      const i = items.indexOf(document.activeElement as HTMLElement);
+      items[(i + (ev.key === 'ArrowDown' ? 1 : items.length - 1)) % items.length].focus();
     };
     window.addEventListener('mousedown', onDown, true);
     window.addEventListener('keydown', onKey, true);
@@ -277,8 +291,9 @@ export function ContextMenuHost(): React.JSX.Element | null {
       window.removeEventListener('mousedown', onDown, true);
       window.removeEventListener('keydown', onKey, true);
       window.removeEventListener('blur', closeContextMenu);
+      if (opener?.isConnected && (document.activeElement === document.body || ref.current?.contains(document.activeElement))) opener.focus();
     };
-  });
+  }, [menuState]);
   useLayoutEffect(() => {
     const el = ref.current;
     if (!el || !menuState) return;
@@ -326,24 +341,54 @@ export function ContextMenuHost(): React.JSX.Element | null {
 
 export function Dialog({ title, onClose, children, footer, width, icon, dismissible = true, className }: { title: ReactNode; onClose: () => void; children: ReactNode; footer?: ReactNode; width?: 'default' | 'wide' | 'xwide'; icon?: IconName; dismissible?: boolean; className?: string }): React.JSX.Element {
   const ref = useRef<HTMLDivElement>(null);
+  const titleId = useId();
+  const opener = useRef<HTMLElement | null>(null);
+  if (opener.current === null) {
+    const active = document.activeElement as HTMLElement | null;
+    opener.current = active?.closest('[role="menu"]') ? menuOpener : active;
+  }
+  useEffect(() => {
+    const active = document.activeElement as HTMLElement | null;
+    if (!ref.current?.contains(active)) {
+      if (active && active !== document.body) opener.current = active;
+      ref.current?.querySelector<HTMLElement>('.dialog-body input:not([type=checkbox]), .dialog-body textarea, .dialog-body select, .dialog-footer button.primary, button')?.focus();
+    }
+    return () => {
+      if (opener.current?.isConnected) opener.current.focus();
+    };
+  }, []);
   useEffect(() => {
     const onKey = (e: KeyboardEvent) => {
       if (e.key === 'Escape' && dismissible) {
         e.stopPropagation();
         onClose();
+        return;
+      }
+      if (e.key === 'Tab') {
+        if (!ref.current || ref.current.closest('.dialog-backdrop') !== [...document.querySelectorAll('.dialog-backdrop')].at(-1)) return;
+        const focusables = [...ref.current.querySelectorAll<HTMLElement>('a[href],button:not(:disabled),input:not(:disabled),select:not(:disabled),textarea:not(:disabled),[tabindex]:not([tabindex="-1"])')];
+        if (focusables.length === 0) {
+          e.preventDefault();
+          return;
+        }
+        const first = focusables[0];
+        const last = focusables[focusables.length - 1];
+        const active = document.activeElement;
+        if (e.shiftKey ? active === first || !ref.current.contains(active) : active === last || !ref.current.contains(active)) {
+          e.preventDefault();
+          (e.shiftKey ? last : first).focus();
+        }
       }
     };
     window.addEventListener('keydown', onKey);
-    const first = ref.current?.querySelector<HTMLElement>('input:not([type=checkbox]), textarea, select, button.primary, button');
-    first?.focus();
     return () => window.removeEventListener('keydown', onKey);
   }, [dismissible, onClose]);
   return (
     <div className="dialog-backdrop" onMouseDown={(e) => e.target === e.currentTarget && dismissible && onClose()}>
-      <div ref={ref} className={`dialog ${width === 'wide' ? 'wide' : width === 'xwide' ? 'xwide' : ''} ${className ?? ''}`} role="dialog" aria-modal="true">
+      <div ref={ref} className={`dialog ${width === 'wide' ? 'wide' : width === 'xwide' ? 'xwide' : ''} ${className ?? ''}`} role="dialog" aria-modal="true" aria-labelledby={titleId}>
         <div className="dialog-header">
           {icon ? <Icon name={icon} /> : null}
-          <h2>{title}</h2>
+          <h2 id={titleId}>{title}</h2>
           {dismissible ? <Button variant="ghost" iconOnly icon="x" onClick={onClose} title="Close" /> : null}
         </div>
         <div className="dialog-body">{children}</div>
@@ -379,11 +424,11 @@ export function useFilter<T>(items: T[], query: string, keys: (item: T) => strin
   }, [items, query, keys]);
 }
 
-export function FilterInput({ value, onChange, placeholder, id, autoFocus }: { value: string; onChange: (v: string) => void; placeholder: string; id?: string; autoFocus?: boolean }): React.JSX.Element {
+export function FilterInput({ value, onChange, placeholder, label, id, autoFocus }: { value: string; onChange: (v: string) => void; placeholder: string; label?: string; id?: string; autoFocus?: boolean }): React.JSX.Element {
   return (
     <div className="filter-input">
       <Icon name="search" />
-      <input id={id} type="text" value={value} placeholder={placeholder} autoFocus={autoFocus} onChange={(e) => onChange(e.target.value)} spellCheck={false} />
+      <input id={id} type="text" value={value} placeholder={placeholder} aria-label={label ?? placeholder} autoFocus={autoFocus} onChange={(e) => onChange(e.target.value)} spellCheck={false} />
     </div>
   );
 }
diff --git a/src/renderer/src/lib/listKeys.ts b/src/renderer/src/lib/listKeys.ts
new file mode 100644
index 0000000..55b2523
--- /dev/null
+++ b/src/renderer/src/lib/listKeys.ts
@@ -0,0 +1,31 @@
+import type { KeyboardEvent } from 'react';
+
+/** Shared keyboard-navigation handler for `role="listbox"` containers whose children are `role="option"` rows. */
+export function onListKeyDown(e: KeyboardEvent<HTMLElement>): void {
+  const row = (e.target as HTMLElement).closest<HTMLElement>('[role="option"]');
+  if (!row) return;
+  const options = Array.from(e.currentTarget.querySelectorAll<HTMLElement>('[role="option"]'));
+  const index = options.indexOf(row);
+  if (index < 0) return;
+
+  if (e.key === 'ArrowDown') {
+    e.preventDefault();
+    options[Math.min(index + 1, options.length - 1)].focus();
+  } else if (e.key === 'ArrowUp') {
+    e.preventDefault();
+    options[Math.max(index - 1, 0)].focus();
+  } else if (e.key === 'Home') {
+    e.preventDefault();
+    options[0].focus();
+  } else if (e.key === 'End') {
+    e.preventDefault();
+    options[options.length - 1].focus();
+  } else if ((e.key === 'Enter' || e.key === ' ') && e.target === row) {
+    e.preventDefault();
+    row.click();
+  } else if (e.key === 'ContextMenu' || (e.key === 'F10' && e.shiftKey)) {
+    e.preventDefault();
+    const rect = row.getBoundingClientRect();
+    row.dispatchEvent(new MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: rect.left + rect.width / 2, clientY: rect.top + rect.height / 2 }));
+  }
+}
diff --git a/src/renderer/src/state/actions.ts b/src/renderer/src/state/actions.ts
index 4dd3666..8a8af49 100644
--- a/src/renderer/src/state/actions.ts
+++ b/src/renderer/src/state/actions.ts
@@ -856,7 +856,7 @@ export function selectCommit(sha: string, opts: { toggle?: boolean; range?: bool
   } else {
     selected = [sha];
   }
-  patchHistory({ selectedShas: selected, details: selected.length === 1 && s.history.details?.commit.sha === selected[0] ? s.history.details : null, selectedFile: selected.length === 1 && s.history.details?.commit.sha === selected[0] ? s.history.selectedFile : null });
+  patchHistory({ selectedShas: selected, detailsError: null, details: selected.length === 1 && s.history.details?.commit.sha === selected[0] ? s.history.details : null, selectedFile: selected.length === 1 && s.history.details?.commit.sha === selected[0] ? s.history.selectedFile : null });
   if (selected.length === 1) void loadCommitDetails(selected[0]);
   else void loadDiff();
 }
@@ -869,7 +869,7 @@ export function selectCommitFile(path: string): void {
 export async function loadCommitDetails(sha: string): Promise<void> {
   const repo = store.get().currentRepo;
   if (!repo) return;
-  patchHistory({ detailsLoading: true });
+  patchHistory({ detailsLoading: true, detailsError: null });
   try {
     const details = await invoke('repo.commit.details', repo.path, sha);
     const h = store.get().history;
@@ -895,10 +895,10 @@ export async function loadCommitDetails(sha: string): Promise<void> {
     const pathAtCommit = h.path ? h.pathHistory?.find((e) => e.sha === sha)?.path ?? h.path : null;
     const preferred = pathAtCommit && visibleFiles.some((f) => f.path === pathAtCommit) ? pathAtCommit : null;
     const selectedFile = preferred ?? (h.selectedFile && visibleFiles.some((f) => f.path === h.selectedFile) ? h.selectedFile : visibleFiles[0]?.path ?? null);
-    patchHistory({ details, detailsLoading: false, selectedFile, matchingFiles });
+    patchHistory({ details, detailsLoading: false, selectedFile, matchingFiles, detailsError: null });
     void loadDiff();
   } catch (err) {
-    patchHistory({ detailsLoading: false });
+    patchHistory({ detailsLoading: false, detailsError: errorMessage(err) });
     showToast({ kind: 'error', title: 'Could not load commit', message: errorMessage(err) });
   }
 }
@@ -927,7 +927,7 @@ export async function loadHistory(reset: boolean): Promise<void> {
   const h = store.get().history;
   if (h.loading && !reset) return;
   if (slowSearchTimer) clearTimeout(slowSearchTimer);
-  patchHistory({ loading: true, slowSearch: false });
+  patchHistory({ loading: true, slowSearch: false, ...(reset ? { error: null } : {}) });
   slowSearchTimer = setTimeout(() => patchHistory({ slowSearch: true }), 5000);
   try {
     const skip = reset ? 0 : h.commits.length;
@@ -935,13 +935,13 @@ export async function loadHistory(reset: boolean): Promise<void> {
     if (store.get().currentRepo?.path !== repo.path) return;
     const commits = reset ? page.commits : [...h.commits, ...page.commits];
     const stillSelected = store.get().history.selectedShas.filter((sha) => commits.some((c) => c.sha === sha));
-    patchHistory({ commits, hasMore: page.hasMore, loading: false, slowSearch: false, selectedShas: stillSelected, details: stillSelected.length === 1 ? store.get().history.details : null });
+    patchHistory({ commits, hasMore: page.hasMore, loading: false, slowSearch: false, error: null, selectedShas: stillSelected, details: stillSelected.length === 1 ? store.get().history.details : null });
     if (store.get().view === 'history' && stillSelected.length === 0 && commits.length) selectCommit(commits[0].sha);
     else if (stillSelected.length === 1 && reset) void loadCommitDetails(stillSelected[0]);
   } catch (err) {
     // A newer history request superseded this one (the main process aborts the older git run); the newer call owns the loading state.
     if (err instanceof ApiError && err.code === 'cancelled') return;
-    patchHistory({ loading: false, slowSearch: false });
+    patchHistory({ loading: false, slowSearch: false, error: errorMessage(err) });
     showToast({ kind: 'error', title: 'Could not load history', message: errorMessage(err) });
   } finally {
     if (slowSearchTimer) {
@@ -1717,9 +1717,18 @@ export async function abortOperation(): Promise<void> {
   if (!repo || !s.status) return;
   const kind = s.status.operation.kind;
   const method = kind === 'rebase' ? 'git.rebase.abort' : kind === 'cherry-pick' ? 'git.cherryPick.abort' : kind === 'revert' ? 'git.revert.abort' : 'git.merge.abort';
-  await runOperation(`Abort ${kind}`, () => invoke(method, repo.path));
-  closeAllDialogs();
-  await loadHistory(true);
+  openDialog({
+    kind: 'confirm',
+    title: `Abort ${kind}?`,
+    message: `Conflict resolutions made during this ${kind} will be discarded and the branch returns to its pre-${kind} state.`,
+    confirmLabel: `Abort ${kind}`,
+    danger: true,
+    onConfirm: async () => {
+      await runOperation(`Abort ${kind}`, () => invoke(method, repo.path));
+      closeAllDialogs();
+      await loadHistory(true);
+    },
+  });
 }
 
 export async function skipRebaseCommit(): Promise<void> {
@@ -1851,13 +1860,25 @@ export async function undoResolutions(results: ConflictResolutionResult[]): Prom
   await loadDiff(true);
 }
 
+async function undoUseSide(repoPath: string, path: string, original: string): Promise<void> {
+  try {
+    await invoke('git.conflict.unresolve', repoPath, path, original);
+  } catch (err) {
+    showToast({ kind: 'error', title: `Could not undo ${path}`, message: errorMessage(err) });
+  }
+  await refreshStatus();
+  await loadDiff(true);
+}
+
 export async function useSide(path: string, side: 'ours' | 'theirs'): Promise<void> {
   const repo = store.get().currentRepo;
   if (!repo) return;
+  const original = await invoke('repo.readFile', repo.path, path).catch(() => null);
   try {
     await invoke('git.conflict.useSide', repo.path, path, side);
     await refreshStatus();
     await loadDiff(true);
+    showToast({ kind: 'success', title: `Took ${side} for ${path}`, action: original !== null ? { label: 'Undo', onClick: () => void undoUseSide(repo.path, path, original) } : undefined });
   } catch (err) {
     showError('Could not resolve conflict', err);
   }
@@ -2596,9 +2617,9 @@ export function openHealth(): void {
 export async function loadWork(): Promise<void> {
   try {
     const work = await invoke('repos.work');
-    store.set({ work });
-  } catch {
-    /* best-effort */
+    store.set({ work, workError: null });
+  } catch (err) {
+    store.set({ workError: errorMessage(err) });
   }
 }
 
diff --git a/src/renderer/src/state/store.ts b/src/renderer/src/state/store.ts
index 135fd82..c365874 100644
--- a/src/renderer/src/state/store.ts
+++ b/src/renderer/src/state/store.ts
@@ -127,6 +127,10 @@ export interface HistoryState {
   path: string | null;
   /** sha -> the tracked file's path at that commit, for `path` (from `repo.pathHistory`); null while loading or inactive. */
   pathHistory: PathHistoryEntry[] | null;
+  /** Set when the most recent list load failed; cleared on the next successful load and when a reset load starts. */
+  error: string | null;
+  /** Set when the most recent commit-details load failed; cleared on the next successful load and when a new load starts. */
+  detailsError: string | null;
 }
 
 export interface ReviewState {
@@ -453,6 +457,8 @@ export interface AppState {
   submoduleBannerDismissed: boolean;
   /** Unpushed work across every repository on disk; loaded on demand for the Welcome screen and, opt-in, the repository list's warning dot. */
   work: RepoWork[];
+  /** Set when the most recent `loadWork` fetch failed; previous `work` data is left in place. */
+  workError: string | null;
   /** Bumped whenever signing config is saved from Options → Git, so the commit form's signing indicator re-fetches without needing a repo switch. */
   signingConfigVersion: number;
   /** Bumped after a settings-sync action (enable/upload/download/disconnect) completes, so the sync card re-fetches status even though its confirmation dialog remounted it mid-action. */
@@ -478,7 +484,7 @@ export const initialChanges: ChangesState = {
 
 export const initialStashesView: StashesViewState = { loading: false, selectedSha: null, files: [], filesLoading: false, selectedFile: null };
 
-export const initialHistory: HistoryState = { commits: [], hasMore: false, loading: false, search: '', query: EMPTY_HISTORY_QUERY, freeText: '', queryError: null, slowSearch: false, selectedShas: [], details: null, detailsLoading: false, selectedFile: null, matchingFiles: null, dragging: null, path: null, pathHistory: null };
+export const initialHistory: HistoryState = { commits: [], hasMore: false, loading: false, search: '', query: EMPTY_HISTORY_QUERY, freeText: '', queryError: null, slowSearch: false, selectedShas: [], details: null, detailsLoading: false, selectedFile: null, matchingFiles: null, dragging: null, path: null, pathHistory: null, error: null, detailsError: null };
 
 export const initialDiff: DiffState = { key: null, diff: null, loading: false, error: null, selectedLines: null, blameOn: false, blame: null, blameLoading: false, activeBlameId: null, highlightTerm: null };
 
@@ -534,6 +540,7 @@ const initialState: AppState = {
   lfsStatus: null,
   submoduleBannerDismissed: false,
   work: [],
+  workError: null,
   signingConfigVersion: 0,
   settingsSyncVersion: 0,
   inbox: initialInbox,
diff --git a/src/renderer/src/styles/components.css b/src/renderer/src/styles/components.css
index ecf32b8..5e3c379 100644
--- a/src/renderer/src/styles/components.css
+++ b/src/renderer/src/styles/components.css
@@ -341,6 +341,12 @@
   text-align: center;
   color: var(--fg-muted);
 }
+.commit-row:focus-visible,
+.file-row:focus-visible,
+.list-row:focus-visible {
+  outline: none;
+  box-shadow: inset 0 0 0 2px var(--accent);
+}
 
 .context-menu {
   position: fixed;
@@ -527,7 +533,8 @@
   min-height: 0;
 }
 .stashes-files {
-  width: 280px;
+  width: min(280px, 32%);
+  min-width: 160px;
   flex: 0 0 auto;
   border-right: 1px solid var(--border);
   display: flex;
@@ -572,6 +579,7 @@
 }
 .commit-form .form-actions {
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
   gap: 8px;
   justify-content: space-between;
@@ -801,7 +809,8 @@
   min-height: 0;
 }
 .commit-files {
-  width: 280px;
+  width: min(280px, 32%);
+  min-width: 160px;
   flex: 0 0 auto;
   border-right: 1px solid var(--border);
   display: flex;
diff --git a/src/renderer/src/styles/global.css b/src/renderer/src/styles/global.css
index 49446b9..9012a3e 100644
--- a/src/renderer/src/styles/global.css
+++ b/src/renderer/src/styles/global.css
@@ -15,7 +15,7 @@
   --border-muted: #d8dee4;
   --fg: #1f2328;
   --fg-muted: #656d76;
-  --fg-subtle: #8c959f;
+  --fg-subtle: #6e7781;
   --fg-on-emphasis: #ffffff;
   --accent: #0969da;
   --accent-emphasis: #0969da;
@@ -78,7 +78,7 @@
   --border-muted: #21262d;
   --fg: #e6edf3;
   --fg-muted: #8d96a0;
-  --fg-subtle: #6e7681;
+  --fg-subtle: #848d97;
   --fg-on-emphasis: #ffffff;
   --accent: #4493f8;
   --accent-emphasis: #1f6feb;
@@ -86,7 +86,7 @@
   --accent-subtle: rgba(56, 139, 253, 0.15);
   --success: #3fb950;
   --success-emphasis: #238636;
-  --success-hover: #2ea043;
+  --success-hover: #207b32;
   --success-subtle: rgba(46, 160, 67, 0.15);
   --attention: #d29922;
   --attention-emphasis: #9e6a03;
@@ -314,3 +314,19 @@ kbd {
 .hljs-deletion {
   color: var(--hl-deletion);
 }
+
+@media (prefers-reduced-motion: reduce) {
+  .dialog-backdrop,
+  .dialog,
+  .toast,
+  table.diff tr.flash-highlight td {
+    animation: none !important;
+  }
+  .toolbar-progress,
+  .progress-bar > div {
+    transition: none !important;
+  }
+  .spinner {
+    animation-duration: 1.6s !important;
+  }
+}