fix: Include PR in the 'fixings' output, not an accidental repeat of the issue

Author: smockle

.github/actions/fix/src/fixIssue.ts .github/actions/fix/src/assignIssue.ts.github/actions/fix/src/fixIssue.ts renamed to .github/actions/fix/src/assignIssue.ts

@@ -2,7 +2,7 @@ import type { Octokit } from '@octokit/core';
 import { Issue } from './Issue.js';
 
 // https://docs.github.com/en/enterprise-cloud@latest/copilot/how-tos/use-copilot-agents/coding-agent/assign-copilot-to-an-issue#assigning-an-existing-issue
-export async function fixIssue(octokit: Octokit, { owner, repository, issueNumber, nodeId }: Issue) {
+export async function assignIssue(octokit: Octokit, { owner, repository, issueNumber, nodeId }: Issue) {
   // Check whether issues can be assigned to Copilot
   const suggestedActorsResponse = await octokit.graphql<{
     repository: {
@@ -54,7 +54,7 @@ export async function fixIssue(octokit: Octokit, { owner, repository, issueNumbe
     return;
   }
   // Assign issue to Copilot
-  const response = await octokit.graphql<{
+  await octokit.graphql<{
     replaceActorsForAssignable: {
       assignable: {
         id: string;
@@ -84,9 +84,4 @@ export async function fixIssue(octokit: Octokit, { owner, repository, issueNumbe
     }`,
     { issueId, assigneeId: suggestedActorsResponse?.repository?.suggestedActors?.nodes[0]?.id }
   );
-  return {
-    nodeId: response.replaceActorsForAssignable.assignable.id,
-    url: response.replaceActorsForAssignable.assignable.url,
-    title: response.replaceActorsForAssignable.assignable.title,
-  }
 }

.github/actions/fix/src/getLinkedPR.ts

@@ -0,0 +1,45 @@
+import type { Octokit } from "@octokit/core";
+import { Issue } from "./Issue.js";
+
+export async function getLinkedPR(
+  octokit: Octokit,
+  { owner, repository, issueNumber, nodeId }: Issue
+) {
+  // Check whether issues can be assigned to Copilot
+  const response = await octokit.graphql<{
+    repository?: {
+      issue?: {
+        timelineItems?: {
+          nodes: (
+            | { source: { id: string; url: string; title: string } }
+            | { subject: { id: string; url: string; title: string } }
+          )[];
+        };
+      };
+    };
+  }>(
+    `query($owner: String!, $repo: String!, $issueNumber: Int!) {
+      repository(owner: $owner, name: $repo) {
+        issue(number: $issueNumber) {
+          timelineItems(first: 100, itemTypes: [CONNECTED_EVENT, CROSS_REFERENCED_EVENT]) {
+            nodes {
+              ... on CrossReferencedEvent { source { ... on PullRequest { id url title } } }
+              ... on ConnectedEvent { subject { ... on PullRequest { id url title } } }
+            }
+          }
+        }
+      }
+    }`,
+    { owner, repository, issueNumber }
+  );
+  const timelineNodes = response?.repository?.issue?.timelineItems?.nodes || [];
+  const pullRequest: { id: string; url: string; title: string } | undefined =
+    timelineNodes
+      .map((node) => {
+        if ("source" in node && node.source?.url) return node.source;
+        if ("subject" in node && node.subject?.url) return node.subject;
+        return undefined;
+      })
+      .find((pr) => !!pr);
+  return pullRequest;
+}

.github/actions/fix/src/index.ts

@@ -3,7 +3,9 @@ import process from "node:process";
 import core from "@actions/core";
 import { Octokit } from "@octokit/core";
 import { throttling } from "@octokit/plugin-throttling";
-import { fixIssue } from "./fixIssue.js";
+import { assignIssue } from "./assignIssue.js";
+import { getLinkedPR } from "./getLinkedPR.js";
+import { sleep } from "./sleep.js";
 import { Issue } from "./Issue.js";
 const OctokitWithThrottling = Octokit.plugin(throttling);
 
@@ -45,9 +47,11 @@ export default async function () {
   for (const fixing of fixings) {
     try {
       const issue = new Issue(fixing.issue);
-      const response = await fixIssue(octokit, issue);
-      if (response) {
-        fixing.pullRequest = response;
+      await assignIssue(octokit, issue);
+      await sleep(1000); // Wait for Copilot to open a PR
+      const pullRequest = await getLinkedPR(octokit, issue);
+      if (pullRequest) {
+        fixing.pullRequest = pullRequest;
       }
       core.info(
         `Assigned ${issue.owner}/${issue.repository}#${issue.issueNumber} to Copilot!`

.github/actions/fix/src/sleep.ts

@@ -0,0 +1,8 @@
+/**
+ * Sleep for a given number of milliseconds.
+ * @param ms Time to sleep, in milliseconds.
+ * @returns
+ */
+export async function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(() => resolve(), ms));
+}