Merge pull request #36 from Meniole/fix/improvements

fix: improvements on follow-up

.github/workflows/compute.yml

@@ -16,7 +16,7 @@ on:
       ref:
         description: "Ref"
       signature:
-        description: "The kernel signature"
+        description: "Used for authenticating requests from the kernel."
 
 jobs:
   compute:
@@ -27,16 +27,12 @@ jobs:
       SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
       SUPABASE_KEY: ${{ secrets.SUPABASE_KEY }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      KERNEL_PUBLIC_KEY: ${{ secrets.KERNEL_PUBLIC_KEY }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20.10.0"
-
       - run: ${{ toJSON(inputs) }}
         shell: cat {0}
 

action.yml

@@ -13,6 +13,8 @@ inputs:
     description: "Auth Token to auth as the Kernel"
   ref:
     description: "GitHub branch reference for the run"
+  signature:
+    description: "The kernel signature"
 outputs:
   result:
     description: "Actions taken by the watcher."

jest.config.json

@@ -7,5 +7,18 @@
   "coverageReporters": ["json", "lcov", "text", "clover", "json-summary"],
   "reporters": ["default", "jest-junit", "jest-md-dashboard"],
   "coverageDirectory": "coverage",
-  "setupFiles": ["dotenv/config"]
+  "setupFiles": ["dotenv/config"],
+  "extensionsToTreatAsEsm": [".ts"],
+  "moduleFileExtensions": ["ts", "js", "json", "node"],
+  "transform": {
+    "^.+\\.ts?$": [
+      "ts-jest",
+      {
+        "useESM": true
+      }
+    ]
+  },
+  "moduleNameMapper": {
+    "^(\\.{1,2}/.*)\\.js$": "$1"
+  }
 }

manifest.json

@@ -21,21 +21,23 @@
               "type": "string"
             }
           }
-        },
-        "required": ["optOut"]
+        }
       },
       "disqualification": {
         "default": "7 days",
         "type": "string"
       },
+      "pullRequestRequired": {
+        "default": true,
+        "type": "boolean"
+      },
       "eventWhitelist": {
         "default": ["pull_request.review_requested", "pull_request.ready_for_review", "pull_request_review_comment.created", "issue_comment.created", "push"],
         "type": "array",
         "items": {
           "type": "string"
         }
       }
-    },
-    "required": ["warning", "watch", "disqualification", "eventWhitelist"]
+    }
   }
 }

package.json

@@ -18,7 +18,7 @@
     "knip": "knip --config .github/knip.ts",
     "knip-ci": "knip --no-exit-code --reporter json --config .github/knip.ts",
     "prepare": "husky install",
-    "test": "jest",
+    "test": "yarn node --experimental-vm-modules $(yarn bin jest)",
     "supabase:generate:local": "supabase gen types typescript --local > src/types/database.ts",
     "supabase:generate:remote": "cross-env-shell \"supabase gen types typescript --project-id $SUPABASE_PROJECT_ID --schema public > src/types/database.ts\""
   },
@@ -30,18 +30,16 @@
     "open-source"
   ],
   "dependencies": {
-    "@actions/core": "1.10.1",
-    "@actions/github": "6.0.0",
     "@octokit/graphql-schema": "^15.25.0",
-    "@octokit/rest": "20.1.1",
-    "@octokit/webhooks": "13.2.7",
-    "@sinclair/typebox": "0.32.31",
-    "@ubiquity-dao/ubiquibot-logger": "^1.3.1",
+    "@octokit/rest": "^21.0.2",
+    "@octokit/webhooks": "^13.3.0",
+    "@sinclair/typebox": "^0.32.35",
+    "@ubiquity-os/ubiquity-os-kernel": "^2.4.0",
+    "@ubiquity-os/ubiquity-os-logger": "^1.3.2",
     "dotenv": "16.4.5",
     "luxon": "3.4.4",
     "ms": "2.1.3",
-    "tsx": "4.11.2",
-    "typebox-validators": "0.3.5"
+    "tsx": "4.11.2"
   },
   "devDependencies": {
     "@commitlint/cli": "19.3.0",
@@ -54,7 +52,7 @@
     "@types/jest": "29.5.12",
     "@types/luxon": "3.4.2",
     "@types/ms": "0.7.34",
-    "@types/node": "20.13.0",
+    "@types/node": "^22.7.7",
     "cross-env": "7.0.3",
     "cspell": "8.8.3",
     "dotenv-cli": "7.4.2",
@@ -73,7 +71,7 @@
     "prettier": "3.3.0",
     "supabase": "1.176.9",
     "ts-jest": "29.1.4",
-    "typescript": "5.6.2"
+    "typescript": "5.5.4"
   },
   "lint-staged": {
     "*.ts": [

src/handlers/watch-user-activity.ts

@@ -1,27 +1,28 @@
 import { getWatchedRepos } from "../helpers/get-watched-repos";
 import { updateTaskReminder } from "../helpers/task-update";
-import { Context } from "../types/context";
 import { ListForOrg, ListIssueForRepo } from "../types/github-types";
+import { ContextPlugin } from "../types/plugin-input";
 
-export async function watchUserActivity(context: Context) {
+export async function watchUserActivity(context: ContextPlugin) {
   const { logger } = context;
 
   const repos = await getWatchedRepos(context);
 
   if (!repos?.length) {
-    logger.info("No watched repos have been found, no work to do.");
-    return false;
+    return { message: logger.info("No watched repos have been found, no work to do.").logMessage.raw };
   }
 
-  for (const repo of repos) {
-    logger.debug(`> Watching user activity for repo: ${repo.name} (${repo.html_url})`);
-    await updateReminders(context, repo);
-  }
+  await Promise.all(
+    repos.map(async (repo) => {
+      logger.debug(`> Watching user activity for repo: ${repo.name} (${repo.html_url})`);
+      await updateReminders(context, repo);
+    })
+  );
 
-  return true;
+  return { message: "OK" };
 }
 
-async function updateReminders(context: Context, repo: ListForOrg["data"][0]) {
+async function updateReminders(context: ContextPlugin, repo: ListForOrg["data"][0]) {
   const { logger, octokit, payload } = context;
   const owner = payload.repository.owner?.login;
   if (!owner) {
@@ -34,15 +35,25 @@ async function updateReminders(context: Context, repo: ListForOrg["data"][0]) {
     state: "open",
   })) as ListIssueForRepo[];
 
-  for (const issue of issues) {
-    // I think we can safely ignore the following
-    if (issue.draft || issue.pull_request || issue.locked || issue.state !== "open") {
-      continue;
-    }
-
-    if (issue.assignees?.length || issue.assignee) {
-      logger.debug(`Checking assigned issue: ${issue.html_url}`);
-      await updateTaskReminder(context, repo, issue);
-    }
-  }
+  await Promise.all(
+    issues.map(async (issue) => {
+      // I think we can safely ignore the following
+      if (issue.draft || issue.pull_request || issue.locked || issue.state !== "open") {
+        logger.debug(`Skipping issue ${issue.html_url} due to the issue not meeting the right criteria.`, {
+          draft: issue.draft,
+          pullRequest: !!issue.pull_request,
+          locked: issue.locked,
+          state: issue.state,
+        });
+        return;
+      }
+
+      if (issue.assignees?.length || issue.assignee) {
+        logger.debug(`Checking assigned issue: ${issue.html_url}`);
+        await updateTaskReminder(context, repo, issue);
+      } else {
+        logger.info(`Skipping issue ${issue.html_url} because no user is assigned.`);
+      }
+    })
+  );
 }

src/handlers/collect-linked-pulls.ts → src/helpers/collect-linked-pulls.ts

@@ -1,5 +1,5 @@
-import { Context } from "../types/context";
 import { PullRequest, User, validate } from "@octokit/graphql-schema";
+import { ContextPlugin } from "../types/plugin-input";
 
 type closedByPullRequestsReferences = {
   node: Pick<PullRequest, "url" | "title" | "number" | "state" | "body"> & Pick<User, "login" | "id">;
@@ -19,7 +19,7 @@ const query = /* GraphQL */ `
   query collectLinkedPullRequests($owner: String!, $repo: String!, $issue_number: Int!) {
     repository(owner: $owner, name: $repo) {
       issue(number: $issue_number) {
-        closedByPullRequestsReferences(first: 100, includeClosedPrs: true) {
+        closedByPullRequestsReferences(first: 100, includeClosedPrs: false) {
           edges {
             node {
               url
@@ -52,7 +52,7 @@ if (queryErrors.length > 1) {
 }
 
 export async function collectLinkedPullRequests(
-  context: Context,
+  context: ContextPlugin,
   issue: {
     owner: string;
     repo: string;

src/helpers/get-assignee-activity.ts

@@ -1,13 +1,13 @@
 import { DateTime } from "luxon";
-import { collectLinkedPullRequests } from "../handlers/collect-linked-pulls";
-import { Context } from "../types/context";
-import { parseIssueUrl } from "./github-url";
+import { collectLinkedPullRequests } from "./collect-linked-pulls";
 import { GitHubTimelineEvents, ListIssueForRepo } from "../types/github-types";
+import { ContextPlugin } from "../types/plugin-input";
+import { parseIssueUrl } from "./github-url";
 
 /**
  * Retrieves all the activity for users that are assigned to the issue. Also takes into account linked pull requests.
  */
-export async function getAssigneesActivityForIssue(context: Context, issue: ListIssueForRepo, assigneeIds: number[]) {
+export async function getAssigneesActivityForIssue(context: ContextPlugin, issue: ListIssueForRepo, assigneeIds: number[]) {
   const gitHubUrl = parseIssueUrl(issue.html_url);
   const issueEvents: GitHubTimelineEvents[] = await context.octokit.paginate(context.octokit.rest.issues.listEventsForTimeline, {
     owner: gitHubUrl.owner,
@@ -48,14 +48,15 @@ function filterEvents(issueEvents: GitHubTimelineEvents[], assigneeIds: number[]
       }
       actorId = userIdMap.get(actorLogin);
       createdAt = event.created_at;
-    } else if (event.event === "committed") {
+    } else if ((event.event === "committed" || event.event === "commented") && "author" in event) {
       const commitAuthor = "author" in event ? event.author : null;
       const commitCommitter = "committer" in event ? event.committer : null;
 
       if (commitAuthor || commitCommitter) {
         assigneeEvents.push({
           event: eventName,
-          created_at: createdAt,
+          created_at: event.author.date,
+          author: event.author.email,
         });
 
         continue;
@@ -66,6 +67,7 @@ function filterEvents(issueEvents: GitHubTimelineEvents[], assigneeIds: number[]
       assigneeEvents.push({
         event: eventName,
         created_at: createdAt,
+        author: actorLogin,
       });
     }
   }

src/helpers/get-watched-repos.ts

@@ -1,7 +1,8 @@
-import { Context } from "../types/context";
+import { Context } from "@ubiquity-os/ubiquity-os-kernel";
 import { ListForOrg } from "../types/github-types";
+import { ContextPlugin } from "../types/plugin-input";
 
-export async function getWatchedRepos(context: Context) {
+export async function getWatchedRepos(context: ContextPlugin) {
   const {
     config: {
       watch: { optOut },

src/helpers/remind-and-remove.ts

@@ -1,31 +1,37 @@
-import { Context } from "../types/context";
-import { parseIssueUrl } from "./github-url";
+import { FOLLOWUP_HEADER, UNASSIGN_HEADER } from "../types/context";
 import { ListIssueForRepo } from "../types/github-types";
+import { ContextPlugin } from "../types/plugin-input";
+import { collectLinkedPullRequests } from "./collect-linked-pulls";
+import { parseIssueUrl } from "./github-url";
 import { createStructuredMetadata } from "./structured-metadata";
 
-export async function unassignUserFromIssue(context: Context, issue: ListIssueForRepo) {
+export async function unassignUserFromIssue(context: ContextPlugin, issue: ListIssueForRepo) {
   const { logger, config } = context;
 
   if (config.disqualification <= 0) {
     logger.info("The unassign threshold is <= 0, won't unassign users.");
   } else {
-    logger.info(`Passed the deadline on ${issue.html_url} and no activity is detected, removing assignees.`);
     await removeAllAssignees(context, issue);
   }
 }
 
-export async function remindAssigneesForIssue(context: Context, issue: ListIssueForRepo) {
+export async function remindAssigneesForIssue(context: ContextPlugin, issue: ListIssueForRepo) {
   const { logger, config } = context;
+  const issueItem = parseIssueUrl(issue.html_url);
+
+  const hasLinkedPr = !!(await collectLinkedPullRequests(context, issueItem)).length;
   if (config.warning <= 0) {
     logger.info("The reminder threshold is <= 0, won't send any reminder.");
+  } else if (config.pullRequestRequired && !hasLinkedPr) {
+    await unassignUserFromIssue(context, issue);
   } else {
     logger.info(`Passed the reminder threshold on ${issue.html_url}, sending a reminder.`);
     await remindAssignees(context, issue);
   }
 }
 
-async function remindAssignees(context: Context, issue: ListIssueForRepo) {
-  const { octokit, logger } = context;
+async function remindAssignees(context: ContextPlugin, issue: ListIssueForRepo) {
+  const { octokit, logger, config } = context;
   const { repo, owner, issue_number } = parseIssueUrl(issue.html_url);
 
   if (!issue?.assignees?.length) {
@@ -41,18 +47,31 @@ async function remindAssignees(context: Context, issue: ListIssueForRepo) {
     taskAssignees: issue.assignees.map((o) => o?.id),
   });
 
-  const metadata = createStructuredMetadata("Followup", logMessage);
+  const metadata = createStructuredMetadata(FOLLOWUP_HEADER, logMessage);
 
-  await octokit.rest.issues.createComment({
-    owner,
-    repo,
-    issue_number,
-    body: [logMessage.logMessage.raw, metadata].join("\n"),
-  });
+  if (!config.pullRequestRequired) {
+    await octokit.rest.issues.createComment({
+      owner,
+      repo,
+      issue_number,
+      body: [logMessage.logMessage.raw, metadata].join("\n"),
+    });
+  } else {
+    const pullRequests = await collectLinkedPullRequests(context, { repo, owner, issue_number });
+    for (const pullRequest of pullRequests) {
+      const { owner: prOwner, repo: prRepo, issue_number: prNumber } = parseIssueUrl(pullRequest.url);
+      await octokit.rest.issues.createComment({
+        owner: prOwner,
+        repo: prRepo,
+        issue_number: prNumber,
+        body: [logMessage.logMessage.raw, metadata].join("\n"),
+      });
+    }
+  }
   return true;
 }
 
-async function removeAllAssignees(context: Context, issue: ListIssueForRepo) {
+async function removeAllAssignees(context: ContextPlugin, issue: ListIssueForRepo) {
   const { octokit, logger } = context;
   const { repo, owner, issue_number } = parseIssueUrl(issue.html_url);
 
@@ -61,6 +80,15 @@ async function removeAllAssignees(context: Context, issue: ListIssueForRepo) {
     return false;
   }
   const logins = issue.assignees.map((o) => o?.login).filter((o) => !!o) as string[];
+  const logMessage = logger.info(`Passed the deadline and no activity is detected, removing assignees: ${logins.map((o) => `@${o}`).join(", ")}.`);
+  const metadata = createStructuredMetadata(UNASSIGN_HEADER, logMessage);
+
+  await octokit.rest.issues.createComment({
+    owner,
+    repo,
+    issue_number,
+    body: [logMessage.logMessage.raw, metadata].join("\n"),
+  });
   await octokit.rest.issues.removeAssignees({
     owner,
     repo,