fix: keep dirty committed files visible when hiding Committed

[Ziinc]

Summary

Hiding Review Committed via the Show toggle was removing every committed file, including paths that still have working-copy changes.

Fix

• Backend: workspace_diff keeps overlapping paths in both committed_files and uncommitted_files (no longer strips dirty committed files).
• Frontend: Show off only hides clean committed-only files. Dirty and conflicted committed paths stay in the sidebar and diff pane.

Tests

• Rust: overlapping path present in both lists
• Unit/integration: Show off keeps dirty committed rows, hides clean ones
• Screenshot: review-committed-dirty-toggle

App QA

Show on — shared in Changes and Committed
Show off — committed-only hidden, shared stays
_{To show artifacts inline, enable in settings.}

  

[cursor]

Shared Show-visibility rule used by the sidebar, diff pane, search, and hunk loader.

• Show on → all committed files
• Show off → only paths in the always-visible set (WC-dirty ∪ conflicted)
• Permalink:

  treq/src/components/changes-diff-viewer/utils.ts

  Lines 102 to 118 in 2399ea5

  	export function shouldShowCommittedFile(
  	path: string,
  	showCommittedChanges: boolean,
  	alwaysVisiblePaths: ReadonlySet<string>,
  	): boolean {
  	return showCommittedChanges || alwaysVisiblePaths.has(path);
  	}
  	export function filterVisibleCommittedFiles<T extends { path: string }>(
  	committedFiles: T[],
  	showCommittedChanges: boolean,
  	alwaysVisiblePaths: ReadonlySet<string>,
  	): T[] {
  	if (showCommittedChanges) return committedFiles;
  	return committedFiles.filter((file) =>
  	shouldShowCommittedFile(file.path, false, alwaysVisiblePaths),
  	);

[cursor]

Removed the committed_files.retain(...) that dropped paths also present in the WC.

• Frontend Show already decides what to hide; backend dedupe made dirty committed files impossible to keep visible
• Overlap is intentional: Review shows committed tip vs WC separately for the same path
• Permalink:

  treq/src-tauri/src/core/workspaces.rs

  Lines 2442 to 2449 in 2399ea5

  	// Keep overlapping paths in both lists. Review's Committed Show toggle hides
  	// clean committed-only files; dirty committed files must remain visible.
  	let uncommitted_files = jj::jj_get_changed_files(workspace_dir_str)
  	.map_err(|e| format!("Failed to get uncommitted workspace changes: {}", e))?;
  	let conflicted_files = jj::get_conflicted_files(workspace_dir_str, Some(target_branch))
  	.map_err(|e| format!("Failed to get conflicted workspace files: {}", e))?;
  	diff.uncommitted_files = uncommitted_files;
  	diff.conflicted_files = conflicted_files;

[cursor]

Hunk map must match the visible committed rows when Show flips.

• Previously only conflicted hunks survived hide; dirty overlapping hunks disappeared too
• uncommittedPaths ∪ conflictedHint keeps the committed tip hunk for files still under active edit
• Permalink:

  treq/src/components/changes-diff-viewer/hooks/useFileLoading.ts

  Lines 140 to 151 in 2399ea5

  	// When Committed is hidden, still keep dirty + conflicted committed hunks.
  	const alwaysVisibleCommitted = new Set([
  	...uncommittedPaths,
  	...conflictedHint,
  	]);
  	setCommittedFileHunks(
  	new Map(
  	(diff.hunks_by_file ?? [])
  	.filter(
  	(fileDiff) =>
  	showCommittedChanges ||
  	alwaysVisibleCommitted.has(fileDiff.path),

[cursor]

Sidebar list now filters instead of blanking the whole section when Show is off.

• Header + count stay so the toggle remains reachable
• Dirty/conflicted rows remain selectable while clean committed-only rows hide
• Permalink:

  treq/src/components/CommittedChangesSection.tsx

  Lines 44 to 48 in 2399ea5

  	const visibleFiles = showCommittedChanges
  	? files
  	: files.filter((file) => alwaysVisiblePaths?.has(file.path));
  	const showFiles = !isCollapsed && visibleFiles.length > 0;