@cloudcli-ai/cloudcli 1.37.2 → 1.37.4

package/dist-server/server/modules/file-tree/tests/file-tree.service.test.js

@@ -1,9 +1,14 @@
 import assert from 'node:assert/strict';
+import { createReadStream } from 'node:fs';
+import fsPromises from 'node:fs/promises';
+import os from 'node:os';
 import path from 'node:path';
 import { Readable } from 'node:stream';
 import test from 'node:test';
+import { fileURLToPath } from 'node:url';
 import { createFileTreeService } from '../../../modules/file-tree/file-tree.service.js';
-import { AppError } from '../../../shared/utils.js';
+import { AppError, resolveReadOnlyRootPath, validateWorkspacePath } from '../../../shared/utils.js';
+const testDirectory = path.dirname(fileURLToPath(import.meta.url));
 function createDirectoryEntry(name, directory) {
     return {
         name,
@@ -60,6 +65,7 @@ function createDependencies(fileSystem, projectRoot) {
         workspace: {
             rootPath: projectRoot,
             validatePath: async (candidatePath) => ({ valid: true, resolvedPath: candidatePath }),
+            resolveReadOnlyRootPath: async () => null,
         },
         resolveMimeType: () => 'text/plain',
         fileSystemConcurrency: 4,
@@ -284,6 +290,21 @@ test('readTextFile rejects traversal before invoking the filesystem adapter', as
         && error.statusCode === 403);
     assert.deepEqual(readPaths, []);
 });
+test('readTextFile reports a directory as a client error, not a 500', async () => {
+    const projectRoot = path.resolve('file-tree-test-project');
+    const fileSystem = createFakeFileSystem({
+        readTextFile: async () => {
+            const error = new Error('EISDIR: illegal operation on a directory, read');
+            error.code = 'EISDIR';
+            throw error;
+        },
+    });
+    const service = createFileTreeService(createDependencies(fileSystem, projectRoot));
+    await assert.rejects(service.readTextFile('project-1', 'decisions'), (error) => error instanceof AppError
+        && error.code === 'EISDIR'
+        && error.statusCode === 400
+        && error.message === 'Path is a directory, not a file');
+});
 test('createEntry performs filesystem mutation only through the injected adapter', async () => {
     const projectRoot = path.resolve('file-tree-test-project');
     const targetPath = path.join(projectRoot, 'notes.txt');
@@ -308,4 +329,108 @@ test('createEntry performs filesystem mutation only through the injected adapter
     assert.equal(result.path, targetPath);
     assert.deepEqual(writtenFiles, [{ filePath: targetPath, content: '' }]);
 });
+/**
+ * Builds the service against the real filesystem and the real workspace policy,
+ * which is the only way to exercise the read-only roots: the whole guarantee
+ * rests on `realpath` resolving symlinks before the comparison.
+ */
+function createRealFileSystemService(projectRoot) {
+    return createFileTreeService({
+        fileSystem: {
+            access: (candidatePath) => fsPromises.access(candidatePath),
+            stat: (candidatePath) => fsPromises.stat(candidatePath),
+            lstat: (candidatePath) => fsPromises.lstat(candidatePath),
+            openDirectory: async function* (directoryPath) {
+                yield* await fsPromises.opendir(directoryPath);
+            },
+            realpath: (candidatePath) => fsPromises.realpath(candidatePath),
+            readTextFile: (filePath) => fsPromises.readFile(filePath, 'utf8'),
+            writeTextFile: (filePath, content) => fsPromises.writeFile(filePath, content, 'utf8'),
+            async makeDirectory(directoryPath, recursive) {
+                await fsPromises.mkdir(directoryPath, { recursive });
+            },
+            rename: (oldPath, newPath) => fsPromises.rename(oldPath, newPath),
+            async removeDirectory(directoryPath) {
+                await fsPromises.rm(directoryPath, { recursive: true, force: true });
+            },
+            unlink: (filePath) => fsPromises.unlink(filePath),
+            copyFile: (source, destination) => fsPromises.copyFile(source, destination),
+            createReadStream: (filePath) => createReadStream(filePath),
+        },
+        projects: { getProjectPathById: async () => projectRoot },
+        workspace: {
+            rootPath: projectRoot,
+            validatePath: (candidatePath) => validateWorkspacePath(candidatePath),
+            resolveReadOnlyRootPath: (candidatePath) => resolveReadOnlyRootPath(candidatePath),
+        },
+        resolveMimeType: () => 'text/plain',
+        fileSystemConcurrency: 4,
+        logger: { error: () => undefined },
+    });
+}
+test('the temp directory can be browsed and read, but never written to', async () => {
+    const temporaryDirectory = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'file-tree-tmp-'));
+    const projectRoot = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'file-tree-project-'));
+    try {
+        // The shape a task notification quotes: an agent's output file written to
+        // the system temp directory, outside every project.
+        await fsPromises.mkdir(path.join(temporaryDirectory, 'tasks'));
+        const outputPath = path.join(temporaryDirectory, 'tasks', 'agent.output');
+        await fsPromises.writeFile(outputPath, 'what the agent found', 'utf8');
+        const service = createRealFileSystemService(projectRoot);
+        const browsed = await service.browseWorkspace(temporaryDirectory);
+        assert.deepEqual(browsed.suggestions.map((entry) => entry.name), ['tasks']);
+        const opened = await service.readTextFile('project-1', outputPath);
+        assert.equal(opened.content, 'what the agent found');
+        const streamed = await service.openFile('project-1', outputPath);
+        streamed.stream.destroy();
+        // Read-only means read-only: nothing may be created or changed there.
+        await assert.rejects(service.saveTextFile('project-1', outputPath, 'overwritten'), (error) => error.code === 'PATH_OUTSIDE_PROJECT');
+        await assert.rejects(service.createWorkspaceFolder(path.join(temporaryDirectory, 'new-folder')), (error) => error.code === 'INVALID_WORKSPACE_PATH');
+        await assert.rejects(service.createEntry({
+            projectId: 'project-1',
+            parentPath: path.join(temporaryDirectory, 'tasks'),
+            type: 'file',
+            name: 'planted.txt',
+        }), (error) => error.code === 'PATH_OUTSIDE_PROJECT');
+        await assert.rejects(service.renameEntry({ projectId: 'project-1', oldPath: outputPath, newName: 'renamed.output' }), (error) => error.code === 'PATH_OUTSIDE_PROJECT');
+        const uploadedTemporaryPath = path.join(projectRoot, 'upload.tmp');
+        await fsPromises.writeFile(uploadedTemporaryPath, 'upload', 'utf8');
+        await assert.rejects(service.storeUploadedFiles({
+            projectId: 'project-1',
+            targetPath: path.join(temporaryDirectory, 'tasks'),
+            relativePaths: [],
+            requestedFileCount: 1,
+            files: [{ originalName: 'upload.txt', temporaryPath: uploadedTemporaryPath, size: 6, mimeType: 'text/plain' }],
+        }), (error) => error.code === 'PATH_OUTSIDE_PROJECT');
+        await assert.rejects(service.deleteEntry({ projectId: 'project-1', targetPath: outputPath }), (error) => error.code === 'PATH_OUTSIDE_PROJECT');
+        assert.deepEqual(await fsPromises.readdir(path.join(temporaryDirectory, 'tasks')), ['agent.output']);
+        assert.equal(await fsPromises.readFile(outputPath, 'utf8'), 'what the agent found');
+    }
+    finally {
+        await fsPromises.rm(temporaryDirectory, { recursive: true, force: true });
+        await fsPromises.rm(projectRoot, { recursive: true, force: true });
+    }
+});
+test('reading through a symlink out of the temp directory is still refused', async () => {
+    const temporaryDirectory = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'file-tree-tmp-'));
+    const projectRoot = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'file-tree-project-'));
+    // The link target has to sit under no read-only root. Beside this file is
+    // deterministic; a directory under `$HOME` lands under `/tmp` whenever a
+    // test run isolates its home there, and the Claude projects directory is a
+    // read-only root too.
+    const outsideDirectory = await fsPromises.mkdtemp(path.join(testDirectory, 'file-tree-outside-'));
+    try {
+        assert.equal(await resolveReadOnlyRootPath(outsideDirectory), null);
+        await fsPromises.writeFile(path.join(outsideDirectory, 'secret.txt'), 'secret', 'utf8');
+        await fsPromises.symlink(outsideDirectory, path.join(temporaryDirectory, 'escape'));
+        const service = createRealFileSystemService(projectRoot);
+        await assert.rejects(service.readTextFile('project-1', path.join(temporaryDirectory, 'escape', 'secret.txt')), (error) => error.code === 'PATH_OUTSIDE_PROJECT');
+    }
+    finally {
+        await fsPromises.rm(temporaryDirectory, { recursive: true, force: true });
+        await fsPromises.rm(projectRoot, { recursive: true, force: true });
+        await fsPromises.rm(outsideDirectory, { recursive: true, force: true });
+    }
+});
 //# sourceMappingURL=file-tree.service.test.js.map

package/dist-server/server/modules/file-tree/tests/file-tree.service.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-tree.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/file-tree/tests/file-tree.service.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-tree.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/file-tree/tests/file-tree.service.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/git/git-branch-diff.service.js

@@ -0,0 +1,142 @@
+import path from 'node:path';
+import { AppError, getGitErrorDetails } from '../../shared/utils.js';
+function toBranchDiffStatus(rawStatus) {
+    // `--name-status` emits R<score>/C<score> for renames and copies; a copy is
+    // a brand-new file from the reader's point of view, and type changes (T) are
+    // modifications.
+    switch (rawStatus.charAt(0)) {
+        case 'A':
+        case 'C':
+            return 'A';
+        case 'D':
+            return 'D';
+        case 'R':
+            return 'R';
+        default:
+            return 'M';
+    }
+}
+function parseNameStatus(output) {
+    // `-z` output is `<status>\0<path>\0`, with renames/copies contributing a
+    // second path: `R100\0<old>\0<new>\0`. A trailing NUL leaves an empty token.
+    const tokens = output.split('\0');
+    const files = [];
+    for (let index = 0; index < tokens.length; index += 1) {
+        const rawStatus = tokens[index];
+        if (!rawStatus) {
+            continue;
+        }
+        const status = toBranchDiffStatus(rawStatus);
+        const isTwoPathEntry = rawStatus.startsWith('R') || rawStatus.startsWith('C');
+        const firstPath = tokens[index + 1];
+        const secondPath = isTwoPathEntry ? tokens[index + 2] : undefined;
+        index += isTwoPathEntry ? 2 : 1;
+        if (!firstPath) {
+            continue;
+        }
+        if (isTwoPathEntry) {
+            if (!secondPath) {
+                continue;
+            }
+            files.push(status === 'R' ? { path: secondPath, oldPath: firstPath, status } : { path: secondPath, status });
+            continue;
+        }
+        files.push({ path: firstPath, status });
+    }
+    return files;
+}
+function parseUntrackedPaths(output) {
+    return output.split('\0').filter(Boolean);
+}
+/**
+ * Turns a user-chosen base branch into the merge-base commit shared with HEAD.
+ * Rejects refs that would parse as git options and refs git cannot resolve
+ * before running `merge-base`, so the routes answer with a 400 and a stable
+ * code instead of a raw git failure.
+ */
+async function resolveMergeBase(input) {
+    const { projectPath, base, runCommand } = input;
+    const cwd = { cwd: projectPath };
+    // validateBranchName in the routes accepts a leading '-', which git would
+    // otherwise read as an option (e.g. `--output=file`).
+    if (!base || base.startsWith('-')) {
+        throw new AppError(`Invalid base branch "${base}"`, {
+            code: 'GIT_INVALID_BASE_REF',
+            statusCode: 400,
+        });
+    }
+    try {
+        await runCommand('git', ['rev-parse', '--verify', '--quiet', '--end-of-options', `${base}^{commit}`], cwd);
+    }
+    catch {
+        throw new AppError(`Unknown branch or ref "${base}"`, {
+            code: 'GIT_UNKNOWN_BASE_REF',
+            statusCode: 400,
+        });
+    }
+    let mergeBaseOutput;
+    try {
+        ({ stdout: mergeBaseOutput } = await runCommand('git', ['merge-base', '--', base, 'HEAD'], cwd));
+    }
+    catch (error) {
+        throw new AppError(`"${base}" and the current branch share no common history`, {
+            code: 'GIT_NO_MERGE_BASE',
+            statusCode: 400,
+            details: getGitErrorDetails(error),
+        });
+    }
+    const mergeBase = mergeBaseOutput.trim();
+    if (!mergeBase) {
+        throw new AppError(`"${base}" and the current branch share no common history`, {
+            code: 'GIT_NO_MERGE_BASE',
+            statusCode: 400,
+        });
+    }
+    return mergeBase;
+}
+/**
+ * Used by the Git routes module for `GET /branch-diff`: lists every file the
+ * working copy (committed, staged, unstaged and untracked) differs in from the
+ * merge base of `base` and HEAD — the PR-style "what this branch changed".
+ * Results are sorted by path.
+ */
+export async function listBranchDiffFiles(input) {
+    const { projectPath, base, runCommand } = input;
+    const cwd = { cwd: projectPath };
+    const mergeBase = await resolveMergeBase(input);
+    // `git diff <commit>` compares the working tree (index + unstaged edits)
+    // against the commit, which is exactly the "everything so far" view.
+    const [{ stdout: nameStatusOutput }, { stdout: untrackedOutput }] = await Promise.all([
+        runCommand('git', ['diff', '--name-status', '-M', '-z', mergeBase, '--'], cwd),
+        runCommand('git', ['ls-files', '--others', '--exclude-standard', '-z'], cwd),
+    ]);
+    const files = [
+        ...parseNameStatus(nameStatusOutput),
+        ...parseUntrackedPaths(untrackedOutput).map((path) => ({ path, status: 'U' })),
+    ].sort((left, right) => left.path.localeCompare(right.path));
+    return { base, mergeBase, files };
+}
+/**
+ * Used by the Git routes module for `GET /branch-diff/file`: the raw unified
+ * diff of one file between the merge base and the working copy. Untracked
+ * files are not visible to `git diff`, so their content is synthesized into
+ * the same all-additions shape the `/diff` route produces.
+ */
+export async function getBranchDiffForFile(input) {
+    const { projectPath, file, oldPath, runCommand, readFile } = input;
+    const cwd = { cwd: projectPath };
+    const mergeBase = await resolveMergeBase(input);
+    // Ask git (not the filesystem) whether the path is untracked so a path that
+    // escapes the repository is rejected by git before anything is read.
+    const { stdout: untrackedOutput } = await runCommand('git', ['ls-files', '--others', '--exclude-standard', '-z', '--', file], cwd);
+    const isUntracked = parseUntrackedPaths(untrackedOutput).includes(file);
+    if (isUntracked) {
+        const content = await readFile(path.join(projectPath, file));
+        const lines = content.split('\n');
+        return `--- /dev/null\n+++ b/${file}\n@@ -0,0 +1,${lines.length} @@\n${lines.map((line) => `+${line}`).join('\n')}`;
+    }
+    const pathspecs = oldPath && oldPath !== file ? [oldPath, file] : [file];
+    const { stdout: diff } = await runCommand('git', ['diff', '-M', mergeBase, '--', ...pathspecs], cwd);
+    return diff;
+}
+//# sourceMappingURL=git-branch-diff.service.js.map

package/dist-server/server/modules/git/git-branch-diff.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-branch-diff.service.js","sourceRoot":"","sources":["../../../../server/modules/git/git-branch-diff.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/git/git-branch.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-branch.service.js","sourceRoot":"","sources":["../../../../server/modules/git/git-branch.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAoB7C,iFAAiF;AACjF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAA6B;IACnE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,KAAK,CAAC,UAAU,CACtD,KAAK,EACL,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAC5B,EAAE,GAAG,EAAE,KAAK,CAAC,WAAW,EAAE,CAC3B,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,EAAE,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;QAC1C,MAAM,IAAI,QAAQ,CAAC,gDAAgD,EAAE;YACnE,IAAI,EAAE,2BAA2B;YACjC,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,UAAU,CACvC,KAAK,EACL,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAC1C,EAAE,GAAG,EAAE,KAAK,CAAC,WAAW,EAAE,CAC3B,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"git-branch.service.js","sourceRoot":"","sources":["../../../../server/modules/git/git-branch.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAS7C,iFAAiF;AACjF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAA6B;IACnE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,KAAK,CAAC,UAAU,CACtD,KAAK,EACL,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAC5B,EAAE,GAAG,EAAE,KAAK,CAAC,WAAW,EAAE,CAC3B,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,EAAE,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;QAC1C,MAAM,IAAI,QAAQ,CAAC,gDAAgD,EAAE;YACnE,IAAI,EAAE,2BAA2B;YACjC,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,UAAU,CACvC,KAAK,EACL,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAC1C,EAAE,GAAG,EAAE,KAAK,CAAC,WAAW,EAAE,CAC3B,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist-server/server/modules/git/git.routes.js

@@ -1,10 +1,11 @@
 // @ts-nocheck -- temporary while Git workflows are extracted into the injected service.
 import path from 'path';
 import express from 'express';
-import { AppError } from '../../shared/utils.js';
+import { AppError, getGitErrorDetails } from '../../shared/utils.js';
 // cross-spawn: drop-in spawn with Windows .cmd/PATHEXT resolution.
 import { parseGitLogWithStats, parseGitStatusOutput } from './git-parsing.service.js';
 import { deleteLocalBranch } from './git-branch.service.js';
+import { getBranchDiffForFile, listBranchDiffFiles } from './git-branch-diff.service.js';
 /** Creates Git routes around explicit repository, filesystem, subprocess, and AI adapters. */
 export function createGitRouter(dependencies) {
     const fs = dependencies.fileSystem;
@@ -171,9 +172,6 @@ export function createGitRouter(dependencies) {
             throw error;
         }
     }
-    function getGitErrorDetails(error) {
-        return `${error?.message || ''} ${error?.stderr || ''} ${error?.stdout || ''}`;
-    }
     function isMissingHeadRevisionError(error) {
         const errorDetails = getGitErrorDetails(error).toLowerCase();
         return errorDetails.includes('unknown revision')
@@ -639,13 +637,102 @@ export function createGitRouter(dependencies) {
             // Backward-compat flat list (local + unique remotes, deduplicated)
             const branches = [...localBranches, ...remoteBranches]
                 .filter((b, i, arr) => arr.indexOf(b) === i);
-            res.json({ branches, localBranches, remoteBranches });
+            // Full remote-tracking names (`origin/main`) for callers that need an
+            // unambiguous ref, e.g. the Compare tab's base selector.
+            const remoteRefs = rawLines
+                .filter(b => b.startsWith('remotes/'))
+                .map(b => b.replace(/^remotes\//, ''));
+            res.json({ branches, localBranches, remoteBranches, remoteRefs });
         }
         catch (error) {
             console.error('Git branches error:', error);
             res.json({ error: error.message });
         }
     });
+    // Shared error shaping for the two compare routes: service AppErrors (unknown
+    // ref, no merge base) keep their status/code; anything else follows the
+    // module's GET convention of a 200 with `error`/`details`.
+    function sendBranchDiffError(res, error, context) {
+        if (error instanceof AppError) {
+            return res.status(error.statusCode).json({ error: error.message, code: error.code, details: error.details });
+        }
+        console.error(`Git ${context} error:`, error);
+        res.json({ error: 'Git operation failed', details: error.message });
+    }
+    // List files the working copy changed relative to the merge base with `base`
+    router.get('/branch-diff', async (req, res) => {
+        const { project, base } = req.query;
+        if (!project || !base) {
+            return res.status(400).json({ error: 'Project id and base branch are required' });
+        }
+        try {
+            validateBranchName(base);
+        }
+        catch (error) {
+            return res.status(400).json({ error: error.message });
+        }
+        try {
+            const projectPath = await getActualProjectPath(project);
+            await validateGitRepository(projectPath);
+            // Run from the repository root so untracked paths are root-relative like
+            // everything else the panel shows, even for projects nested in a repo.
+            const repositoryRootPath = await getRepositoryRootPath(projectPath);
+            const result = await listBranchDiffFiles({
+                projectPath: repositoryRootPath,
+                base,
+                runCommand: spawnAsync,
+            });
+            res.json(result);
+        }
+        catch (error) {
+            sendBranchDiffError(res, error, 'branch diff');
+        }
+    });
+    // Diff of one file between the merge base with `base` and the working copy.
+    // `oldPath` is the pre-rename path of an `R` entry from `/branch-diff`.
+    router.get('/branch-diff/file', async (req, res) => {
+        const { project, base, file, oldPath } = req.query;
+        if (!project || !base || !file) {
+            return res.status(400).json({ error: 'Project id, base branch and file path are required' });
+        }
+        try {
+            validateBranchName(base);
+            validateFilePath(file);
+            if (oldPath !== undefined) {
+                validateFilePath(oldPath);
+            }
+        }
+        catch (error) {
+            return res.status(400).json({ error: error.message });
+        }
+        try {
+            const projectPath = await getActualProjectPath(project);
+            await validateGitRepository(projectPath);
+            // `/branch-diff` already reports repository-root-relative paths, and
+            // compare files need not appear in `git status` (committed-only changes),
+            // so the status-based resolver is skipped: its bare-filename fallback
+            // could remap e.g. `README.md` onto a changed `docs/README.md`.
+            const repositoryRootPath = await getRepositoryRootPath(projectPath);
+            const repositoryRelativeFilePath = normalizeRepositoryRelativeFilePath(file);
+            validateFilePath(repositoryRelativeFilePath, repositoryRootPath);
+            const repositoryRelativeOldPath = oldPath === undefined ? undefined : normalizeRepositoryRelativeFilePath(oldPath);
+            if (repositoryRelativeOldPath !== undefined) {
+                validateFilePath(repositoryRelativeOldPath, repositoryRootPath);
+            }
+            const diff = await getBranchDiffForFile({
+                projectPath: repositoryRootPath,
+                base,
+                file: repositoryRelativeFilePath,
+                oldPath: repositoryRelativeOldPath,
+                runCommand: spawnAsync,
+                readFile: (absolutePath) => fs.readFile(absolutePath, 'utf-8'),
+            });
+            res.json({ diff: stripDiffHeaders(diff) });
+        }
+        catch (error) {
+            sendBranchDiffError(res, error, 'branch diff file');
+        }
+    });
     // Checkout branch
     router.post('/checkout', async (req, res) => {
         const { project, branch } = req.body;