fix: resolve new merge conflicts in lib/github.ts and package-lock.json

Author: Ixotic27

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

@@ -74,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;
   }

.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/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/conflict-notifier.yml

@@ -7,7 +7,7 @@ on:
     branches:
       - main
   pull_request_target:
-    types: [opened, synchronize, reopened, edited]
+    types: [synchronize, reopened, edited]
   workflow_dispatch:
 
 permissions:

.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

CONTRIBUTING.md

@@ -338,6 +338,7 @@ Our automation runs entirely through issue comments. Here is how you interact wi
 | Command                       | Who Can Use It?                                         | What It Does                                              |
 | ----------------------------- | ------------------------------------------------------- | --------------------------------------------------------- |
 | `/claim`                      | **Issue Author (or Anyone if authored by jhasourav07)** | Self-assigns the issue to you.                            |
+| `/unclaim`                    | **Assigned Contributor**                                | Removes the assignment from yourself (opens it back up).  |
 | `/addlabel <label1> <label2>` | **Anyone**                                              | Adds labels to the issue (e.g. `/addlabel frontend bug`). |
 | `/unassign @username`         | **Maintainers Only**                                    | Removes the assignee from an issue.                       |
 | `/assign @username`           | **Maintainers Only**                                    | Manually assigns someone to an issue.                     |
@@ -363,7 +364,7 @@ To keep the project moving, assignments are not permanent.
 If the bot rejects your command, check these common scenarios:
 
 - **"Commands cannot be used on closed issues"**: You cannot claim, assign, or unassign on closed issues. Find an open one!
-- **"You already have X/3 active assigned issues"**: You have reached the maximum of 3 concurrent assignments. Finish one of your current tasks before claiming a new issue. If you're stuck, ask a maintainer to `/unassign` you from one.
+- **"You already have X/3 active assigned issues"**: You have reached the maximum of 3 concurrent assignments. Finish one of your current tasks before claiming a new issue. If you're stuck, use the `/unclaim` command to unassign yourself from an issue, or ask a maintainer to `/unassign` you.
 - **"This issue is already assigned to @username"**: Be faster next time! Look for issues without assignees.
 - **"Only the author of this issue can claim it"**: You tried to `/claim` an issue you did not create. You can only claim issues that you authored (unless the issue was authored by `jhasourav07`, which anyone can claim).
 - **"The following label(s) do not exist"**: You can only add existing repo labels. The bot will reply with a list of valid labels you can use.

app/(root)/dashboard/[username]/page.test.tsx

@@ -91,6 +91,7 @@ describe('DashboardPage', () => {
     insights: [],
     achievements: [],
     commitClock: [],
+    graphData: { nodes: [], links: [] },
   };
 
   beforeEach(() => {

app/(root)/dashboard/error.tsx

@@ -33,7 +33,7 @@ export default function DashboardError({
               : 'Something went wrong'}
         </h1>
 
-        <p className="text-gray-600 dark:text-gray-400 mb-8 leading-relaxed">
+        <p className="text-gray-600 dark:text-white/70 mb-8 leading-relaxed">
           {isNotFound
             ? "We couldn't find a GitHub user with that username. Please check the spelling and try again."
             : isRateLimit

app/api/github/route.test.ts

@@ -18,67 +18,82 @@ function makeRequest(params: Record<string, string> = {}): Request {
 describe('GET /api/github', () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    vi.mocked(getFullDashboardData).mockResolvedValue({} as never);
   });
 
-  // Test 1 — missing username → 400
-  it('returns 400 when username is missing', async () => {
-    const response = await GET(makeRequest());
-    const body = await response.json();
+  describe('cache bypass via ?refresh=true', () => {
+    it('calls getFullDashboardData with { bypassCache: true } when ?refresh=true', async () => {
+      await GET(makeRequest({ username: 'octocat', refresh: 'true' }));
 
-    expect(response.status).toBe(400);
-    expect(body.error).toContain('Invalid parameters');
-  });
+      expect(getFullDashboardData).toHaveBeenCalledWith('octocat', { bypassCache: true });
+    });
 
-  it('returns 400 and skips GitHub when username format is invalid', async () => {
-    const response = await GET(makeRequest({ username: 'bad user' }));
-    const body = await response.json();
+    it('calls getFullDashboardData with { bypassCache: false } when refresh is omitted', async () => {
+      await GET(makeRequest({ username: 'octocat' }));
 
-    expect(response.status).toBe(400);
-    expect(body.error).toContain('Invalid parameters');
-    expect(getFullDashboardData).not.toHaveBeenCalled();
-  });
+      expect(getFullDashboardData).toHaveBeenCalledWith('octocat', { bypassCache: false });
+    });
 
-  // Test 2 — valid username → 200
-  it('returns 200 with JSON body for a valid username', async () => {
-    vi.mocked(getFullDashboardData).mockResolvedValue({ profile: 'octocat' } as never);
+    // Test 1 — missing username → 400
+    it('returns 400 when username is missing', async () => {
+      const response = await GET(makeRequest());
+      const body = await response.json();
 
-    const response = await GET(makeRequest({ username: 'octocat' }));
-    const body = await response.json();
+      expect(response.status).toBe(400);
+      expect(body.error).toContain('Invalid parameters');
+    });
 
-    expect(response.status).toBe(200);
-    expect(body).toEqual({ profile: 'octocat' });
-  });
+    it('returns 400 and skips GitHub when username format is invalid', async () => {
+      const response = await GET(makeRequest({ username: 'bad user' }));
+      const body = await response.json();
 
-  // Test 3 — throws 'User not found' → 404
-  it('returns 404 when getFullDashboardData throws User not found', async () => {
-    vi.mocked(getFullDashboardData).mockRejectedValue(new Error('User not found'));
+      expect(response.status).toBe(400);
+      expect(body.error).toContain('Invalid parameters');
+      expect(getFullDashboardData).not.toHaveBeenCalled();
+    });
 
-    const response = await GET(makeRequest({ username: 'octocat' }));
-    const body = await response.json();
+    // Test 2 — valid username → 200
+    it('returns 200 with JSON body for a valid username', async () => {
+      vi.mocked(getFullDashboardData).mockResolvedValue({ profile: 'octocat' } as never);
 
-    expect(response.status).toBe(404);
-    expect(body.error).toContain('User not found');
-  });
+      const response = await GET(makeRequest({ username: 'octocat' }));
+      const body = await response.json();
 
-  // Test 4 — throws 'API limit reached' → 403
-  it('returns 403 when getFullDashboardData throws API limit reached', async () => {
-    vi.mocked(getFullDashboardData).mockRejectedValue(new Error('API limit reached'));
+      expect(response.status).toBe(200);
+      expect(body).toEqual({ profile: 'octocat' });
+    });
 
-    const response = await GET(makeRequest({ username: 'octocat' }));
-    const body = await response.json();
+    // Test 3 — throws 'User not found' → 404
+    it('returns 404 when getFullDashboardData throws User not found', async () => {
+      vi.mocked(getFullDashboardData).mockRejectedValue(new Error('User not found'));
 
-    expect(response.status).toBe(403);
-    expect(body.error).toContain('rate limit');
-  });
+      const response = await GET(makeRequest({ username: 'octocat' }));
+      const body = await response.json();
+
+      expect(response.status).toBe(404);
+      expect(body.error).toContain('User not found');
+    });
+
+    // Test 4 — throws 'API limit reached' → 403
+    it('returns 403 when getFullDashboardData throws API limit reached', async () => {
+      vi.mocked(getFullDashboardData).mockRejectedValue(new Error('API limit reached'));
+
+      const response = await GET(makeRequest({ username: 'octocat' }));
+      const body = await response.json();
+
+      expect(response.status).toBe(403);
+      expect(body.error).toContain('rate limit');
+    });
 
-  // Test 5 — throws generic error → 500
-  it('returns 500 for a generic unexpected error', async () => {
-    vi.mocked(getFullDashboardData).mockRejectedValue(new Error('Something went wrong'));
+    // Test 5 — throws generic error → 500
+    it('returns 500 for a generic unexpected error', async () => {
+      vi.mocked(getFullDashboardData).mockRejectedValue(new Error('Something went wrong'));
 
-    const response = await GET(makeRequest({ username: 'octocat' }));
-    const body = await response.json();
+      const response = await GET(makeRequest({ username: 'octocat' }));
+      const body = await response.json();
 
-    expect(response.status).toBe(500);
-    expect(body.error).toContain('Something went wrong');
+      expect(response.status).toBe(500);
+      expect(body.error).toContain('Something went wrong');
+    });
   });
 });