@staff0rd/assist 0.424.0 → 0.425.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.424.0",
+  version: "0.425.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -68,6 +68,8 @@ var package_default = {
     "node-pty": "^1.1.0",
     pg: "^8.21.0",
     "pg-copy-streams": "^7.0.0",
+    "react-diff-view": "^3.3.3",
+    refractor: "^3.6.0",
     semver: "^7.7.3",
     "shell-quote": "^1.8.3",
     "ts-morph": "^27.0.2",
@@ -3394,11 +3396,11 @@ function collectFileComments(file, lines, project) {
 // src/commands/verify/blockCodeComments/parseDiffAddedLines.ts
 var FILE_HEADER = /^\+\+\+ (?:b\/)?(.+)$/;
 var HUNK_HEADER = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
-function parseDiffAddedLines(diff2) {
+function parseDiffAddedLines(diff3) {
   const added = /* @__PURE__ */ new Map();
   let currentFile = null;
   let newLine = 0;
-  for (const line of diff2.split("\n")) {
+  for (const line of diff3.split("\n")) {
     const fileMatch = line.match(FILE_HEADER);
     if (fileMatch) {
       const file = fileMatch[1];
@@ -3446,11 +3448,11 @@ function shouldScan(file, ignoreGlobs) {
   return fs15.existsSync(file);
 }
 function findComments(options2) {
-  const diff2 = execSync10("git diff HEAD", {
+  const diff3 = execSync10("git diff HEAD", {
     encoding: "utf8",
     maxBuffer: 64 * 1024 * 1024
   });
-  const addedLines = parseDiffAddedLines(diff2);
+  const addedLines = parseDiffAddedLines(diff3);
   const project = new Project2({
     skipAddingFilesFromTsConfig: true,
     compilerOptions: { allowJs: true }
@@ -8043,7 +8045,7 @@ import { createHash } from "crypto";
 import { readFileSync as readFileSync18 } from "fs";
 import { dirname as dirname19, join as join22 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
-function createBundleHandler(importMetaUrl, bundlePath) {
+function createBundleHandler(importMetaUrl, bundlePath, contentType = "application/javascript") {
   const dir = dirname19(fileURLToPath4(importMetaUrl));
   let cache2;
   return (req, res) => {
@@ -8062,7 +8064,7 @@ function createBundleHandler(importMetaUrl, bundlePath) {
       return;
     }
     res.writeHead(200, {
-      "Content-Type": "application/javascript",
+      "Content-Type": contentType,
       ...headers
     });
     res.end(cache2.body);
@@ -8520,6 +8522,75 @@ async function handleItemRoute(req, res, pathname) {
   return false;
 }
 
+// src/commands/sessions/web/execGit.ts
+import { execFile as execFile2 } from "child_process";
+import { promisify as promisify2 } from "util";
+var execFileAsync2 = promisify2(execFile2);
+async function execGit(cwd, args, opts = {}) {
+  const { maxBuffer, allowFailure } = opts;
+  const { file, argv } = /^[A-Za-z]:[\\/]/.test(cwd) ? { file: "git.exe", argv: ["-C", cwd, ...args] } : { file: "git", argv: args };
+  try {
+    const { stdout } = await execFileAsync2(file, argv, {
+      encoding: "utf8",
+      ...maxBuffer ? { maxBuffer } : {},
+      ...file === "git" ? { cwd } : {}
+    });
+    return stdout;
+  } catch (error) {
+    if (allowFailure && error && typeof error === "object" && "stdout" in error) {
+      return String(error.stdout);
+    }
+    throw error;
+  }
+}
+
+// src/commands/sessions/web/getCwdParam.ts
+function getCwdParam(req, res) {
+  const url = new URL(req.url ?? "/", "http://localhost");
+  const cwd = url.searchParams.get("cwd");
+  if (!cwd) {
+    respondJson(res, 400, { error: "Missing cwd" });
+    return null;
+  }
+  return cwd;
+}
+
+// src/commands/sessions/web/diff.ts
+var MAX_DIFF_BYTES = 50 * 1024 * 1024;
+async function untrackedFileDiff(cwd, path71) {
+  return execGit(cwd, ["diff", "--no-index", "--", "/dev/null", path71], {
+    maxBuffer: MAX_DIFF_BYTES,
+    allowFailure: true
+  });
+}
+async function untrackedDiff(cwd) {
+  const list5 = await execGit(cwd, [
+    "ls-files",
+    "--others",
+    "--exclude-standard"
+  ]);
+  const paths = list5.split("\n").filter(Boolean);
+  const diffs = await Promise.all(
+    paths.map((path71) => untrackedFileDiff(cwd, path71))
+  );
+  return diffs.join("");
+}
+async function diff2(req, res) {
+  const cwd = getCwdParam(req, res);
+  if (!cwd) return;
+  try {
+    const tracked = await execGit(cwd, ["diff", "HEAD"], {
+      maxBuffer: MAX_DIFF_BYTES
+    });
+    const untracked = await untrackedDiff(cwd);
+    res.writeHead(200, { "Content-Type": "text/plain; charset=utf-8" });
+    res.end(tracked + untracked);
+  } catch {
+    res.writeHead(500, { "Content-Type": "text/plain; charset=utf-8" });
+    res.end("");
+  }
+}
+
 // src/shared/db/listBackups.ts
 import { desc } from "drizzle-orm";
 async function listBackups(db) {
@@ -8540,6 +8611,7 @@ function getHtml() {
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>Assist</title>
 <link rel="stylesheet" href="/xterm.css">
+<link rel="stylesheet" href="/bundle.css">
 <style>
   * { margin: 0; padding: 0; box-sizing: border-box; }
   html, body, #app { width: 100%; height: 100%; }
@@ -8562,17 +8634,6 @@ function getHtml() {
 </html>`;
 }
 
-// src/commands/sessions/web/getCwdParam.ts
-function getCwdParam(req, res) {
-  const url = new URL(req.url ?? "/", "http://localhost");
-  const cwd = url.searchParams.get("cwd");
-  if (!cwd) {
-    respondJson(res, 400, { error: "Missing cwd" });
-    return null;
-  }
-  return cwd;
-}
-
 // src/commands/sessions/web/windowsCwdToWslPath.ts
 function windowsCwdToWslPath(cwd) {
   const match = /^([A-Za-z]):[\\/](.*)$/.exec(cwd);
@@ -8604,11 +8665,11 @@ function handleServerRuns(req, res) {
 }
 
 // src/commands/sessions/web/getReviewSynthesis.ts
-import { execFile as execFile2 } from "child_process";
+import { execFile as execFile3 } from "child_process";
 import { readFileSync as readFileSync19 } from "fs";
 import { homedir as homedir11 } from "os";
 import { basename as basename6, join as join25 } from "path";
-import { promisify as promisify2 } from "util";
+import { promisify as promisify3 } from "util";
 
 // src/commands/sessions/web/findSynthesisForBranch.ts
 import { existsSync as existsSync26, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
@@ -8623,9 +8684,9 @@ function findSynthesisForBranch(repoReviewsDir, branch2) {
 }
 
 // src/commands/sessions/web/getReviewSynthesis.ts
-var execFileAsync2 = promisify2(execFile2);
+var execFileAsync3 = promisify3(execFile3);
 function runGit(cwd, args) {
-  return execFileAsync2("git", args, {
+  return execFileAsync3("git", args, {
     encoding: "utf8",
     cwd: toGitCwd(cwd)
   }).then((r) => r.stdout.trim());
@@ -8668,10 +8729,6 @@ function githubUrl(req, res) {
   });
 }
 
-// src/commands/sessions/web/gitStatus.ts
-import { execFile as execFile3 } from "child_process";
-import { promisify as promisify3 } from "util";
-
 // src/commands/sessions/web/parseGitStatus.ts
 function extractPath(rest) {
   const arrow = rest.indexOf(" -> ");
@@ -8700,24 +8757,20 @@ function parseGitStatus(output) {
 }
 
 // src/commands/sessions/web/gitStatus.ts
-var execFileAsync3 = promisify3(execFile3);
 async function gitStatus(req, res) {
   const cwd = getCwdParam(req, res);
   if (!cwd) return;
   try {
-    respondJson(res, 200, parseGitStatus(await runGitStatus(cwd)));
+    const output = await execGit(cwd, [
+      "status",
+      "--porcelain",
+      "--untracked-files=all"
+    ]);
+    respondJson(res, 200, parseGitStatus(output));
   } catch {
     respondJson(res, 200, { new: [], modified: [], deleted: [] });
   }
 }
-function runGitStatus(cwd) {
-  const args = ["status", "--porcelain", "--untracked-files=all"];
-  const { file, argv } = /^[A-Za-z]:[\\/]/.test(cwd) ? { file: "git.exe", argv: ["-C", cwd, ...args] } : { file: "git", argv: args };
-  return execFileAsync3(file, argv, {
-    encoding: "utf8",
-    ...file === "git" ? { cwd } : {}
-  }).then((r) => r.stdout);
-}
 
 // src/shared/harnesses.ts
 import * as os3 from "os";
@@ -9267,12 +9320,18 @@ var routes2 = {
     "commands/sessions/web/bundle.js"
   ),
   "GET /xterm.css": createCssHandler("@xterm/xterm/css/xterm.css"),
+  "GET /bundle.css": createBundleHandler(
+    import.meta.url,
+    "commands/sessions/web/bundle.css",
+    "text/css"
+  ),
   "GET /api/items": listItems,
   "GET /api/backlog/summary": getBacklogSummary,
   "POST /api/open-in-code": openInCode,
   "POST /api/restart": restartWeb,
   "GET /api/github-url": githubUrl,
   "GET /api/git-status": gitStatus,
+  "GET /api/diff": diff2,
   "GET /api/jira-site": jiraSite,
   "GET /api/harness": harnessCapabilities,
   "GET /api/pr-status": prStatus,
@@ -20834,10 +20893,10 @@ function gutter(lineNumber) {
   const label2 = lineNumber === null ? "" : String(lineNumber);
   return `${label2.padStart(GUTTER_WIDTH, " ")}  `;
 }
-function annotateDiffWithLineNumbers(diff2) {
+function annotateDiffWithLineNumbers(diff3) {
   let inFile = false;
   let newLine = 0;
-  return diff2.split("\n").map((line) => {
+  return diff3.split("\n").map((line) => {
     if (FILE_HEADER2.test(line)) {
       inFile = true;
       return gutter(null) + line;
@@ -21080,7 +21139,7 @@ function gatherContext() {
   }).trim();
   const prInfo = fetchPrDiffInfo();
   const changedFiles = fetchPrChangedFiles(prInfo.prNumber);
-  const diff2 = fetchPrDiff(prInfo.prNumber, prInfo.baseSha, prInfo.headSha);
+  const diff3 = fetchPrDiff(prInfo.prNumber, prInfo.baseSha, prInfo.headSha);
   return {
     branch: branch2,
     sha,
@@ -21091,7 +21150,7 @@ function gatherContext() {
     headRef: prInfo.headRef,
     headSha: prInfo.headSha,
     changedFiles,
-    diff: diff2
+    diff: diff3
   };
 }
 
@@ -21306,11 +21365,11 @@ async function postAndMaybeSubmit(lineBound, markdown, options2) {
 // src/commands/review/buildDiffLineIndex.ts
 var FILE_HEADER3 = /^\+\+\+ (?:b\/)?(.+)$/;
 var HUNK_HEADER3 = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/;
-function buildDiffLineIndex(diff2) {
+function buildDiffLineIndex(diff3) {
   const index3 = /* @__PURE__ */ new Map();
   let currentFile = null;
   let newLine = 0;
-  for (const line of diff2.split("\n")) {
+  for (const line of diff3.split("\n")) {
     const fileMatch = line.match(FILE_HEADER3);
     if (fileMatch) {
       currentFile = fileMatch[1] === "/dev/null" ? null : fileMatch[1];
@@ -21377,10 +21436,10 @@ function warnOutOfDiff(outOfDiff) {
 
 // src/commands/review/selectInDiffFindings.ts
 function selectInDiffFindings(lineBound, prDiff) {
-  const diff2 = fetchPrDiff(prDiff.prNumber, prDiff.baseSha, prDiff.headSha);
+  const diff3 = fetchPrDiff(prDiff.prNumber, prDiff.baseSha, prDiff.headSha);
   const { inDiff, outOfDiff } = partitionFindingsByDiff(
     lineBound,
-    buildDiffLineIndex(diff2)
+    buildDiffLineIndex(diff3)
   );
   warnOutOfDiff(outOfDiff);
   return inDiff;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.424.0",
+	"version": "0.425.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {
@@ -62,6 +62,8 @@
 		"node-pty": "^1.1.0",
 		"pg": "^8.21.0",
 		"pg-copy-streams": "^7.0.0",
+		"react-diff-view": "^3.3.3",
+		"refractor": "^3.6.0",
 		"semver": "^7.7.3",
 		"shell-quote": "^1.8.3",
 		"ts-morph": "^27.0.2",