Merge branch 'main' into test-non-serializable-json-payload

Author: parneetbrar234-svg

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/scripts/issue-management/claim-handler.js

@@ -30,9 +30,10 @@ async function handleClaim({ github, context }) {
 
   const issueAuthor = context.payload.issue.user.login;
 
-  const isAuthorJhasourav07 = issueAuthor.toLowerCase() === 'jhasourav07';
+  const MAINTAINERS = ['jhasourav07', 'aamod007', 'souravjhahind'];
+  const isOpenedByMaintainer = MAINTAINERS.includes(issueAuthor.toLowerCase());
 
-  if (!isAuthorJhasourav07 && commenter.toLowerCase() !== issueAuthor.toLowerCase()) {
+  if (!isOpenedByMaintainer && commenter.toLowerCase() !== issueAuthor.toLowerCase()) {
     await github.rest.issues.createComment({
       owner,
       repo,
@@ -73,7 +74,7 @@ async function handleClaim({ github, context }) {
       owner,
       repo,
       issue_number: issueNumber,
-      body: `❌ You already have **${existingIssues.length}/${MAX_ASSIGNED_ISSUES}** active assigned issues (the maximum allowed).\nPlease complete or unassign one of your current issues before claiming another.\n\n${issueList}`,
+      body: `❌ You already have **${existingIssues.length}/${MAX_ASSIGNED_ISSUES}** active assigned issues (the maximum allowed).\nPlease complete or \`/unclaim\` one of your current issues before claiming another.\n\n${issueList}`,
     });
     return;
   }
@@ -89,7 +90,7 @@ async function handleClaim({ github, context }) {
     owner,
     repo,
     issue_number: issueNumber,
-    body: `✅ Successfully assigned issue to @${commenter}\n\n> 💡 Please read [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md) if you haven't already. Good luck! 🚀`,
+    body: `🎉 **Assigned!** Welcome to the project, @${commenter}.\n\n⏳ **Reminder:** You have **2 days** to submit a Pull Request. After 2 days of inactivity, you will be automatically unassigned to give others a chance (as per our GSSoC anti-hoarding policy).\n\n> 💡 Please read [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md) if you haven't already.\n\nHappy coding! 🚀`,
   });
 }
 

.github/scripts/issue-management/main.js

@@ -4,6 +4,7 @@ const { handleAssign } = require('./assign-handler');
 const { handleUnassign } = require('./unassign-handler');
 const { handleAddLabel } = require('./addlabel-handler');
 const { handleClaim } = require('./claim-handler');
+const { handleUnclaim } = require('./unclaim-handler');
 
 module.exports = async ({ github, context, core }) => {
   const commentBody = context.payload.comment?.body;
@@ -48,6 +49,9 @@ module.exports = async ({ github, context, core }) => {
       case 'claim':
         await handleClaim({ github, context });
         break;
+      case 'unclaim':
+        await handleUnclaim({ github, context });
+        break;
       case 'ping':
         await github.rest.issues.createComment({
           owner,

.github/scripts/issue-management/parse-command.js

@@ -15,6 +15,9 @@ function parseCommand(commentBody) {
     const claimMatch = line.match(/^\/claim\s*$/i);
     if (claimMatch) return { command: 'claim' };
 
+    const unclaimMatch = line.match(/^\/unclaim\s*$/i);
+    if (unclaimMatch) return { command: 'unclaim' };
+
     const pingMatch = line.match(/^\/ping\s*$/i);
     if (pingMatch) return { command: 'ping' };
 

.github/scripts/issue-management/stale-assignment.js

@@ -1,6 +1,6 @@
 async function handleStaleAssignments({ github, context, core }) {
   const { owner, repo } = context.repo;
-  const THREE_DAYS_MS = 3 * 24 * 60 * 60 * 1000;
+  const TWO_DAYS_MS = 2 * 24 * 60 * 60 * 1000;
   const now = new Date();
 
   console.log(`Starting stale assignment check for ${owner}/${repo}`);
@@ -27,7 +27,7 @@ async function handleStaleAssignments({ github, context, core }) {
       const updatedAt = new Date(issue.updated_at);
       const timeSinceUpdate = now.getTime() - updatedAt.getTime();
 
-      if (timeSinceUpdate > THREE_DAYS_MS) {
+      if (timeSinceUpdate > TWO_DAYS_MS) {
         console.log(
           `Issue #${issue.number} has been inactive since ${issue.updated_at}. Removing assignees.`
         );

.github/scripts/issue-management/unclaim-handler.js

@@ -0,0 +1,44 @@
+async function handleUnclaim({ github, context }) {
+  const { owner, repo } = context.repo;
+  const issueNumber = context.payload.issue.number;
+  const commenter = context.payload.comment.user.login;
+  const issueState = context.payload.issue.state;
+
+  if (issueState === 'closed') {
+    await github.rest.issues.createComment({
+      owner,
+      repo,
+      issue_number: issueNumber,
+      body: `❌ Commands cannot be used on closed issues.`,
+    });
+    return;
+  }
+
+  const currentAssignees = context.payload.issue.assignees.map((a) => a.login.toLowerCase());
+
+  if (!currentAssignees.includes(commenter.toLowerCase())) {
+    await github.rest.issues.createComment({
+      owner,
+      repo,
+      issue_number: issueNumber,
+      body: `ℹ️ @${commenter}, you are not currently assigned to this issue, so there's nothing to unclaim.`,
+    });
+    return;
+  }
+
+  await github.rest.issues.removeAssignees({
+    owner,
+    repo,
+    issue_number: issueNumber,
+    assignees: [commenter],
+  });
+
+  await github.rest.issues.createComment({
+    owner,
+    repo,
+    issue_number: issueNumber,
+    body: `✅ Successfully unclaimed this issue for @${commenter}.\n\n> 🔓 The issue is now open for others to claim.`,
+  });
+}
+
+module.exports = { handleUnclaim };

.github/workflows/assign-request-reminder.yml

@@ -42,7 +42,7 @@ jobs:
         contains(github.event.comment.body, 'can i be assigned') ||
         contains(github.event.comment.body, 'assign me to this') ||
         contains(github.event.comment.body, 'assign me this') ||
-        contains(github.event.comment.body, 'i will work on this') ||
+        contains(github.event.comment.body, 'work on this') ||
         contains(github.event.comment.body, 'i''ll work on this') ||
         contains(github.event.comment.body, 'ill work on this') ||
         contains(github.event.comment.body, 'i can work on this') ||

.github/workflows/conflict-notifier.yml

@@ -2,7 +2,12 @@ name: Merge Conflict Notifier
 
 on:
   schedule:
-    - cron: '0 * * * *'
+    - cron: '*/30 * * * *' # Hourly/half-hourly fallback
+  push:
+    branches:
+      - main
+  pull_request_target:
+    types: [synchronize, reopened, edited]
   workflow_dispatch:
 
 permissions:
@@ -76,20 +81,33 @@ jobs:
                   });
                 }
 
-                // Check if we've already posted a conflict comment to avoid spam
+                // Check existing comments to enforce a 2-hour notification gap
                 const { data: comments } = await github.rest.issues.listComments({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
                   issue_number: pr.number,
                   per_page: 100,
                 });
 
-                const alreadyCommented = comments.some(c =>
+                const conflictComments = comments.filter(c =>
                   c.user?.login === 'github-actions[bot]' &&
                   c.body?.includes('merge conflicts with the main branch')
                 );
 
-                if (!alreadyCommented) {
+                let shouldComment = false;
+                if (conflictComments.length === 0) {
+                  shouldComment = true;
+                } else {
+                  const lastComment = conflictComments[conflictComments.length - 1];
+                  const lastCommentTime = new Date(lastComment.created_at).getTime();
+                  const nowTime = new Date().getTime();
+                  const TWO_HOURS_MS = 2 * 60 * 60 * 1000;
+                  if (nowTime - lastCommentTime >= TWO_HOURS_MS) {
+                    shouldComment = true;
+                  }
+                }
+
+                if (shouldComment) {
                   await github.rest.issues.createComment({
                     owner: context.repo.owner,
                     repo: context.repo.repo,

.github/workflows/issue-management.yml

@@ -22,7 +22,8 @@ jobs:
         contains(github.event.comment.body, '/assign') ||
         contains(github.event.comment.body, '/unassign') ||
         contains(github.event.comment.body, '/addlabel') ||
-        contains(github.event.comment.body, '/claim')
+        contains(github.event.comment.body, '/claim') ||
+        contains(github.event.comment.body, '/unclaim')
       )
     steps:
       - name: Checkout Repository