void;
+ selectedCommitHash: CommitSelection;
+ onNavigate: (selection: CommitSelection) => void;
compact?: boolean;
showMessage?: boolean;
}
@@ -14,13 +31,17 @@ interface CommitNavBarProps {
export function CommitNavBar(props: CommitNavBarProps) {
const currentIndex = createMemo(() => {
const hash = props.selectedCommitHash;
- if (hash === null) return -1;
+ if (hash === null || hash === UNCOMMITTED_SELECTION) return -1;
return props.commits.findIndex((c) => c.hash === hash);
});
const isAllChanges = () => props.selectedCommitHash === null;
+ const isUncommittedOnly = () => props.selectedCommitHash === UNCOMMITTED_SELECTION;
const hasCommits = () => props.commits.length > 0;
- const canGoLeft = () => hasCommits() && (isAllChanges() || currentIndex() > 0);
+ // All → Uncommitted (always); Uncommitted → latest commit (needs commits);
+ // commit N → commit N-1 (needs a previous commit).
+ const canGoLeft = () =>
+ isAllChanges() || (isUncommittedOnly() && hasCommits()) || (hasCommits() && currentIndex() > 0);
const canGoRight = () => !isAllChanges();
const selectedCommit = createMemo(() => {
@@ -29,32 +50,61 @@ export function CommitNavBar(props: CommitNavBarProps) {
});
function goLeft() {
- const commits = props.commits;
- if (commits.length === 0) return;
if (isAllChanges()) {
+ props.onNavigate(UNCOMMITTED_SELECTION);
+ return;
+ }
+ if (isUncommittedOnly()) {
+ const commits = props.commits;
+ if (commits.length === 0) return;
props.onNavigate(commits[commits.length - 1].hash);
- } else {
- const idx = currentIndex();
- if (idx > 0) {
- props.onNavigate(commits[idx - 1].hash);
- }
+ return;
+ }
+ const idx = currentIndex();
+ if (idx > 0) {
+ props.onNavigate(props.commits[idx - 1].hash);
}
}
function goRight() {
+ if (isAllChanges()) return;
+ if (isUncommittedOnly()) {
+ props.onNavigate(null);
+ return;
+ }
const commits = props.commits;
- if (commits.length === 0 || isAllChanges()) return;
const idx = currentIndex();
if (idx < commits.length - 1) {
props.onNavigate(commits[idx + 1].hash);
} else {
- props.onNavigate(null);
+ props.onNavigate(UNCOMMITTED_SELECTION);
}
}
const compact = () => props.compact ?? false;
const btnSize = () => (compact() ? '18px' : '22px');
const iconSize = () => (compact() ? 12 : 14);
+ const pillPadding = () => (compact() ? '1px 4px' : '2px 8px');
+ const pillFontSize = () => sf(compact() ? 10 : 12);
+
+ function pillStyle(active: boolean) {
+ return {
+ background: active ? `color-mix(in srgb, ${theme.accent} 15%, transparent)` : 'transparent',
+ border: `1px solid ${active ? theme.accent : theme.border}`,
+ color: active ? theme.accent : theme.fgMuted,
+ cursor: 'pointer',
+ 'border-radius': '4px',
+ padding: pillPadding(),
+ 'font-size': pillFontSize(),
+ 'font-family': "'JetBrains Mono', monospace",
+ 'font-weight': active ? '600' : '400',
+ 'line-height': '1',
+ 'flex-shrink': '0',
+ display: 'inline-flex',
+ 'align-items': 'center',
+ height: btnSize(),
+ } as const;
+ }
return (
+ {/* Uncommitted-only button */}
+
+
{/* All Changes button */}
+
+
+ Uncommitted changes only
+
+
+
{(commit) => (
void;
+ /** Optional coverage artifact path relative to the repo root. */
+ coverageReportPath?: string;
/** Project root for branch-based fallback when worktree doesn't exist */
projectRoot?: string;
/** Branch name for branch-based fallback when worktree doesn't exist */
@@ -31,10 +42,10 @@ interface DiffViewerDialogProps {
agentId?: string;
/** List of commits on this branch (oldest first) for commit navigation */
commitList?: CommitInfo[];
- /** Currently selected commit hash, or null for "all changes" mode */
- selectedCommit?: string | null;
- /** Callback to navigate to a different commit or null for all changes */
- onCommitNavigate?: (hash: string | null) => void;
+ /** Current selection: null = all changes, sentinel = uncommitted-only, hash = single commit */
+ selectedCommit?: CommitSelection;
+ /** Callback to navigate to a different selection */
+ onCommitNavigate?: (selection: CommitSelection) => void;
/** Git isolation mode — CommitNavBar is only shown for worktree-isolated tasks */
gitIsolation?: GitIsolationMode;
}
@@ -59,18 +70,21 @@ export function DiffViewerDialog(props: DiffViewerDialogProps) {