feat(web): pull request surfaces — filters & search qualifiers, all-server listing, update branch, smarter diffs, panel follow-ups

apps/server/src/pullRequest/AzureDevOpsPullRequestCli.ts

@@ -218,6 +218,9 @@ function actionArgs(
       return ["--draft", "true"];
     case "close":
       return ["--status", "abandoned"];
+    // Never reached: this host does not declare the action, so nothing offers it.
+    case "update-branch":
+      return [];
     case "reopen":
       return ["--status", "active"];
   }

apps/server/src/pullRequest/GitHubPullRequestCli.test.ts

@@ -5,6 +5,7 @@ import { ChildProcessSpawner } from "effect/unstable/process";
 
 import * as GitHubCli from "../sourceControl/GitHubCli.ts";
 import * as GitHubPullRequestCli from "./GitHubPullRequestCli.ts";
+import { BASE_COMPARISON_GRAPHQL_QUERY } from "./gitHubPullRequestJson.ts";
 
 const mockedExecute = vi.fn<GitHubCli.GitHubCli["Service"]["execute"]>();
 
@@ -551,6 +552,85 @@ layer("GitHubPullRequestCli.layer", (it) => {
     }),
   );
 
+  it.effect("carries the further narrowings into the search as qualifiers", () =>
+    Effect.gen(function* () {
+      mockedExecute.mockReturnValue(Effect.succeed(output("[]")));
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      yield* cli.listPullRequests({
+        cwd: "/w",
+        repository: "acme/web",
+        host: "github.com",
+        state: "open",
+        involvement: "all",
+        viewer: "bilal",
+        limit: 10,
+        filters: {
+          draft: "hide",
+          review: "changes-requested",
+          checks: "failing",
+          labels: ["needs design", 'quo"te'],
+          excludedLabels: ["wip"],
+          author: "octocat",
+        },
+      });
+
+      // Quotes around anything a reader typed, and the one character that could end a quoted
+      // value early dropped rather than escaped.
+      expect(searchOfCall(0)).toBe(
+        'label:"needs design" label:"quote" -label:"wip" author:"octocat" draft:false ' +
+          "review:changes_requested status:failure sort:updated-desc",
+      );
+    }),
+  );
+
+  it.effect("takes an empty filtered answer as an answer rather than falling back", () =>
+    Effect.gen(function* () {
+      mockedExecute.mockReturnValueOnce(Effect.succeed(output("[]")));
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      const batch = yield* cli.listPullRequests({
+        cwd: "/w",
+        repository: "acme/web",
+        host: "github.com",
+        state: "open",
+        involvement: "all",
+        viewer: "bilal",
+        limit: 10,
+        filters: { draft: "hide", checks: "passing", excludedLabels: ["wip"], author: "OctoCat" },
+      });
+
+      // The filters were qualifiers on that very search, so nothing matching them exists. The
+      // search-free fallback is for a repository the index does not cover, and it could not
+      // judge `checks` at all — no listed row says anything about them.
+      assert.strictEqual(mockedExecute.mock.calls.length, 1);
+      assert.deepStrictEqual(batch.items, []);
+    }),
+  );
+
+  it.effect("carries the further narrowings into a batched search", () =>
+    Effect.gen(function* () {
+      mockedExecute.mockReturnValue(Effect.succeed(searchPage([])));
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      yield* cli.searchPullRequests({
+        cwd: "/w",
+        host: "github.com",
+        repositories: ["acme/web"],
+        state: "open",
+        involvement: "all",
+        viewer: "bilal",
+        limit: 10,
+        filters: { draft: "only", review: "none", labels: ["bug"] },
+      });
+
+      assert.strictEqual(
+        searchQueryOfCall(0),
+        'is:pr is:open label:"bug" draft:true review:none sort:updated-desc repo:acme/web',
+      );
+    }),
+  );
+
   it.effect("quotes a search, so it cannot add a qualifier or a flag of its own", () =>
     Effect.gen(function* () {
       mockedExecute.mockReturnValue(Effect.succeed(output("[]")));
@@ -819,6 +899,40 @@ layer("GitHubPullRequestCli.layer", (it) => {
     }),
   );
 
+  it.effect("updates a stale branch with a merge commit unless asked to rebase", () =>
+    Effect.gen(function* () {
+      mockedExecute.mockReturnValue(Effect.succeed(output("")));
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      yield* cli.runPullRequestAction({
+        cwd: "/w",
+        repository: "acme/web",
+        host: "github.com",
+        number: 7,
+        action: "update-branch",
+      });
+      // GitHub's own default, and `gh`'s: a merge commit unless the rebase flag says otherwise.
+      expect(callAt(0).args).toEqual(["pr", "update-branch", "7", "--repo", "github.com/acme/web"]);
+
+      yield* cli.runPullRequestAction({
+        cwd: "/w",
+        repository: "acme/web",
+        host: "github.com",
+        number: 7,
+        action: "update-branch",
+        updateMethod: "rebase",
+      });
+      expect(callAt(1).args).toEqual([
+        "pr",
+        "update-branch",
+        "7",
+        "--repo",
+        "github.com/acme/web",
+        "--rebase",
+      ]);
+    }),
+  );
+
   it.effect("merges with the strategy it was asked for", () =>
     Effect.gen(function* () {
       mockedExecute.mockReturnValue(Effect.succeed(output("")));
@@ -1472,7 +1586,7 @@ layer("GitHubPullRequestCli.layer", (it) => {
       expect(detail.body).toBe("Core body");
       expect(activity.author?.login).toBe("octocat");
       expect(callAt(0).args.at(-1)).toBe(
-        "number,title,url,author,headRefName,baseRefName,state,isDraft,mergeable,additions,deletions,createdAt,updatedAt,mergedAt,reviewRequests,labels,body,changedFiles,closedAt,statusCheckRollup",
+        "number,title,url,author,headRefName,baseRefName,state,isDraft,mergeable,reviewDecision,additions,deletions,createdAt,updatedAt,mergedAt,reviewRequests,labels,body,changedFiles,closedAt,statusCheckRollup,headRepositoryOwner",
       );
       expect(callAt(1).args.at(-1)).toBe("author,comments,reviews,commits");
     }),
@@ -1634,6 +1748,58 @@ layer("GitHubPullRequestCli.layer", (it) => {
       }),
   );
 
+  it.effect("sends the base comparison's variables as gh flags, not as bare words", () =>
+    Effect.gen(function* () {
+      mockedExecute.mockReturnValue(
+        Effect.succeed(
+          output(
+            // @effect-diagnostics-next-line preferSchemaOverJson:off
+            JSON.stringify({
+              data: {
+                repository: {
+                  pullRequest: {
+                    viewerCanUpdateBranch: true,
+                    baseRef: { compare: { behindBy: 4 } },
+                  },
+                },
+              },
+            }),
+          ),
+        ),
+      );
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      const comparison = yield* cli.getPullRequestBaseComparison({
+        cwd: "/w",
+        repository: "acme/web",
+        host: "github.com",
+        number: 7,
+        headRef: "fork:feat/page",
+      });
+
+      // The tuples are flattened straight into argv, so a variable without its flag is a
+      // positional argument gh refuses outright.
+      const args = callAt(0).args;
+      expect(args).toEqual([
+        "api",
+        "graphql",
+        "--hostname",
+        "github.com",
+        "-f",
+        "owner=acme",
+        "-f",
+        "name=web",
+        "-F",
+        "number=7",
+        "-f",
+        "headRef=fork:feat/page",
+        "-f",
+        `query=${BASE_COMPARISON_GRAPHQL_QUERY}`,
+      ]);
+      expect(comparison).toEqual({ behindBy: 4, viewerCanUpdate: true });
+    }),
+  );
+
   it.effect("reads the viewer's role off the same call as the merge settings", () =>
     Effect.gen(function* () {
       mockedExecute.mockReturnValue(