@dyyz1993/codenomad 0.15.0

package/dist/workspaces/__tests__/spawn.test.js

@@ -0,0 +1,140 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { buildWindowsSpawnSpec, buildWslSignalSpec, parseWslUncPath, resolveWslWorkingDirectory } from "../spawn";
+describe("parseWslUncPath", () => {
+    it("parses WSL UNC paths into distro and linux path", () => {
+        assert.deepEqual(parseWslUncPath(String.raw `\\wsl.localhost\Ubuntu\home\dev\.opencode\bin\opencode`), {
+            distro: "Ubuntu",
+            linuxPath: "/home/dev/.opencode/bin/opencode",
+        });
+    });
+    it("supports the legacy wsl$ UNC prefix", () => {
+        assert.deepEqual(parseWslUncPath(String.raw `\\wsl$\Ubuntu\home\dev`), {
+            distro: "Ubuntu",
+            linuxPath: "/home/dev",
+        });
+    });
+});
+describe("resolveWslWorkingDirectory", () => {
+    it("keeps WSL workspace folders in the same distro", () => {
+        assert.equal(JSON.stringify(resolveWslWorkingDirectory(String.raw `\\wsl.localhost\Ubuntu\home\dev\workspace`, "Ubuntu")), JSON.stringify({ kind: "linux", path: "/home/dev/workspace" }));
+    });
+    it("keeps Windows drive paths so WSL can resolve them with wslpath", () => {
+        assert.equal(JSON.stringify(resolveWslWorkingDirectory(String.raw `C:\Users\dev\workspace`, "Ubuntu")), JSON.stringify({ kind: "windows", path: String.raw `C:\Users\dev\workspace` }));
+    });
+    it("keeps UNC network paths so WSL can resolve them with wslpath", () => {
+        assert.equal(JSON.stringify(resolveWslWorkingDirectory(String.raw `\\server\share\workspace`, "Ubuntu")), JSON.stringify({ kind: "windows", path: String.raw `\\server\share\workspace` }));
+    });
+    it("rejects WSL workspace folders from a different distro", () => {
+        assert.equal(resolveWslWorkingDirectory(String.raw `\\wsl.localhost\Debian\home\dev\workspace`, "Ubuntu"), null);
+    });
+});
+describe("buildWindowsSpawnSpec", () => {
+    it("wraps WSL binaries with wsl.exe and propagates required env vars", () => {
+        const spec = buildWindowsSpawnSpec(String.raw `\\wsl.localhost\Ubuntu\home\dev\.opencode\bin\opencode`, ["serve", "--port", "0"], {
+            cwd: String.raw `\\wsl.localhost\Ubuntu\home\dev\workspace`,
+            env: {
+                OPENCODE_CONFIG_DIR: String.raw `C:\Users\dev\AppData\Roaming\CodeNomad\opencode-config`,
+                CODENOMAD_INSTANCE_ID: "workspace-123",
+                OPENCODE_SERVER_BASE_URL: "https://127.0.0.1:4321/workspaces/workspace-123/worktrees/root/instance",
+                OPENCODE_SERVER_PASSWORD: "secret",
+            },
+            propagateEnvKeys: ["OPENCODE_CONFIG_DIR", "CODENOMAD_INSTANCE_ID", "OPENCODE_SERVER_BASE_URL", "OPENCODE_SERVER_PASSWORD"],
+        });
+        assert.equal(spec.command, "wsl.exe");
+        assert.deepEqual(spec.args, [
+            "--distribution",
+            "Ubuntu",
+            "--cd",
+            "/home/dev/workspace",
+            "--exec",
+            "/home/dev/.opencode/bin/opencode",
+            "serve",
+            "--port",
+            "0",
+        ]);
+        assert.equal(spec.cwd, undefined);
+        assert.equal(spec.env?.WSLENV, "OPENCODE_CONFIG_DIR/p:CODENOMAD_INSTANCE_ID:OPENCODE_SERVER_BASE_URL:OPENCODE_SERVER_PASSWORD");
+    });
+    it("upgrades existing WSLENV path entries to include /p", () => {
+        const spec = buildWindowsSpawnSpec(String.raw `\\wsl.localhost\Ubuntu\home\dev\.opencode\bin\opencode`, ["serve"], {
+            env: {
+                OPENCODE_CONFIG_DIR: String.raw `C:\Users\dev\AppData\Roaming\CodeNomad\opencode-config`,
+                WSLENV: "OPENCODE_CONFIG_DIR:CODENOMAD_INSTANCE_ID/u",
+            },
+            propagateEnvKeys: ["OPENCODE_CONFIG_DIR", "CODENOMAD_INSTANCE_ID"],
+        });
+        assert.equal(spec.env?.WSLENV, "OPENCODE_CONFIG_DIR/p:CODENOMAD_INSTANCE_ID/u");
+    });
+    it("propagates inherited known path variables even when they are not explicitly requested", () => {
+        const spec = buildWindowsSpawnSpec(String.raw `\\wsl.localhost\Ubuntu\home\dev\.opencode\bin\opencode`, ["serve"], {
+            env: {
+                NODE_EXTRA_CA_CERTS: String.raw `C:\certs\root.pem`,
+            },
+        });
+        assert.equal(spec.env?.WSLENV, "NODE_EXTRA_CA_CERTS/p");
+    });
+    it("uses wslpath for Windows workspace folders instead of assuming /mnt", () => {
+        const spec = buildWindowsSpawnSpec(String.raw `\\wsl.localhost\Ubuntu\home\dev\.opencode\bin\opencode`, ["serve", "--port", "0"], {
+            cwd: String.raw `C:\Users\dev\workspace`,
+        });
+        assert.equal(spec.command, "wsl.exe");
+        assert.deepEqual(spec.args, [
+            "--distribution",
+            "Ubuntu",
+            "--exec",
+            "sh",
+            "-lc",
+            'cd "$(wslpath -au "$1")" && shift && exec "$@"',
+            "codenomad-wsl-launch",
+            String.raw `C:\Users\dev\workspace`,
+            "/home/dev/.opencode/bin/opencode",
+            "serve",
+            "--port",
+            "0",
+        ]);
+    });
+    it("uses wslpath for UNC network workspace folders", () => {
+        const spec = buildWindowsSpawnSpec(String.raw `\\wsl.localhost\Ubuntu\home\dev\.opencode\bin\opencode`, ["serve"], {
+            cwd: String.raw `\\server\share\workspace`,
+        });
+        assert.equal(spec.command, "wsl.exe");
+        assert.deepEqual(spec.args, [
+            "--distribution",
+            "Ubuntu",
+            "--exec",
+            "sh",
+            "-lc",
+            'cd "$(wslpath -au "$1")" && shift && exec "$@"',
+            "codenomad-wsl-launch",
+            String.raw `\\server\share\workspace`,
+            "/home/dev/.opencode/bin/opencode",
+            "serve",
+        ]);
+    });
+    it("can wrap WSL launches to emit the Linux PID marker", () => {
+        const spec = buildWindowsSpawnSpec(String.raw `\\wsl.localhost\Ubuntu\home\dev\.opencode\bin\opencode`, ["serve"], {
+            cwd: String.raw `\\wsl.localhost\Ubuntu\home\dev\workspace`,
+            wslPidMarker: "__CODENOMAD_WSL_PID__:",
+        });
+        assert.equal(spec.command, "wsl.exe");
+        assert.deepEqual(spec.args, [
+            "--distribution",
+            "Ubuntu",
+            "--exec",
+            "sh",
+            "-lc",
+            `printf '%s%s\\n' '__CODENOMAD_WSL_PID__:' "$$" && cd "$1" && shift && exec "$@"`,
+            "codenomad-wsl-launch",
+            "/home/dev/workspace",
+            "/home/dev/.opencode/bin/opencode",
+            "serve",
+        ]);
+        assert.equal(spec.wsl?.pidMarker, "__CODENOMAD_WSL_PID__:");
+    });
+    it("builds the WSL kill command for tracked Linux PIDs", () => {
+        const spec = buildWslSignalSpec("Ubuntu", 4321, "SIGTERM");
+        assert.equal(spec.command, "wsl.exe");
+        assert.deepEqual(spec.args, ["--distribution", "Ubuntu", "--exec", "kill", "-TERM", "4321"]);
+    });
+});

package/dist/workspaces/git-mutations.js

@@ -0,0 +1,98 @@
+import { spawn } from "child_process";
+import path from "path";
+class GitMutationError extends Error {
+    constructor(message, statusCode = 400) {
+        super(message);
+        this.name = "GitMutationError";
+        this.statusCode = statusCode;
+    }
+}
+function runGit(args, cwd) {
+    return new Promise((resolve) => {
+        const child = spawn("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+        let stdout = "";
+        let stderr = "";
+        child.stdout?.on("data", (chunk) => {
+            stdout += chunk.toString();
+        });
+        child.stderr?.on("data", (chunk) => {
+            stderr += chunk.toString();
+        });
+        child.once("error", (error) => {
+            resolve({ ok: false, error, stdout, stderr });
+        });
+        child.once("close", (code) => {
+            if (code === 0) {
+                resolve({ ok: true, stdout });
+            }
+            else {
+                const error = new Error(stderr.trim() || `git ${args.join(" ")} failed with code ${code}`);
+                resolve({ ok: false, error, stdout, stderr });
+            }
+        });
+    });
+}
+export function normalizeGitWorktreeRelativePath(input) {
+    const normalized = input.trim().replace(/\\+/g, "/").replace(/^\.\//, "");
+    if (!normalized) {
+        throw new GitMutationError("Path is required", 400);
+    }
+    if (path.posix.isAbsolute(normalized) || path.win32.isAbsolute(normalized)) {
+        throw new GitMutationError(`Absolute paths are not allowed: ${input}`, 400);
+    }
+    if (normalized === "." || normalized === "..") {
+        throw new GitMutationError(`Invalid path: ${input}`, 400);
+    }
+    if (normalized.startsWith("../") || normalized.includes("/../") || normalized.endsWith("/..")) {
+        throw new GitMutationError(`Path traversal is not allowed: ${input}`, 400);
+    }
+    return normalized;
+}
+function normalizeGitMutationPaths(paths) {
+    const deduped = new Set();
+    for (const rawPath of paths) {
+        deduped.add(normalizeGitWorktreeRelativePath(rawPath));
+    }
+    const normalized = Array.from(deduped);
+    if (normalized.length === 0) {
+        throw new GitMutationError("At least one path is required", 400);
+    }
+    return normalized;
+}
+async function ensureGitCommandSucceeded(resultPromise, fallbackMessage) {
+    const result = await resultPromise;
+    if (!result.ok) {
+        const message = result.stderr?.trim() || result.error.message || fallbackMessage;
+        throw new GitMutationError(message, 409);
+    }
+    return result.stdout;
+}
+export function isGitMutationError(error) {
+    return error instanceof GitMutationError;
+}
+export async function stageWorktreePaths(params) {
+    const paths = normalizeGitMutationPaths(params.paths);
+    await ensureGitCommandSucceeded(runGit(["add", "--", ...paths], params.workspaceFolder), "Failed to stage files");
+}
+export async function unstageWorktreePaths(params) {
+    const paths = normalizeGitMutationPaths(params.paths);
+    const headResult = await runGit(["rev-parse", "--verify", "HEAD"], params.workspaceFolder);
+    if (headResult.ok) {
+        await ensureGitCommandSucceeded(runGit(["restore", "--staged", "--", ...paths], params.workspaceFolder), "Failed to unstage files");
+        return;
+    }
+    await ensureGitCommandSucceeded(runGit(["rm", "--cached", "--quiet", "--", ...paths], params.workspaceFolder), "Failed to unstage files");
+}
+export async function commitWorktreeChanges(params) {
+    const message = params.message.trim();
+    if (!message) {
+        throw new GitMutationError("Commit message is required", 400);
+    }
+    await ensureGitCommandSucceeded(runGit(["commit", "-m", message], params.workspaceFolder), "Failed to create commit");
+    const shaResult = await runGit(["rev-parse", "HEAD"], params.workspaceFolder);
+    if (!shaResult.ok) {
+        return {};
+    }
+    const commitSha = shaResult.stdout.trim();
+    return commitSha ? { commitSha } : {};
+}

package/dist/workspaces/git-status.js

@@ -0,0 +1,323 @@
+import { spawn } from "child_process";
+import { readFile } from "fs/promises";
+import path from "path";
+import { normalizeGitWorktreeRelativePath } from "./git-mutations";
+async function readFileAsDiffText(filePath) {
+    return readFile(filePath, "utf-8");
+}
+async function readGitBlobAsDiffText(resultPromise, missingOk = false) {
+    const result = await resultPromise;
+    if (!result.ok) {
+        return decodeGitShowResult(result, missingOk);
+    }
+    return result.stdout;
+}
+function runGit(args, cwd, acceptedExitCodes = [0]) {
+    return new Promise((resolve) => {
+        const child = spawn("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+        let stdout = "";
+        let stderr = "";
+        child.stdout?.on("data", (chunk) => {
+            stdout += chunk.toString();
+        });
+        child.stderr?.on("data", (chunk) => {
+            stderr += chunk.toString();
+        });
+        child.once("error", (error) => {
+            resolve({ ok: false, error, stdout, stderr });
+        });
+        child.once("close", (code) => {
+            if (acceptedExitCodes.includes(code ?? 0)) {
+                resolve({ ok: true, stdout });
+            }
+            else {
+                const error = new Error(stderr.trim() || `git ${args.join(" ")} failed with code ${code}`);
+                resolve({ ok: false, error, stdout, stderr });
+            }
+        });
+    });
+}
+function ensureEntry(map, path) {
+    const existing = map.get(path);
+    if (existing)
+        return existing;
+    const next = {
+        path,
+        originalPath: null,
+        stagedStatus: null,
+        stagedAdditions: 0,
+        stagedDeletions: 0,
+        unstagedStatus: null,
+        unstagedAdditions: 0,
+        unstagedDeletions: 0,
+    };
+    map.set(path, next);
+    return next;
+}
+function normalizeGitStatusPath(value) {
+    return value.trim().replace(/\\+/g, "/");
+}
+function parseGitChangeKind(code) {
+    const normalized = code.trim().toUpperCase();
+    if (!normalized)
+        return null;
+    if (normalized === "A")
+        return "added";
+    if (normalized === "M")
+        return "modified";
+    if (normalized === "D")
+        return "deleted";
+    if (normalized.startsWith("R"))
+        return "renamed";
+    if (normalized.startsWith("C"))
+        return "copied";
+    if (normalized === "U")
+        return "unmerged";
+    return null;
+}
+function applyNameStatusOutput(map, output, target) {
+    const tokens = output.split("\0");
+    let index = 0;
+    while (index < tokens.length) {
+        const record = tokens[index++] ?? "";
+        if (!record)
+            continue;
+        const parts = record.split("\t");
+        const statusCode = parseGitChangeKind(parts[0] ?? "");
+        if (!statusCode)
+            continue;
+        const inlinePath = parts.slice(1).join("\t");
+        const firstPath = inlinePath || tokens[index++] || "";
+        const secondPath = statusCode === "renamed" || statusCode === "copied" ? tokens[index++] || "" : "";
+        const path = statusCode === "renamed" || statusCode === "copied" ? secondPath || firstPath : firstPath;
+        const normalizedPath = normalizeGitStatusPath(path);
+        if (!normalizedPath)
+            continue;
+        const entry = ensureEntry(map, normalizedPath);
+        entry[target] = statusCode;
+        if (statusCode === "renamed" || statusCode === "copied") {
+            const originalPath = normalizeGitStatusPath(firstPath);
+            entry.originalPath = originalPath || entry.originalPath || null;
+        }
+    }
+}
+function applyUntrackedOutput(map, output) {
+    for (const rawLine of output.split(/\r?\n/)) {
+        const path = normalizeGitStatusPath(rawLine);
+        if (!path)
+            continue;
+        ensureEntry(map, path).unstagedStatus = "untracked";
+    }
+}
+function parseSingleNumstat(output) {
+    for (const rawLine of output.split(/\r?\n/)) {
+        const line = rawLine.trim();
+        if (!line)
+            continue;
+        const parts = rawLine.split("\t");
+        const isBinary = parts[0] === "-" || parts[1] === "-";
+        return {
+            additions: isBinary ? 0 : Number.parseInt(parts[0] ?? "0", 10) || 0,
+            deletions: isBinary ? 0 : Number.parseInt(parts[1] ?? "0", 10) || 0,
+            isBinary,
+            found: true,
+        };
+    }
+    return { additions: 0, deletions: 0, isBinary: false, found: false };
+}
+async function getUntrackedFileNumstat(workspaceFolder, relativePath) {
+    const absolutePath = path.join(workspaceFolder, relativePath);
+    const result = await runGit(["diff", "--numstat", "--no-index", "--", "/dev/null", absolutePath], workspaceFolder, [0, 1]);
+    if (!result.ok) {
+        throw result.error;
+    }
+    const parsed = parseSingleNumstat(result.stdout);
+    return { additions: parsed.additions, deletions: parsed.deletions };
+}
+async function applyUntrackedFileStats(map, workspaceFolder) {
+    const pending = Array.from(map.values())
+        .filter((entry) => entry.unstagedStatus === "untracked")
+        .map(async (entry) => {
+        try {
+            const stats = await getUntrackedFileNumstat(workspaceFolder, entry.path);
+            entry.unstagedAdditions = stats.additions;
+            entry.unstagedDeletions = stats.deletions;
+        }
+        catch {
+            entry.unstagedAdditions = 0;
+            entry.unstagedDeletions = 0;
+        }
+    });
+    await Promise.all(pending);
+}
+function applyNumstatOutput(map, output, target) {
+    const tokens = output.split("\0");
+    let index = 0;
+    while (index < tokens.length) {
+        const record = tokens[index++] ?? "";
+        if (!record)
+            continue;
+        const parts = record.split("\t");
+        if (parts.length < 3)
+            continue;
+        const additions = parts[0] === "-" ? 0 : Number.parseInt(parts[0] ?? "0", 10);
+        const deletions = parts[1] === "-" ? 0 : Number.parseInt(parts[1] ?? "0", 10);
+        const inlinePath = parts.slice(2).join("\t");
+        const isRenameLike = inlinePath === "";
+        const originalPath = isRenameLike ? normalizeGitStatusPath(tokens[index++] ?? "") : null;
+        const normalizedPath = normalizeGitStatusPath(isRenameLike ? tokens[index++] ?? "" : inlinePath);
+        if (!normalizedPath)
+            continue;
+        const entry = ensureEntry(map, normalizedPath);
+        if (originalPath) {
+            entry.originalPath = originalPath;
+        }
+        if (target === "staged") {
+            entry.stagedAdditions = Number.isFinite(additions) ? additions : 0;
+            entry.stagedDeletions = Number.isFinite(deletions) ? deletions : 0;
+        }
+        else {
+            entry.unstagedAdditions = Number.isFinite(additions) ? additions : 0;
+            entry.unstagedDeletions = Number.isFinite(deletions) ? deletions : 0;
+        }
+    }
+}
+export async function getWorktreeGitStatus(params) {
+    const { workspaceFolder, logger } = params;
+    const [stagedResult, unstagedResult, untrackedResult, stagedNumstatResult, unstagedNumstatResult] = await Promise.all([
+        runGit(["diff", "--name-status", "-z", "--cached", "--find-renames", "--find-copies"], workspaceFolder),
+        runGit(["diff", "--name-status", "-z", "--find-renames", "--find-copies"], workspaceFolder),
+        runGit(["ls-files", "--others", "--exclude-standard"], workspaceFolder),
+        runGit(["diff", "--numstat", "-z", "--cached", "--find-renames", "--find-copies"], workspaceFolder),
+        runGit(["diff", "--numstat", "-z", "--find-renames", "--find-copies"], workspaceFolder),
+    ]);
+    for (const result of [stagedResult, unstagedResult, untrackedResult, stagedNumstatResult, unstagedNumstatResult]) {
+        if (!result.ok) {
+            logger?.warn?.({ workspaceFolder, err: result.error }, "Failed to read git status for worktree");
+            throw result.error;
+        }
+    }
+    const stagedOutput = stagedResult.stdout;
+    const unstagedOutput = unstagedResult.stdout;
+    const untrackedOutput = untrackedResult.stdout;
+    const stagedNumstatOutput = stagedNumstatResult.stdout;
+    const unstagedNumstatOutput = unstagedNumstatResult.stdout;
+    const entries = new Map();
+    applyNameStatusOutput(entries, stagedOutput, "stagedStatus");
+    applyNameStatusOutput(entries, unstagedOutput, "unstagedStatus");
+    applyUntrackedOutput(entries, untrackedOutput);
+    applyNumstatOutput(entries, stagedNumstatOutput, "staged");
+    applyNumstatOutput(entries, unstagedNumstatOutput, "unstaged");
+    await applyUntrackedFileStats(entries, workspaceFolder);
+    return Array.from(entries.values()).sort((a, b) => a.path.localeCompare(b.path));
+}
+function decodeGitShowResult(result, missingOk = false) {
+    if (result.ok)
+        return result.stdout;
+    const message = result.stderr?.trim() || result.error.message || "";
+    if (missingOk &&
+        (message.includes("exists on disk, but not in") ||
+            message.includes("Path '") ||
+            message.includes("does not exist") ||
+            message.includes("unknown revision or path not in the working tree"))) {
+        return "";
+    }
+    throw result.error;
+}
+async function readGitIndexBlob(workspaceFolder, normalizedPath) {
+    return runGit(["cat-file", "-p", `:${normalizedPath}`], workspaceFolder);
+}
+async function getTrackedDiffMetadata(params) {
+    const args = ["diff", "--numstat"];
+    if (params.scope === "staged") {
+        args.push("--cached");
+    }
+    args.push("--find-renames", "--find-copies", "--");
+    args.push(params.normalizedPath);
+    if (params.normalizedOriginalPath && params.normalizedOriginalPath !== params.normalizedPath) {
+        args.push(params.normalizedOriginalPath);
+    }
+    const result = await runGit(args, params.workspaceFolder);
+    if (!result.ok) {
+        throw result.error;
+    }
+    const parsed = parseSingleNumstat(result.stdout);
+    return { isBinary: parsed.isBinary, found: parsed.found };
+}
+async function getUntrackedDiffMetadata(params) {
+    const absolutePath = path.join(params.workspaceFolder, params.normalizedPath);
+    const result = await runGit(["diff", "--numstat", "--no-index", "--", "/dev/null", absolutePath], params.workspaceFolder, [0, 1]);
+    if (!result.ok) {
+        throw result.error;
+    }
+    return { isBinary: parseSingleNumstat(result.stdout).isBinary };
+}
+async function resolveUnstagedBeforePath(params) {
+    const currentPathResult = await readGitIndexBlob(params.workspaceFolder, params.normalizedPath);
+    if (currentPathResult.ok || !params.normalizedOriginalPath || params.normalizedOriginalPath === params.normalizedPath) {
+        return currentPathResult;
+    }
+    return readGitIndexBlob(params.workspaceFolder, params.normalizedOriginalPath);
+}
+export async function getWorktreeGitDiff(params) {
+    const normalizedPath = normalizeGitWorktreeRelativePath(params.path);
+    const normalizedOriginalPath = params.originalPath ? normalizeGitWorktreeRelativePath(params.originalPath) : null;
+    const trackedMetadata = await getTrackedDiffMetadata({
+        workspaceFolder: params.workspaceFolder,
+        scope: params.scope,
+        normalizedPath,
+        normalizedOriginalPath,
+    });
+    const diffMetadata = params.scope === "unstaged" && !trackedMetadata.found
+        ? await getUntrackedDiffMetadata({
+            workspaceFolder: params.workspaceFolder,
+            normalizedPath,
+        })
+        : trackedMetadata;
+    if (diffMetadata.isBinary) {
+        return {
+            path: normalizedPath,
+            originalPath: normalizedOriginalPath,
+            scope: params.scope,
+            before: "",
+            after: "",
+            isBinary: true,
+        };
+    }
+    if (params.scope === "staged") {
+        const [beforeResult, afterResult] = await Promise.all([
+            readGitBlobAsDiffText(runGit(["show", `HEAD:${normalizedOriginalPath ?? normalizedPath}`], params.workspaceFolder), true),
+            readGitBlobAsDiffText(readGitIndexBlob(params.workspaceFolder, normalizedPath), true),
+        ]);
+        return {
+            path: normalizedPath,
+            originalPath: normalizedOriginalPath,
+            scope: params.scope,
+            before: beforeResult,
+            after: afterResult,
+            isBinary: false,
+        };
+    }
+    const indexResult = await resolveUnstagedBeforePath({
+        workspaceFolder: params.workspaceFolder,
+        normalizedPath,
+        normalizedOriginalPath,
+    });
+    const beforeResult = await readGitBlobAsDiffText(Promise.resolve(indexResult), true);
+    let after = beforeResult;
+    const fsPath = path.join(params.workspaceFolder, normalizedPath);
+    try {
+        after = await readFileAsDiffText(fsPath);
+    }
+    catch {
+        after = "";
+    }
+    return {
+        path: normalizedPath,
+        originalPath: normalizedOriginalPath,
+        scope: params.scope,
+        before: beforeResult,
+        after,
+        isBinary: false,
+    };
+}