chatroom-cli 1.62.1 → 1.63.0

package/dist/index.js

@@ -81713,6 +81713,7 @@ var FULL_DIFF_MAX_BYTES = 500000, COMMITS_PER_PAGE = 20;
 // src/infrastructure/git/run-command.ts
 import { spawn as spawn5 } from "node:child_process";
 function runCommandSpawn(command, args2, cwd, options) {
+  const successExitCodes = options?.successExitCodes ?? [0];
   return new Promise((resolve4) => {
     const child = spawn5(command, args2, {
       cwd,
@@ -81738,7 +81739,7 @@ function runCommandSpawn(command, args2, cwd, options) {
     child.on("close", (code2) => {
       if (timer)
         clearTimeout(timer);
-      if (code2 === 0)
+      if (successExitCodes.includes(code2 ?? -1))
         resolve4({ stdout, stderr });
       else {
         resolve4({
@@ -81790,6 +81791,91 @@ function isPermissionDenied(message) {
 function isEmptyRepo(stderr) {
   return stderr.includes("does not have any commits yet") || stderr.includes("no commits yet") || stderr.includes("ambiguous argument 'HEAD'") || stderr.includes("unknown revision or path");
 }
+async function listUntrackedFiles(workingDir) {
+  const result = await runGit(["ls-files", "--others", "--exclude-standard"], workingDir);
+  if ("error" in result)
+    return [];
+  return result.stdout.split(`
+`).map((line) => line.trim()).filter(Boolean);
+}
+async function getUntrackedFileDiff(workingDir, filePath) {
+  const result = await runGit(["diff", "--no-index", "--", NULL_DEVICE, filePath], workingDir, {
+    successExitCodes: [0, 1]
+  });
+  if ("error" in result)
+    return "";
+  return result.stdout;
+}
+function countDiffInsertions(diff8) {
+  let count3 = 0;
+  for (const line of diff8.split(`
+`)) {
+    if (line.startsWith("+") && !line.startsWith("+++"))
+      count3++;
+  }
+  return count3;
+}
+function mergeDiffStatWithUntracked(base, untrackedDiffs) {
+  const untrackedInsertions = untrackedDiffs.reduce((sum2, diff8) => sum2 + countDiffInsertions(diff8), 0);
+  return {
+    filesChanged: base.filesChanged + untrackedDiffs.length,
+    insertions: base.insertions + untrackedInsertions,
+    deletions: base.deletions
+  };
+}
+async function appendUntrackedDiffs(workingDir, trackedDiff) {
+  const untrackedPaths = await listUntrackedFiles(workingDir);
+  if (untrackedPaths.length === 0)
+    return trackedDiff;
+  const parts2 = [];
+  if (trackedDiff.trim())
+    parts2.push(trackedDiff.trimEnd());
+  for (const filePath of untrackedPaths) {
+    const fileDiff = await getUntrackedFileDiff(workingDir, filePath);
+    if (fileDiff.trim())
+      parts2.push(fileDiff.trimEnd());
+  }
+  if (parts2.length === 0)
+    return trackedDiff;
+  return `${parts2.join(`
+`)}
+`;
+}
+async function getUntrackedDiffs(workingDir) {
+  const untrackedPaths = await listUntrackedFiles(workingDir);
+  const diffs = [];
+  for (const filePath of untrackedPaths) {
+    const fileDiff = await getUntrackedFileDiff(workingDir, filePath);
+    if (fileDiff.trim())
+      diffs.push(fileDiff);
+  }
+  return diffs;
+}
+function truncateDiffContent(raw) {
+  const byteLength2 = Buffer.byteLength(raw, "utf8");
+  if (byteLength2 > FULL_DIFF_MAX_BYTES) {
+    const truncated = Buffer.from(raw, "utf8").subarray(0, FULL_DIFF_MAX_BYTES).toString("utf8");
+    return { status: "truncated", content: truncated, truncated: true };
+  }
+  return { status: "available", content: raw, truncated: false };
+}
+async function runTrackedHeadDiff(workingDir, args2, options) {
+  const result = await runGit(args2, workingDir, options);
+  if ("error" in result) {
+    const errMsg = result.error.message;
+    if (isEmptyRepo(errMsg))
+      return { status: "empty_repo" };
+    const classified = classifyError(errMsg);
+    if (classified.status === "not_found")
+      return { status: "not_found" };
+    if (classified.status === "error")
+      return { status: "error", message: classified.message };
+    return { status: "not_found" };
+  }
+  if (isEmptyRepo(result.stderr))
+    return { status: "empty_repo" };
+  return { status: "ok", stdout: result.stdout };
+}
 function classifyError(errMessage) {
   if (isGitNotInstalled(errMessage)) {
     return { status: "error", message: "git is not installed or not in PATH" };
@@ -81840,59 +81926,41 @@ function parseDiffStatLine(statLine) {
   };
 }
 async function getDiffStat(workingDir) {
-  const result = await runGit(["diff", "HEAD", "--stat"], workingDir);
-  if ("error" in result) {
-    const errMsg = result.error.message;
-    if (isEmptyRepo(result.error.message)) {
-      return { status: "no_commits" };
-    }
-    const classified = classifyError(errMsg);
-    if (classified.status === "not_found")
-      return { status: "not_found" };
-    return classified;
-  }
-  const output = result.stdout;
-  const stderr = result.stderr;
-  if (isEmptyRepo(stderr)) {
-    return { status: "no_commits" };
+  const tracked = await runTrackedHeadDiff(workingDir, ["diff", "HEAD", "--stat"]);
+  if (tracked.status === "not_found")
+    return { status: "not_found" };
+  if (tracked.status === "error")
+    return { status: "error", message: tracked.message };
+  let baseStat = { filesChanged: 0, insertions: 0, deletions: 0 };
+  const hadEmptyRepo = tracked.status === "empty_repo";
+  if (tracked.status === "ok" && tracked.stdout.trim()) {
+    const lines = tracked.stdout.trim().split(`
+`);
+    baseStat = parseDiffStatLine(lines[lines.length - 1] ?? "");
   }
-  if (!output.trim()) {
-    return {
-      status: "available",
-      diffStat: { filesChanged: 0, insertions: 0, deletions: 0 }
-    };
+  const untrackedDiffs = await getUntrackedDiffs(workingDir);
+  if (untrackedDiffs.length === 0) {
+    if (hadEmptyRepo)
+      return { status: "no_commits" };
+    return { status: "available", diffStat: baseStat };
   }
-  const lines = output.trim().split(`
-`);
-  const summaryLine = lines[lines.length - 1] ?? "";
-  const diffStat = parseDiffStatLine(summaryLine);
-  return { status: "available", diffStat };
+  return { status: "available", diffStat: mergeDiffStatWithUntracked(baseStat, untrackedDiffs) };
 }
 async function getFullDiff(workingDir) {
-  const result = await runGit(["diff", "HEAD"], workingDir, {
+  const tracked = await runTrackedHeadDiff(workingDir, ["diff", "HEAD"], {
     maxBuffer: FULL_DIFF_MAX_BYTES + 64 * 1024
   });
-  if ("error" in result) {
-    const errMsg = result.error.message;
-    if (isEmptyRepo(errMsg)) {
-      return { status: "no_commits" };
-    }
-    const classified = classifyError(errMsg);
-    if (classified.status === "not_found")
-      return { status: "not_found" };
-    return classified;
-  }
-  const stderr = result.stderr;
-  if (isEmptyRepo(stderr)) {
-    return { status: "no_commits" };
-  }
-  const raw = result.stdout;
-  const byteLength2 = Buffer.byteLength(raw, "utf8");
-  if (byteLength2 > FULL_DIFF_MAX_BYTES) {
-    const truncated = Buffer.from(raw, "utf8").subarray(0, FULL_DIFF_MAX_BYTES).toString("utf8");
-    return { status: "truncated", content: truncated, truncated: true };
+  if (tracked.status === "not_found")
+    return { status: "not_found" };
+  if (tracked.status === "error")
+    return { status: "error", message: tracked.message };
+  const trackedDiff = tracked.status === "ok" ? tracked.stdout : "";
+  const hadEmptyRepo = tracked.status === "empty_repo";
+  const content = await appendUntrackedDiffs(workingDir, trackedDiff);
+  if (!content.trim()) {
+    return hadEmptyRepo ? { status: "no_commits" } : { status: "available", content: "", truncated: false };
   }
-  return { status: "available", content: raw, truncated: false };
+  return truncateDiffContent(content);
 }
 async function getPRDiffByNumber(cwd, prNumber) {
   const repoSlug = await getOriginRepoSlug(cwd);
@@ -81904,12 +81972,7 @@ async function getPRDiffByNumber(cwd, prNumber) {
   if (!raw.trim()) {
     return { status: "available", content: "", truncated: false };
   }
-  const byteLength2 = Buffer.byteLength(raw, "utf8");
-  if (byteLength2 > FULL_DIFF_MAX_BYTES) {
-    const truncated = Buffer.from(raw, "utf8").subarray(0, FULL_DIFF_MAX_BYTES).toString("utf8");
-    return { status: "truncated", content: truncated, truncated: true };
-  }
-  return { status: "available", content: raw, truncated: false };
+  return truncateDiffContent(raw);
 }
 async function getRecentCommits(workingDir, count3 = 20, skip = 0) {
   const format4 = "%H%x1f%h%x1f%s%x1f%b%x1f%an%x1f%aI%x1e";
@@ -82230,8 +82293,10 @@ async function getCommitStatusChecks(cwd, ref) {
     return null;
   }
 }
+var NULL_DEVICE;
 var init_git_reader = __esm(() => {
   init_run_command();
+  NULL_DEVICE = process.platform === "win32" ? "NUL" : "/dev/null";
 });
 
 // src/infrastructure/git/git-writer.ts
@@ -107936,4 +108001,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=397B148D091FEB8464756E2164756E21
+//# debugId=FFC06E9C93DB92D864756E2164756E21