dw-sdlc 0.12.0 → 0.12.1

package/dist/commands/recap.js

@@ -119,12 +119,36 @@ function liveWorkers() {
 function workersText(workers) {
     return workers.map((worker) => `${worker.name} (${worker.status})`).join(", ");
 }
-/** The current branch's pull request and the Action the Ship script's decision gives it, or null. */
-function readShipped(root) {
+/**
+ * The remote branch name `branch` tracks, when it differs from `branch`. Read from the config, so it holds
+ * after the remote deleted the branch.
+ */
+function upstreamName(root, branch) {
+    const remote = asked(root, ["config", "--get", `branch.${branch}.remote`]);
+    const merge = asked(root, ["config", "--get", `branch.${branch}.merge`]);
+    if (remote === undefined || remote === "." || merge === undefined || !merge.startsWith("refs/heads/")) {
+        return undefined;
+    }
+    const name = merge.slice("refs/heads/".length);
+    return name === branch ? undefined : name;
+}
+/** Whether `pr`'s commits hold `head`, so the head is on GitHub whatever became of the upstream. */
+function holds(pr, head) {
+    return head !== null && pr.commits.includes(head);
+}
+/**
+ * The current branch's pull request and the Action the Ship script's decision gives it, or null. The one
+ * found by the upstream's name counts only when it holds the head: a branch started from another tracks
+ * that branch until its first push.
+ */
+function readShipped(root, branch, head) {
     // An invalid config layer resolves to ask and full, as in the Ship script.
     const policy = declaredPolicy(resolveConfig(root).config.pr);
-    const pr = readBranch(policy.review.depth === "auto");
-    return pr === null ? null : { pr, answer: decide(pr, now(), policy) };
+    const found = readBranch(policy.review.depth === "auto", head === null ? undefined : upstreamName(root, branch));
+    if (found === null || (found.byUpstream && !holds(found.pr, head))) {
+        return null;
+    }
+    return { pr: found.pr, answer: decide(found.pr, now(), policy) };
 }
 /**
  * The tracking refs, as `--remotes` names them, that the remote contradicts, which only a fetch would show:
@@ -302,8 +326,8 @@ function report(json) {
     const { branch, head } = read;
     // A detached HEAD names no branch for gh to look up, and a repository with no remote has no GitHub.
     const asksGh = branch !== null && remotesOf(root).length > 0;
-    const shipped = asksGh ? readShipped(root) : null;
-    const held = shipped !== null && head !== null && shipped.pr.commits.includes(head);
+    const shipped = asksGh ? readShipped(root, branch, head) : null;
+    const held = shipped !== null && holds(shipped.pr, head);
     const local = standing(root, read, shipped, held);
     // An open pull request can still take the head, and a commit-less repository has nothing to merge.
     const nothingToMerge = held || shipped?.pr.state === "OPEN" || head === null;

package/dist/pr/read.d.ts

@@ -23,8 +23,14 @@ export declare function gh(args: string[]): {
  * `sized`, as `pr.review: auto` needs, the read sizes the changes a Review would read.
  */
 export declare function read(named: Named, command: string, sized: boolean): PrState;
-/** The state of the current branch's pull request, open or not, or null when gh finds none. */
-export declare function readBranch(sized: boolean): PrState | null;
+/**
+ * The current branch's pull request, open or not, or null. gh tries `@{push}`, else the local name, which
+ * misses a branch pushed under another name; then `upstreamName` is asked, and `byUpstream` says so.
+ */
+export declare function readBranch(sized: boolean, upstreamName: string | undefined): {
+    pr: PrState;
+    byUpstream: boolean;
+} | null;
 /** The default branch of the repository gh resolves from the current directory. */
 export declare function defaultBranch(): string;
 /** The time the decision reads: DW_SDLC_NOW, an ISO 8601 time a test sets, else the system clock. */

package/dist/pr/read.js

@@ -93,18 +93,33 @@ export function read(named, command, sized) {
     requireAuth();
     return query(targetOf(named, command), sized);
 }
-/** The state of the current branch's pull request, open or not, or null when gh finds none. */
-export function readBranch(sized) {
-    requireAuth();
-    const view = gh(["pr", "view", "--json", "url"]);
+/** The pull request `gh pr view` resolves for the head branch `branch`, else the current one; null when none. */
+function viewed(branch) {
+    const view = gh(["pr", "view", ...(branch === undefined ? [] : [branch]), "--json", "url"]);
     if (view.status === 0) {
-        return query(parseOrCannotRun(() => parseView(view.stdout)), sized);
+        return parseOrCannotRun(() => parseView(view.stdout));
     }
     if (said(view.stderr).startsWith("no pull requests found")) {
         return null;
     }
     throw new CannotRun(`gh pr view failed: ${said(view.stderr)}`, REMEDIES.read);
 }
+/**
+ * The current branch's pull request, open or not, or null. gh tries `@{push}`, else the local name, which
+ * misses a branch pushed under another name; then `upstreamName` is asked, and `byUpstream` says so.
+ */
+export function readBranch(sized, upstreamName) {
+    requireAuth();
+    const own = viewed(undefined);
+    if (own !== null) {
+        return { pr: query(own, sized), byUpstream: false };
+    }
+    if (upstreamName === undefined) {
+        return null;
+    }
+    const found = viewed(upstreamName);
+    return found === null ? null : { pr: query(found, sized), byUpstream: true };
+}
 /** The default branch of the repository gh resolves from the current directory. */
 export function defaultBranch() {
     const view = gh(["repo", "view", "--json", "defaultBranchRef"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dw-sdlc",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "The Gate and the agentic config of a repository: the dw-sdlc bin with the Gate, the setup, the doctor, the config check, the Sync and setup of References, and the Ship script that drives a pull request to merged; the resolver of the config's layers, its JSON Schema and the validator that reads it.",
   "license": "MIT",
   "repository": {