clairo 1.0.2 → 1.0.4

package/dist/cli.js

@@ -125,6 +125,33 @@ function getCurrentBranch() {
     return { success: false, error: "Failed to get current branch" };
   }
 }
+function findRemoteWithBranch(branch) {
+  try {
+    const remoteBranches = execSync("git branch -r", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const remotes = listRemotes();
+    if (!remotes.success) {
+      return { success: false, error: "Failed to list remotes" };
+    }
+    for (const remote of remotes.data) {
+      if (remoteBranches.includes(`${remote.name}/${branch}`)) {
+        const sshMatch = remote.url.match(/git@github\.com:(.+?)\/(.+?)(?:\.git)?$/);
+        if (sshMatch) {
+          return { success: true, data: { remote: remote.name, owner: sshMatch[1] } };
+        }
+        const httpsMatch = remote.url.match(/https:\/\/github\.com\/(.+?)\/(.+?)(?:\.git)?$/);
+        if (httpsMatch) {
+          return { success: true, data: { remote: remote.name, owner: httpsMatch[1] } };
+        }
+      }
+    }
+    return { success: false, error: "Branch not found on any remote" };
+  } catch {
+    return { success: false, error: "Failed to find remote with branch" };
+  }
+}
 
 // src/lib/github/index.ts
 import { exec } from "child_process";
@@ -730,6 +757,15 @@ function getCheckIcon(check) {
   if (check.status === "COMPLETED") return "\u2713";
   return "?";
 }
+function getCheckSortOrder(check) {
+  const conclusion = check.conclusion ?? check.state;
+  if (conclusion === "FAILURE" || conclusion === "ERROR") return 0;
+  if (conclusion === "PENDING" || check.status === "IN_PROGRESS" || check.status === "QUEUED" || check.status === "WAITING")
+    return 1;
+  if (conclusion === "SKIPPED" || conclusion === "NEUTRAL") return 2;
+  if (conclusion === "SUCCESS" || check.status === "COMPLETED") return 3;
+  return 4;
+}
 function PRDetailsBox({ pr, loading, error, isFocused }) {
   var _a, _b, _c, _d, _e, _f, _g;
   const scrollRef = useRef(null);
@@ -824,12 +860,25 @@ function PRDetailsBox({ pr, loading, error, isFocused }) {
             ] }),
             (((_f = pr.statusCheckRollup) == null ? void 0 : _f.length) ?? 0) > 0 && /* @__PURE__ */ jsxs2(Box2, { marginTop: 1, flexDirection: "column", children: [
               /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "Checks:" }),
-              (_g = pr.statusCheckRollup) == null ? void 0 : _g.map((check, idx) => /* @__PURE__ */ jsxs2(Text2, { color: getCheckColor(check), children: [
-                "  ",
-                getCheckIcon(check),
-                " ",
-                check.name ?? check.context
-              ] }, idx))
+              Array.from(
+                ((_g = pr.statusCheckRollup) == null ? void 0 : _g.reduce((acc, check) => {
+                  const key = check.name ?? check.context ?? "";
+                  const existing = acc.get(key);
+                  if (!existing || (check.startedAt ?? "") > (existing.startedAt ?? "")) {
+                    acc.set(key, check);
+                  }
+                  return acc;
+                }, /* @__PURE__ */ new Map()).values()) ?? []
+              ).sort((a, b) => getCheckSortOrder(a) - getCheckSortOrder(b)).map((check, idx) => {
+                const jobName = check.name ?? check.context;
+                const displayName = check.workflowName ? `${check.workflowName} / ${jobName}` : jobName;
+                return /* @__PURE__ */ jsxs2(Text2, { color: getCheckColor(check), children: [
+                  "  ",
+                  getCheckIcon(check),
+                  " ",
+                  displayName
+                ] }, idx);
+              })
             ] }),
             pr.body && /* @__PURE__ */ jsxs2(Box2, { marginTop: 1, flexDirection: "column", children: [
               /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "Description:" }),
@@ -896,7 +945,7 @@ function PullRequestsBox({
       if (key.downArrow || input === "j") {
         setHighlightedIndex((prev) => Math.min(totalItems - 1, prev + 1));
       }
-      if (key.return) {
+      if (input === " ") {
         if (highlightedIndex === prs.length) {
           onCreatePR();
         } else if (prs[highlightedIndex]) {
@@ -967,7 +1016,7 @@ function RemotesBox({ remotes, selectedRemote, onSelect, loading, error, isFocus
       if (key.downArrow || input === "j") {
         setHighlightedIndex((prev) => Math.min(remotes.length - 1, prev + 1));
       }
-      if (key.return) {
+      if (input === " ") {
         onSelect(remotes[highlightedIndex].name);
       }
     },
@@ -1027,8 +1076,9 @@ function GitHubView({ isFocused, onKeybindingsChange, onLogUpdated }) {
     }
     const bindings = [];
     if (focusedBox === "remotes") {
-      bindings.push({ key: "Enter", label: "Select Remote" });
+      bindings.push({ key: "Space", label: "Select Remote" });
     } else if (focusedBox === "prs") {
+      bindings.push({ key: "Space", label: "Select" });
       bindings.push({ key: "n", label: "New PR", color: "green" });
       bindings.push({ key: "r", label: "Refresh" });
       bindings.push({ key: "o", label: "Open", color: "green" });
@@ -1140,11 +1190,24 @@ function GitHubView({ isFocused, onKeybindingsChange, onLogUpdated }) {
   const prNumbersBeforeCreate = useRef2(/* @__PURE__ */ new Set());
   const pollingIntervalRef = useRef2(null);
   const handleCreatePR = useCallback(() => {
+    if (!currentBranch) {
+      setErrors((prev) => ({ ...prev, prs: "No branch detected" }));
+      return;
+    }
+    const remoteResult = findRemoteWithBranch(currentBranch);
+    if (!remoteResult.success) {
+      setErrors((prev) => ({ ...prev, prs: "Push your branch to a remote first" }));
+      return;
+    }
     prNumbersBeforeCreate.current = new Set(prs.map((pr) => pr.number));
-    exec3("gh pr create --web", () => {
+    const headFlag = `${remoteResult.data.owner}:${currentBranch}`;
+    exec3(`gh pr create --web --head "${headFlag}"`, (error) => {
       process.stdout.emit("resize");
+      if (error) {
+        setErrors((prev) => ({ ...prev, prs: `Failed to create PR: ${error.message}` }));
+      }
     });
-    if (!currentBranch || !currentRepoSlug) return;
+    if (!currentRepoSlug) return;
     let attempts = 0;
     const maxAttempts = 24;
     const pollInterval = 5e3;
@@ -1193,6 +1256,9 @@ function GitHubView({ isFocused, onKeybindingsChange, onLogUpdated }) {
         if (focusedBox === "prs") refreshPRs();
         if (focusedBox === "details") refreshDetails();
       }
+      if (input === "n" && focusedBox === "prs") {
+        handleCreatePR();
+      }
     },
     { isActive: isFocused }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clairo",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "license": "MIT",
   "repository": {
     "type": "git",