fix: detect conflicts in committed tip trees on Review tab

[Ziinc]

Summary

• Detect unresolved conflicts via jj-lib MergedTree::conflicts() only (WC tip + unsaved snapshot). No file-text marker scans — those false-positive on literal <<<<<<< content.
• Workspace status sets has_conflicts when either the WC tree is unresolved or conflicted_files is non-empty.
• Review keeps conflicted committed files (and their hunks/cards) visible when the Committed toggle is hidden.

App QA

Before: Conflicts + Committed both visible
After: Committed hidden, conflict card still shown

Test plan

• Rust: test_detects_conflicts_in_committed_tip_when_tree_diff_is_empty + core_changes_test
• Integration: committed conflict visible with Committed hidden
• Screenshot/app-qa: review-committed-conflict-hidden.spec.tsx
• npm run format && npm run lint && npm run check
  _{To show artifacts inline, enable in settings.}

  

[cursor]

Rebase conflicts live in committed hunks. Hiding Committed used to wipe those hunks and leave an empty Review pane even when Conflicts still listed the file.

• Always load getWorkspaceDiff for workspaces
• When Committed is off, retain only conflicted committed paths/hunks so the inline card still renders

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

  Lines 95 to 155 in e05b50f

  	setRefreshing(true);
  	onRefreshingChange?.(true);
  	try {
  	if (repoPath && workspaceId !== undefined) {
  	const diff = await getWorkspaceDiff(repoPath, workspaceId);
  	const parsed = parseJjChangedFiles(diff.uncommitted_files ?? []);
  	applyChangedFilesRef.current(parsed);
  	const conflictedHint = new Set<string>([
  	...conflictedFilesHint,
  	...(diff.conflicted_files ?? []),
  	]);
  	const uncommittedPaths = new Set(parsed.map((file) => file.path));
  	// When Committed is hidden, still keep conflicted committed files —
  	// rebase conflicts live in committed hunks, not dirty WC changes.
  	let committed = (diff.committed_files ?? []).filter(
  	(file) => showCommittedChanges || conflictedHint.has(file.path),
  	);
  	for (const path of conflictedHint) {
  	if (
  	uncommittedPaths.has(path) ||
  	committed.some((file) => file.path === path)
  	) {
  	continue;
  	}
  	committed = [
  	...committed,
  	{
  	path,
  	status: "C",
  	previous_path: null,
  	changed_line_count: 0,
  	diff_deferred: false,
  	},
  	];
  	}
  	setCommittedFiles(committed);
  	const retainedCommittedPaths = new Set(
  	committed.map((file) => file.path),
  	);
  	setCommittedFileHunks(
  	new Map(
  	(diff.hunks_by_file ?? [])
  	.filter(
  	(fileDiff) =>
  	showCommittedChanges ||
  	retainedCommittedPaths.has(fileDiff.path) ||
  	conflictedHint.has(fileDiff.path),
  	)
  	.map((fileDiff) => [
  	fileDiff.path,
  	{
  	filePath: fileDiff.path,
  	hunks: fileDiff.hunks,
  	isLoading: false,
  	},
  	]),
  	),
  	);

[cursor]

Pairwise tree-diffs miss conflicts when tip and target trees are identical (empty WC on a conflicted bookmark tip). Walking MergedTree::conflicts() reports those paths directly.

• treq/src-tauri/src/jj.rs

  Lines 3918 to 3922 in e05b50f

  	fn collect_conflict_paths_from_tree(tree: &MergedTree) -> Vec<String> {
  	tree.conflicts()
  	.map(|(path, _value)| path.as_internal_file_string().to_string())
  	.collect()
  	}

• Keeps marker + diff fallbacks for materialization edge cases