BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(git): safely apply individual diff hunks (#3443)

Browse Source 
Resolve the Changes-view conflict without reverting branch or commit comparisons. Pair canonical action patches with displayed blob identities, refresh all path views after mutation, exclude historical snapshots, and reject stale or multi-file patches at the server boundary.

Preserve CRLF bytes and make long hunk menus keyboard-reachable. Workspace type-check, lint and build passed; focused parser, menu, view and real Git regressions passed.
This commit is contained in:
Bohdan Triapitsyn
2026-09-09 19:39:28 +03:00
parent 35635c0082 7f147568ea
commit adffdb81a3
10 changed files with 662 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/web/server/lib/git/service.js
+21 -7
View File
@@ -2466,7 +2466,7 @@ export async function getStatus(directory, options = {}) {
}
const getNoIndexDiff = async (repoRoot, repoPath, contextLines) => {
const args = ['diff', '--no-color'];
const args = ['diff', '--no-color', '--full-index'];
if (Number.isFinite(contextLines)) {
args.push(`-U${Math.max(0, contextLines)}`);
}
@@ -2484,7 +2484,7 @@ export async function getDiff(directory, { path: filePath, staged = false, conte
const { directoryPath, directoryGit, repoRoot, git } = await createRepositoryGitContext(directory);
try {
const args = ['diff', '--no-color'];
const args = ['diff', '--no-color', '--full-index'];
const fileContext = filePath ? await resolveGitFileContext(directoryPath, directoryGit, filePath, repoRoot) : null;
if (typeof contextLines === 'number' && !Number.isNaN(contextLines)) {
@@ -3099,11 +3099,13 @@ const normalizePatchTargetPath = (value) => {
};
const extractPatchTargetPath = (patch) => {
const matches = [...patch.matchAll(/^(?:-{3}|\+{3})\s+.+$/gm)];
const firstHunk = patch.search(/^@@\s/m);
const header = firstHunk < 0 ? patch : patch.slice(0, firstHunk);
const matches = [...header.matchAll(/^(?:-{3}|\+{3})\s+.+$/gm)];
const realTargets = matches
.map((match) => normalizePatchTargetPath(parsePatchPathToken(match[0])))
.filter(Boolean);
return realTargets[0] || null;
return realTargets.at(-1) || null;
};
const writeTempPatchFile = async (patch) => {
@@ -3131,9 +3133,21 @@ export async function applyHunk(directory, filePath, options = {}) {
const fileContext = await resolveGitFileContext(directoryPath, directoryGit, filePath, repoRoot);
validateRepositoryFilePaths(repoRoot, [fileContext.repoPath]);
const targetPath = extractPatchTargetPath(patch);
if (targetPath && targetPath !== fileContext.repoPath && targetPath !== filePath) {
throw new Error('patch target path does not match the requested file');
// Applicability alone is insufficient: a previously staged or committed
// hunk may still reverse cleanly against the working tree. Accept only a
// canonical hunk from this file's current working/index diff.
const current = await getDiff(directory, { path: filePath, staged: action === 'unstage', contextLines: 3 });
const starts = [...current.matchAll(/^@@\s/gm)].map((match) => match.index);
const header = current.slice(0, starts[0] ?? 0);
const isCurrentHunk = starts.some((start, index) => (
header + current.slice(start, starts[index + 1] ?? current.length) === patch
));
if (!isCurrentHunk) {
const targetPath = extractPatchTargetPath(patch);
if (targetPath && targetPath !== fileContext.repoPath && targetPath !== filePath) {
throw new Error('patch target path does not match the requested file');
}
throw new Error('Hunk no longer applies — refresh and try again.');
}
const flags = HUNK_ACTION_FLAGS[action];