@staff0rd/assist 0.484.2 → 0.485.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.484.2",
+  version: "0.485.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -9089,6 +9089,28 @@ function getSessionParam(req) {
   return url.searchParams.get("session") ?? void 0;
 }
 
+// src/commands/sessions/web/execGit.ts
+import { execFile as execFile3 } from "child_process";
+import { promisify as promisify2 } from "util";
+var execFileAsync2 = promisify2(execFile3);
+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/windowsCwdToWslPath.ts
 function windowsCwdToWslPath(cwd) {
   const match = /^([A-Za-z]):[\\/](.*)$/.exec(cwd);
@@ -9103,6 +9125,49 @@ function toGitCwd(cwd) {
   return detectPlatform() === "wsl" ? windowsCwdToWslPath(cwd) : cwd;
 }
 
+// src/commands/sessions/web/defaultBranchRef.ts
+var ORIGIN_HEAD_REF = "refs/remotes/origin/HEAD";
+var ORIGIN_REF_PREFIX = "refs/remotes/origin/";
+function configuredDefaultBranch(cwd) {
+  try {
+    return loadConfigFrom(toGitCwd(cwd)).branch?.defaultBranch;
+  } catch {
+    return void 0;
+  }
+}
+async function originHeadBranch(cwd) {
+  try {
+    const ref = (await execGit(cwd, ["symbolic-ref", "--quiet", ORIGIN_HEAD_REF])).trim();
+    if (!ref.startsWith(ORIGIN_REF_PREFIX)) return void 0;
+    return ref.slice(ORIGIN_REF_PREFIX.length) || void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function defaultBranchRef(cwd) {
+  const branch2 = configuredDefaultBranch(cwd) ?? await originHeadBranch(cwd);
+  if (!branch2) return void 0;
+  const ref = `origin/${branch2}`;
+  try {
+    await execGit(cwd, ["rev-parse", "--verify", "--quiet", `${ref}^{commit}`]);
+    return ref;
+  } catch {
+    return void 0;
+  }
+}
+
+// src/commands/sessions/web/branchDiffBase.ts
+async function branchDiffBase(cwd) {
+  const ref = await defaultBranchRef(cwd);
+  if (!ref) return void 0;
+  try {
+    const base = await execGit(cwd, ["merge-base", ref, "HEAD"]);
+    return base.trim() || void 0;
+  } catch {
+    return void 0;
+  }
+}
+
 // src/commands/sessions/web/includesCommittedChanges.ts
 function includesCommittedChanges(cwd) {
   try {
@@ -9158,33 +9223,15 @@ async function itemScopeCommits(cwd, sessionId) {
 async function resolveDiffScope(cwd, sessionId, scope) {
   if (!scope || scope === "all") return { kind: "all" };
   if (scope === "uncommitted") return { kind: "uncommitted" };
+  if (scope === "branch") {
+    const base = await branchDiffBase(cwd);
+    return base ? { kind: "branch", base } : void 0;
+  }
   const commits2 = await itemScopeCommits(cwd, sessionId);
   if (!commits2.some((commit2) => commit2.sha === scope)) return void 0;
   return { kind: "commit", sha: scope };
 }
 
-// src/commands/sessions/web/execGit.ts
-import { execFile as execFile3 } from "child_process";
-import { promisify as promisify2 } from "util";
-var execFileAsync2 = promisify2(execFile3);
-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/resolveCommit.ts
 var GIT_EMPTY_TREE_HASH = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
 async function commitBase(cwd, sha) {
@@ -9291,8 +9338,7 @@ async function dirtyPaths(cwd, bases) {
 var MAX_DIFF_BYTES = 50 * 1024 * 1024;
 async function scopedDiff(cwd, session, scope) {
   if (scope.kind === "commit") return commitDiff(cwd, scope.sha);
-  const tracked = scope.kind === "uncommitted" ? await workingTreeDiff(cwd) : await trackedDiff(cwd, session);
-  return tracked + await untrackedDiff(cwd);
+  return await trackedScopeDiff(cwd, session, scope) + await untrackedDiff(cwd);
 }
 async function untrackedFileDiff(cwd, path71) {
   return execGit(cwd, ["diff", "--no-index", "--", "/dev/null", path71], {
@@ -9322,8 +9368,16 @@ async function groupedDiff(cwd, groups) {
   );
   return diffs.join("");
 }
+async function baseDiff(cwd, base) {
+  return execGit(cwd, ["diff", base], { maxBuffer: MAX_DIFF_BYTES });
+}
 async function workingTreeDiff(cwd) {
-  return execGit(cwd, ["diff", "HEAD"], { maxBuffer: MAX_DIFF_BYTES });
+  return baseDiff(cwd, "HEAD");
+}
+async function trackedScopeDiff(cwd, session, scope) {
+  if (scope.kind === "branch") return baseDiff(cwd, scope.base);
+  if (scope.kind === "uncommitted") return workingTreeDiff(cwd);
+  return trackedDiff(cwd, session);
 }
 async function trackedDiff(cwd, session) {
   const changeSet = await itemChangeSet(cwd, session);
@@ -9361,16 +9415,29 @@ async function diff2(req, res) {
 }
 
 // src/commands/sessions/web/diffScopes.ts
-async function diffScopes(req, res) {
-  const cwd = getCwdParam(req, res);
-  if (!cwd) return;
+async function scopeCommits(cwd, sessionId) {
   try {
-    const commits2 = await itemScopeCommits(cwd, getSessionParam(req));
-    respondJson(res, 200, { commits: commits2 });
+    return await itemScopeCommits(cwd, sessionId);
   } catch {
-    respondJson(res, 200, { commits: [] });
+    return [];
   }
 }
+async function branchBase(cwd) {
+  try {
+    return await defaultBranchRef(cwd) ?? null;
+  } catch {
+    return null;
+  }
+}
+async function diffScopes(req, res) {
+  const cwd = getCwdParam(req, res);
+  if (!cwd) return;
+  const [commits2, base] = await Promise.all([
+    scopeCommits(cwd, getSessionParam(req)),
+    branchBase(cwd)
+  ]);
+  respondJson(res, 200, { commits: commits2, branchBase: base });
+}
 
 // src/commands/sessions/web/fileContent.ts
 import { readFile, stat as stat2 } from "fs/promises";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.484.2",
+	"version": "0.485.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {