@staff0rd/assist 0.355.0 → 0.356.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.355.0",
+  version: "0.356.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -6792,21 +6792,47 @@ async function prList(req, res) {
 }
 
 // src/commands/sessions/web/prStatus.ts
-var getPr = createCachedGhJson(
-  ["pr", "view", "--json", "number,title,author,createdAt,url"],
+import { execFile as execFile4 } from "child_process";
+import { promisify as promisify5 } from "util";
+var execFileAsync4 = promisify5(execFile4);
+function toPrSummary(parsed) {
+  if (typeof parsed.number !== "number") return null;
+  return {
+    number: parsed.number,
+    title: parsed.title ?? "",
+    author: parsed.author?.name || parsed.author?.login || "unknown",
+    createdAt: parsed.createdAt ?? "",
+    url: parsed.url ?? ""
+  };
+}
+var prFields = "number,title,author,createdAt,url";
+var getPrByNumber = createCachedGhJson(
+  ["pr", "view", "--json", prFields],
+  (stdout) => toPrSummary(JSON.parse(stdout)),
+  null
+);
+var getOpenPrForBranch = createCachedGhJson(
+  ["pr", "list", "--state", "open", "--json", prFields],
   (stdout) => {
     const parsed = JSON.parse(stdout);
-    if (typeof parsed.number !== "number") return null;
-    return {
-      number: parsed.number,
-      title: parsed.title ?? "",
-      author: parsed.author?.name || parsed.author?.login || "unknown",
-      createdAt: parsed.createdAt ?? "",
-      url: parsed.url ?? ""
-    };
+    if (!Array.isArray(parsed) || parsed.length === 0) return null;
+    return toPrSummary(parsed[0]);
   },
   null
 );
+async function getCurrentBranch(cwd) {
+  try {
+    const { stdout } = await execFileAsync4(
+      "git",
+      ["rev-parse", "--abbrev-ref", "HEAD"],
+      { encoding: "utf8", cwd: windowsCwdToWslPath(cwd) }
+    );
+    const branch2 = stdout.trim();
+    return branch2 && branch2 !== "HEAD" ? branch2 : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function getNumberParam(req) {
   const raw = new URL(req.url ?? "/", "http://localhost").searchParams.get(
     "number"
@@ -6819,8 +6845,13 @@ async function prStatus(req, res) {
   const cwd = getCwdParam(req, res);
   if (!cwd) return;
   const number = getNumberParam(req);
-  const extraArgs = number !== void 0 ? [String(number)] : void 0;
-  respondJson(res, 200, { pr: await getPr(cwd, extraArgs) });
+  if (number !== void 0) {
+    respondJson(res, 200, { pr: await getPrByNumber(cwd, [String(number)]) });
+    return;
+  }
+  const branch2 = await getCurrentBranch(cwd);
+  const pr = branch2 ? await getOpenPrForBranch(cwd, ["--head", branch2]) : null;
+  respondJson(res, 200, { pr });
 }
 
 // src/commands/sessions/daemon/stopDaemon.ts
@@ -14160,14 +14191,14 @@ function getRepoInfo() {
   );
   return { org: repoInfo.owner.login, repo: repoInfo.name };
 }
-function getCurrentBranch() {
+function getCurrentBranch2() {
   return execSync33("git rev-parse --abbrev-ref HEAD", {
     encoding: "utf8"
   }).trim();
 }
 function viewCurrentPr(fields) {
   const { org, repo } = getRepoInfo();
-  const branch2 = getCurrentBranch();
+  const branch2 = getCurrentBranch2();
   return JSON.parse(
     execSync33(`gh pr view ${branch2} --json ${fields} -R ${org}/${repo}`, {
       encoding: "utf8"
@@ -17336,37 +17367,36 @@ function fetchDiffViaGit(baseSha, headSha) {
 
 // src/commands/review/fetchPrDiffInfo.ts
 import { execSync as execSync48 } from "child_process";
-function getCurrentBranch2() {
+function getCurrentBranch3() {
   return execSync48("git rev-parse --abbrev-ref HEAD", {
     encoding: "utf8"
   }).trim();
 }
 function fetchPrDiffInfo() {
   const { org, repo } = getRepoInfo();
-  const branch2 = getCurrentBranch2();
+  const branch2 = getCurrentBranch3();
   const fields = "number,baseRefName,baseRefOid,headRefName,headRefOid";
-  let raw;
-  try {
-    raw = execSync48(`gh pr view ${branch2} --json ${fields} -R ${org}/${repo}`, {
+  const raw = execSync48(
+    `gh pr list --state open --head ${branch2} --json ${fields} -R ${org}/${repo}`,
+    {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "pipe"]
-    });
-  } catch (error) {
-    if (error instanceof Error && error.message.includes("no pull requests")) {
-      console.error(
-        `Error: No open pull request found for branch \`${branch2}\`. Open a PR for this branch before running \`assist review\`.`
-      );
-      process.exit(1);
     }
-    throw error;
-  }
+  );
   const parsed = JSON.parse(raw);
+  const pr = parsed[0];
+  if (!pr) {
+    console.error(
+      `Error: No open pull request found for branch \`${branch2}\`. Open a PR for this branch before running \`assist review\`.`
+    );
+    process.exit(1);
+  }
   return {
-    prNumber: parsed.number,
-    baseRef: parsed.baseRefName,
-    baseSha: parsed.baseRefOid,
-    headRef: parsed.headRefName,
-    headSha: parsed.headRefOid
+    prNumber: pr.number,
+    baseRef: pr.baseRefName,
+    baseSha: pr.baseRefOid,
+    headRef: pr.headRefName,
+    headSha: pr.headRefOid
   };
 }
 function fetchPrChangedFiles(prNumber) {

package/package.json

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