@junctionpanel/server 0.1.79 → 0.1.81

package/dist/server/utils/checkout-git.js

@@ -3,7 +3,7 @@ import { promisify } from "util";
 import { resolve, dirname, basename } from "path";
 import { realpathSync } from "fs";
 import { open as openFile, stat as statFile } from "fs/promises";
-import { parseAndHighlightDiff } from "../server/utils/diff-highlighter.js";
+import { parseAndHighlightDiff, parseDiff } from "../server/utils/diff-highlighter.js";
 import { expandTilde } from "./path.js";
 import { isJunctionOwnedWorktreeCwd } from "./worktree.js";
 import { requireJunctionWorktreeBaseRefName } from "./worktree-metadata.js";
@@ -15,8 +15,8 @@ const READ_ONLY_GIT_ENV = {
 };
 const SAFE_GIT_REMOTE_NAME_PATTERN = /^[A-Za-z0-9._-]+$/;
 const SMALL_OUTPUT_MAX_BUFFER = 20 * 1024 * 1024; // 20MB
-async function execGit(command, options) {
-    return execAsync(command, { ...options, maxBuffer: SMALL_OUTPUT_MAX_BUFFER });
+async function execGit(args, options) {
+    return execFileAsync("git", [...args], { ...options, maxBuffer: SMALL_OUTPUT_MAX_BUFFER });
 }
 function isSafeRemoteName(remoteName) {
     return SAFE_GIT_REMOTE_NAME_PATTERN.test(remoteName);
@@ -108,7 +108,7 @@ function normalizeBranchSuggestionName(raw, source) {
     return normalized;
 }
 async function listGitRefs(cwd, refPrefix) {
-    const { stdout } = await execGit(`git for-each-ref --format="%(refname:short)" ${refPrefix}`, {
+    const { stdout } = await execGit(["for-each-ref", "--format=%(refname:short)", refPrefix], {
         cwd,
         env: READ_ONLY_GIT_ENV,
     });
@@ -214,8 +214,7 @@ export async function listBranchSuggestions(cwd, options) {
 async function listCheckoutFileChanges(cwd, diffArgs, opts) {
     const changes = [];
     const includeUntracked = opts?.includeUntracked ?? true;
-    const diffArgsStr = diffArgs.length > 0 ? ` ${diffArgs.join(" ")}` : "";
-    const { stdout: nameStatusOut } = await execGit(`git diff --name-status${diffArgsStr}`, {
+    const { stdout: nameStatusOut } = await execGit(["diff", "--name-status", ...diffArgs], {
         cwd,
         env: READ_ONLY_GIT_ENV,
     });
@@ -251,7 +250,7 @@ async function listCheckoutFileChanges(cwd, diffArgs, opts) {
         });
     }
     if (includeUntracked) {
-        const { stdout: untrackedOut } = await execGit("git ls-files --others --exclude-standard", {
+        const { stdout: untrackedOut } = await execGit(["ls-files", "--others", "--exclude-standard"], {
             cwd,
             env: READ_ONLY_GIT_ENV,
         });
@@ -281,7 +280,10 @@ async function listCheckoutFileChanges(cwd, diffArgs, opts) {
 }
 async function tryResolveMergeBase(cwd, baseRef) {
     try {
-        const { stdout } = await execGit(`git merge-base ${baseRef} HEAD`, { cwd, env: READ_ONLY_GIT_ENV });
+        const { stdout } = await execGit(["merge-base", baseRef, "HEAD"], {
+            cwd,
+            env: READ_ONLY_GIT_ENV,
+        });
         const sha = stdout.trim();
         return sha.length > 0 ? sha : null;
     }
@@ -341,7 +343,10 @@ async function getTrackedNumstatByPath(cwd, diffArgs) {
         }
         stats.set(path, { additions, deletions, isBinary: false });
     }
-    return stats;
+    return {
+        stats,
+        truncated: result.truncated,
+    };
 }
 function isTrackedDiffTooLarge(stat) {
     if (!stat || stat.isBinary) {
@@ -1130,6 +1135,9 @@ export async function getCheckoutStatusLite(cwd, context) {
 }
 export async function getCheckoutDiff(cwd, compare, context) {
     await requireGitRepo(cwd);
+    const includeStructured = compare.includeStructured === true;
+    const structuredDetail = compare.structuredDetail ?? "full";
+    const includeDiffText = compare.includeDiffText ?? true;
     let diffArgs;
     let includeUntracked;
     if (compare.mode === "uncommitted") {
@@ -1173,20 +1181,29 @@ export async function getCheckoutDiff(cwd, compare, context) {
         if (diffBytes >= TOTAL_DIFF_MAX_BYTES)
             return;
         const buf = Buffer.from(text, "utf8");
-        if (diffBytes + buf.length <= TOTAL_DIFF_MAX_BYTES) {
-            diffText += text;
+        const remaining = TOTAL_DIFF_MAX_BYTES - diffBytes;
+        if (buf.length <= remaining) {
             diffBytes += buf.length;
+            if (includeDiffText) {
+                diffText += text;
+            }
             return;
         }
-        const remaining = TOTAL_DIFF_MAX_BYTES - diffBytes;
         if (remaining > 0) {
-            diffText += buf.subarray(0, remaining).toString("utf8");
             diffBytes = TOTAL_DIFF_MAX_BYTES;
+            if (includeDiffText) {
+                diffText += buf.subarray(0, remaining).toString("utf8");
+            }
         }
     };
     const trackedChanges = changes.filter((change) => !change.isUntracked);
     const untrackedChanges = changes.filter((change) => change.isUntracked === true);
-    const trackedNumstatByPath = trackedChanges.length > 0 ? await getTrackedNumstatByPath(cwd, diffArgs) : new Map();
+    const needsTrackedDiffText = includeDiffText || (includeStructured && structuredDetail === "full");
+    const trackedNumstatResult = trackedChanges.length > 0
+        ? await getTrackedNumstatByPath(cwd, diffArgs)
+        : { stats: new Map(), truncated: false };
+    const trackedNumstatByPath = trackedNumstatResult.stats;
+    const trackedNumstatTruncated = trackedNumstatResult.truncated;
     const trackedDiffPaths = [];
     const trackedPlaceholderByPath = new Map();
     for (const change of trackedChanges) {
@@ -1203,7 +1220,7 @@ export async function getCheckoutDiff(cwd, compare, context) {
     }
     let trackedDiffText = "";
     let trackedDiffTruncated = false;
-    if (trackedDiffPaths.length > 0) {
+    if (trackedDiffPaths.length > 0 && needsTrackedDiffText) {
         const trackedDiffResult = await spawnLimitedText({
             cmd: "git",
             args: ["diff", ...diffArgs, "--", ...trackedDiffPaths],
@@ -1214,7 +1231,7 @@ export async function getCheckoutDiff(cwd, compare, context) {
         trackedDiffText = trackedDiffResult.text;
         trackedDiffTruncated = trackedDiffResult.truncated;
         appendDiff(trackedDiffText);
-        if (trackedDiffTruncated) {
+        if (includeDiffText && trackedDiffTruncated) {
             appendDiff("# tracked diff truncated\n");
         }
     }
@@ -1225,8 +1242,10 @@ export async function getCheckoutDiff(cwd, compare, context) {
         }
         appendDiff(`# ${change.path}: diff too large omitted\n`);
     };
-    if (compare.includeStructured) {
-        const parsedTrackedFiles = trackedDiffText.length > 0 ? await parseAndHighlightDiff(trackedDiffText, cwd) : [];
+    if (includeStructured) {
+        const parsedTrackedFiles = structuredDetail === "full" && trackedDiffText.length > 0
+            ? await parseAndHighlightDiff(trackedDiffText, cwd)
+            : [];
         const parsedTrackedByPath = new Map(parsedTrackedFiles.map((file) => [file.path, file]));
         for (const change of trackedChanges) {
             const placeholder = trackedPlaceholderByPath.get(change.path);
@@ -1235,10 +1254,25 @@ export async function getCheckoutDiff(cwd, compare, context) {
                     status: placeholder.status,
                     stat: placeholder.stat,
                 }));
-                appendTrackedPlaceholderComment(change, placeholder.status);
+                if (includeDiffText) {
+                    appendTrackedPlaceholderComment(change, placeholder.status);
+                }
                 continue;
             }
             const stat = trackedNumstatByPath.get(change.path) ?? null;
+            if (structuredDetail === "summary") {
+                const missingSummaryStat = stat === null && trackedNumstatTruncated;
+                structured.push({
+                    path: change.path,
+                    isNew: change.isNew,
+                    isDeleted: change.isDeleted,
+                    additions: stat?.additions ?? 0,
+                    deletions: stat?.deletions ?? 0,
+                    hunks: [],
+                    status: missingSummaryStat ? "too_large" : "ok",
+                });
+                continue;
+            }
             const parsedFile = parsedTrackedByPath.get(change.path);
             if (parsedFile) {
                 structured.push({
@@ -1264,7 +1298,7 @@ export async function getCheckoutDiff(cwd, compare, context) {
     else {
         for (const change of trackedChanges) {
             const placeholder = trackedPlaceholderByPath.get(change.path);
-            if (placeholder) {
+            if (placeholder && includeDiffText) {
                 appendTrackedPlaceholderComment(change, placeholder.status);
             }
         }
@@ -1274,12 +1308,16 @@ export async function getCheckoutDiff(cwd, compare, context) {
             break;
         }
         const { text, truncated, stat } = await getUntrackedDiffText(cwd, change);
-        if (!compare.includeStructured) {
+        if (!includeStructured) {
             if (stat?.isBinary) {
-                appendDiff(`# ${change.path}: binary diff omitted\n`);
+                if (includeDiffText) {
+                    appendDiff(`# ${change.path}: binary diff omitted\n`);
+                }
             }
             else if (truncated) {
-                appendDiff(`# ${change.path}: diff too large omitted\n`);
+                if (includeDiffText) {
+                    appendDiff(`# ${change.path}: diff too large omitted\n`);
+                }
             }
             else {
                 appendDiff(text);
@@ -1288,16 +1326,22 @@ export async function getCheckoutDiff(cwd, compare, context) {
         }
         if (stat?.isBinary) {
             structured.push(buildPlaceholderParsedDiffFile(change, { status: "binary", stat }));
-            appendDiff(`# ${change.path}: binary diff omitted\n`);
+            if (includeDiffText) {
+                appendDiff(`# ${change.path}: binary diff omitted\n`);
+            }
             continue;
         }
         if (truncated) {
             structured.push(buildPlaceholderParsedDiffFile(change, { status: "too_large", stat }));
-            appendDiff(`# ${change.path}: diff too large omitted\n`);
+            if (includeDiffText) {
+                appendDiff(`# ${change.path}: diff too large omitted\n`);
+            }
             continue;
         }
         appendDiff(text);
-        const parsed = await parseAndHighlightDiff(text, cwd);
+        const parsed = structuredDetail === "summary"
+            ? parseDiff(text)
+            : await parseAndHighlightDiff(text, cwd);
         const parsedFile = parsed[0] ??
             {
                 path: change.path,
@@ -1312,13 +1356,14 @@ export async function getCheckoutDiff(cwd, compare, context) {
             path: change.path,
             isNew: change.isNew,
             isDeleted: change.isDeleted,
+            hunks: structuredDetail === "summary" ? [] : parsedFile.hunks,
             status: "ok",
         });
     }
-    if (compare.includeStructured) {
-        return { diff: diffText, structured };
+    if (includeStructured) {
+        return { diff: includeDiffText ? diffText : "", structured };
     }
-    return { diff: diffText };
+    return { diff: includeDiffText ? diffText : "" };
 }
 export async function commitChanges(cwd, options) {
     await requireGitRepo(cwd);
@@ -2109,6 +2154,7 @@ async function getPullRequestMergeabilityViaRest(cwd, repo, prNumber) {
 }
 function toPullRequestStatus(baseStatus, checks, mergeability, options) {
     const requiredChecks = checks.filter((check) => check.required);
+    const nonRequiredChecks = checks.filter((check) => !check.required);
     const requiredChecksKnown = options?.requiredChecksKnown ?? true;
     const checksState = baseStatus.isMerged
         ? "passing"
@@ -2125,6 +2171,11 @@ function toPullRequestStatus(baseStatus, checks, mergeability, options) {
                 ? true
                 : requiredChecks.every((check) => check.bucket === "pass" || check.bucket === "skipping");
     const hasConflicts = baseStatus.isMerged ? false : (mergeability?.hasConflicts ?? false);
+    const hasNonRequiredFailingChecks = baseStatus.isMerged
+        ? false
+        : !requiredChecksKnown
+            ? null
+            : nonRequiredChecks.some((check) => check.bucket === "fail" || check.bucket === "cancel");
     const mergeableKnown = baseStatus.isMerged ? true : (mergeability?.mergeableKnown ?? true);
     const canMerge = baseStatus.isMerged
         ? false
@@ -2146,6 +2197,7 @@ function toPullRequestStatus(baseStatus, checks, mergeability, options) {
         requiredChecksPassed,
         canMerge,
         hasConflicts,
+        hasNonRequiredFailingChecks,
     };
 }
 async function listWorkflowRunsForHead(options) {
@@ -2285,6 +2337,7 @@ function toSummaryOnlyPullRequestStatus(baseStatus) {
         requiredChecksPassed: null,
         canMerge: null,
         hasConflicts: null,
+        hasNonRequiredFailingChecks: null,
     };
 }
 async function loadCurrentPullRequest(cwd, options) {
@@ -2457,6 +2510,31 @@ async function loadCurrentPullRequest(cwd, options) {
                 requiredChecksKnown = false;
                 checks = await getPullRequestChecksViaRest(cwd, repo, openBaseStatus.headSha ?? localHeadSha ?? openBaseStatus.headRefName);
             }
+            if (requiredChecksKnown
+                && checks.every((check) => check.bucket === "pass" || check.bucket === "skipping")) {
+                try {
+                    const rollupChecks = await getPullRequestChecksViaRest(cwd, repo, openBaseStatus.headSha ?? localHeadSha ?? openBaseStatus.headRefName);
+                    checks = mergeCheckStatuses(checks, rollupChecks);
+                }
+                catch (error) {
+                    if (isGhAuthError(error)) {
+                        return {
+                            status: null,
+                            githubFeaturesEnabled: false,
+                            checks: [],
+                            headSha: null,
+                            repo,
+                            detailLevel,
+                            fetchedAt: Date.now(),
+                        };
+                    }
+                    if (isGhRateLimitError(error)) {
+                        if (compatibleCachedLookup) {
+                            return compatibleCachedLookup;
+                        }
+                    }
+                }
+            }
             try {
                 mergeability = await getPullRequestMergeabilityViaRest(cwd, repo, openBaseStatus.number);
             }