@sentry/junior-github 0.236.0 → 0.238.0

package/dist/{chunk-UB3DDGLH.js → chunk-EYBKPQTJ.js}

@@ -16,6 +16,10 @@ var GITHUB_DEPLOYMENT_SUGGESTED_EVENTS = [
   "deployment.failed",
   "deployment.error"
 ];
+var GITHUB_DEPLOYMENT_SOURCE_IDENTIFIER = {
+  format: "deployment-source:owner/repo[:environment]:<full-commit-sha>",
+  pattern: /^deployment-source:[^\s/:#]+\/[^\s/:#]+(?::[^\s:]+)?:[0-9a-f]+$/
+};
 function gitHubDeploymentSourceResource(input) {
   const commitSha = input.commitSha.toLowerCase();
   const environment = input.environment?.trim();
@@ -48,6 +52,10 @@ var GITHUB_ISSUE_SUGGESTED_EVENTS = [
   "issue.closed",
   "issue.reopened"
 ];
+var GITHUB_ISSUE_IDENTIFIER = {
+  format: "owner/repo#number",
+  pattern: /^[^\s/:#]+\/[^\s/:#]+#\d+$/
+};
 function gitHubIssueResource(input) {
   return {
     label: `GitHub issue ${input.repo}#${input.number}`,
@@ -124,6 +132,10 @@ var GITHUB_PULL_REQUEST_MATCH_FIELDS = eventMatchFieldsSchema.parse({
     description: "true when the pull request is a draft"
   }
 });
+var GITHUB_PULL_REQUEST_IDENTIFIER = {
+  format: "owner/repo#number",
+  pattern: /^[^\s/:#]+\/[^\s/:#]+#\d+$/
+};
 function gitHubPullRequestResource(input) {
   return {
     label: `GitHub PR ${input.repo}#${input.number}`,
@@ -148,6 +160,10 @@ function gitHubPullRequestSubscribable(input) {
 // src/events/release.ts
 var GITHUB_RELEASE_EVENTS = ["release.published"];
 var GITHUB_RELEASE_SUGGESTED_EVENTS = ["release.published"];
+var GITHUB_RELEASE_SOURCE_IDENTIFIER = {
+  format: "release-source:owner/repo[:tag]",
+  pattern: /^release-source:[^\s/:#]+\/[^\s/:#]+(?::[^\s:]+)?$/
+};
 function gitHubReleaseSourceResource(input) {
   const repo = input.repo.toLowerCase();
   const tag = input.tag?.trim();
@@ -168,6 +184,10 @@ function gitHubReleaseSourceSubscribable(input) {
 }
 
 // src/events/repository.ts
+var GITHUB_REPOSITORY_IDENTIFIER = {
+  format: "owner/repo",
+  pattern: /^[^\s/:#]+\/[^\s/:#]+$/
+};
 function gitHubRepositoryResource(input) {
   return {
     label: `GitHub repository ${input.repo}`,
@@ -1626,18 +1646,30 @@ function normalizePullRequestReviewEvent(deliveryId, body, botEmail) {
     pullRequestAuthorData(parsed.data.pull_request.user),
     pullRequestHeadBranchData(parsed.data.pull_request.head?.ref)
   ]);
-  return pullRequestTargets2(
-    {
-      eventKey: gitHubEventKey2(deliveryId, eventType),
-      eventType,
-      occurredAtMs: Date.now(),
-      identifier: resource.identifier,
-      trustedSummary: eventType === "pull_request.review.approved" ? `${resource.label} was approved${reviewer ? ` by ${reviewer}` : ""}.` : eventType === "pull_request.review.changes_requested" ? `${resource.label} received requested changes${reviewer ? ` from ${reviewer}` : ""}.` : `${resource.label} received a review comment${reviewer ? ` from ${reviewer}` : ""}.`,
-      ...data ? { data } : void 0,
-      untrustedText: parsed.data.review.body ?? void 0
-    },
-    repo
-  );
+  const event = {
+    eventKey: gitHubEventKey2(deliveryId, eventType),
+    eventType,
+    occurredAtMs: Date.now(),
+    identifier: resource.identifier,
+    trustedSummary: eventType === "pull_request.review.approved" ? `${resource.label} was approved${reviewer ? ` by ${reviewer}` : ""}.` : eventType === "pull_request.review.changes_requested" ? `${resource.label} received requested changes${reviewer ? ` from ${reviewer}` : ""}.` : `${resource.label} received a review comment${reviewer ? ` from ${reviewer}` : ""}.`,
+    ...data ? { data } : void 0,
+    untrustedText: parsed.data.review.body ?? void 0
+  };
+  const events = pullRequestTargets2(event, repo);
+  if (eventType !== "pull_request.review.approved" || !parsed.data.review.body?.trim()) {
+    return events;
+  }
+  return [
+    ...events,
+    ...pullRequestTargets2(
+      {
+        ...event,
+        eventKey: gitHubEventKey2(deliveryId, "pull_request.review.commented"),
+        eventType: "pull_request.review.commented"
+      },
+      repo
+    )
+  ];
 }
 var pullRequestWebhookSchema = z2.object({
   action: z2.string(),
@@ -1870,18 +1902,23 @@ export {
   readGrantPermissions,
   GITHUB_ISSUE_EVENTS,
   GITHUB_ISSUE_SUGGESTED_EVENTS,
+  GITHUB_ISSUE_IDENTIFIER,
   gitHubIssueSubscribable,
   GITHUB_DEPLOYMENT_EVENTS,
   GITHUB_DEPLOYMENT_SUGGESTED_EVENTS,
+  GITHUB_DEPLOYMENT_SOURCE_IDENTIFIER,
   gitHubDeploymentSourceSubscribable,
   GITHUB_PULL_REQUEST_EVENTS,
   gitHubPullRequestEventGuidance,
   GITHUB_PULL_REQUEST_SUGGESTED_EVENTS,
   GITHUB_PULL_REQUEST_MATCH_FIELDS,
+  GITHUB_PULL_REQUEST_IDENTIFIER,
   gitHubPullRequestSubscribable,
   GITHUB_RELEASE_EVENTS,
   GITHUB_RELEASE_SUGGESTED_EVENTS,
+  GITHUB_RELEASE_SOURCE_IDENTIFIER,
   gitHubReleaseSourceSubscribable,
+  GITHUB_REPOSITORY_IDENTIFIER,
   gitHubRepositorySubscribable,
   botLoginFromEmail,
   isBotLogin,

package/dist/events/deployment.d.ts

@@ -1,6 +1,11 @@
 import type { SubscribableResource } from "@sentry/junior-plugin-api";
 export declare const GITHUB_DEPLOYMENT_EVENTS: readonly ["deployment.created", "deployment.queued", "deployment.pending", "deployment.in_progress", "deployment.succeeded", "deployment.failed", "deployment.error"];
 export declare const GITHUB_DEPLOYMENT_SUGGESTED_EVENTS: string[];
+/** The identifier shape that `gitHubDeploymentSourceResource` builds. */
+export declare const GITHUB_DEPLOYMENT_SOURCE_IDENTIFIER: {
+    format: string;
+    pattern: RegExp;
+};
 /** Build the stable deployment-source identity shared by tools and webhooks. */
 export declare function gitHubDeploymentSourceResource(input: {
     commitSha: string;

package/dist/events/issue.d.ts

@@ -1,6 +1,11 @@
 import type { SubscribableResource } from "@sentry/junior-plugin-api";
 export declare const GITHUB_ISSUE_EVENTS: string[];
 export declare const GITHUB_ISSUE_SUGGESTED_EVENTS: string[];
+/** The identifier shape that `gitHubIssueResource` builds. */
+export declare const GITHUB_ISSUE_IDENTIFIER: {
+    format: string;
+    pattern: RegExp;
+};
 /** Build the stable issue identity shared by tools and webhooks. */
 export declare function gitHubIssueResource(input: {
     number: number;

package/dist/events/pull-request.d.ts

@@ -22,6 +22,11 @@ export declare const GITHUB_PULL_REQUEST_MATCH_FIELDS: Record<string, {
     description: string;
     enum?: string[] | undefined;
 }>;
+/** The identifier shape that `gitHubPullRequestResource` builds. */
+export declare const GITHUB_PULL_REQUEST_IDENTIFIER: {
+    format: string;
+    pattern: RegExp;
+};
 /** Build the stable pull request identity shared by tools and webhooks. */
 export declare function gitHubPullRequestResource(input: {
     number: number;

package/dist/events/release.d.ts

@@ -1,6 +1,11 @@
 import type { SubscribableResource } from "@sentry/junior-plugin-api";
 export declare const GITHUB_RELEASE_EVENTS: readonly ["release.published"];
 export declare const GITHUB_RELEASE_SUGGESTED_EVENTS: string[];
+/** The identifier shape that `gitHubReleaseSourceResource` builds. */
+export declare const GITHUB_RELEASE_SOURCE_IDENTIFIER: {
+    format: string;
+    pattern: RegExp;
+};
 /** Build the stable release-source identity shared by tools and webhooks. */
 export declare function gitHubReleaseSourceResource(input: {
     repo: string;

package/dist/events/repository.d.ts

@@ -1,4 +1,9 @@
 import type { SubscribableResource } from "@sentry/junior-plugin-api";
+/** The identifier shape that `gitHubRepositoryResource` builds. */
+export declare const GITHUB_REPOSITORY_IDENTIFIER: {
+    format: string;
+    pattern: RegExp;
+};
 /** Build the stable repository identity shared by tools and webhooks. */
 export declare function gitHubRepositoryResource(input: {
     repo: string;

package/dist/index.js

@@ -5,16 +5,21 @@ import {
   GITHUB_AUTH_TOKEN_ENV,
   GITHUB_AUTH_TOKEN_PLACEHOLDER,
   GITHUB_DEPLOYMENT_EVENTS,
+  GITHUB_DEPLOYMENT_SOURCE_IDENTIFIER,
   GITHUB_DEPLOYMENT_SUGGESTED_EVENTS,
   GITHUB_GRAPHQL_RESPONSE_BODY_LIMIT_BYTES,
   GITHUB_INSTALLATION_ID_ENV,
   GITHUB_ISSUE_EVENTS,
+  GITHUB_ISSUE_IDENTIFIER,
   GITHUB_ISSUE_SUGGESTED_EVENTS,
   GITHUB_PULL_REQUEST_EVENTS,
+  GITHUB_PULL_REQUEST_IDENTIFIER,
   GITHUB_PULL_REQUEST_MATCH_FIELDS,
   GITHUB_PULL_REQUEST_SUGGESTED_EVENTS,
   GITHUB_RELEASE_EVENTS,
+  GITHUB_RELEASE_SOURCE_IDENTIFIER,
   GITHUB_RELEASE_SUGGESTED_EVENTS,
+  GITHUB_REPOSITORY_IDENTIFIER,
   GitHubPluginSetupError,
   HTTP_READ_METHODS,
   USER_TOKEN_GRANTS,
@@ -46,7 +51,7 @@ import {
   readGrantPermissions,
   requireEnv,
   resolveUserAccount
-} from "./chunk-UB3DDGLH.js";
+} from "./chunk-EYBKPQTJ.js";
 
 // src/plugin.ts
 import {
@@ -511,6 +516,11 @@ ${footer}` : footer;
 var GITHUB_REQUEST_ATTRIBUTION_START = "<!-- junior-request-attribution:start -->";
 var GITHUB_REQUEST_ATTRIBUTION_END = "<!-- junior-request-attribution:end -->";
 var SLACK_USER_ID_DISPLAY_PATTERN = /^[UW][A-Z0-9]{5,}$/;
+var GITHUB_LOGIN_PATTERN = /^[A-Za-z0-9][A-Za-z0-9_-]{0,99}$/;
+function linkedGitHubLogin(user) {
+  const login = user?.identities.find((identity) => identity.provider === "github")?.handle?.trim().replace(/^@/, "");
+  return login && GITHUB_LOGIN_PATTERN.test(login) ? login : void 0;
+}
 function cleanDisplayValue(value, userId) {
   const cleaned = value?.replace(/[\r\n<>]/g, " ").trim();
   if (!cleaned) {
@@ -535,6 +545,10 @@ function requesterLabel(args) {
   if (actor.platform === "system") {
     return `Junior system actor \`${actor.name}\``;
   }
+  const login = linkedGitHubLogin(user);
+  if (login) {
+    return `@${login}`;
+  }
   const userId = actor.userId;
   const display = cleanDisplayValue(user?.displayName, userId) ?? cleanDisplayValue(identity?.displayName, userId) ?? cleanDisplayValue(identity?.handle, userId) ?? cleanDisplayValue(actor.fullName, userId) ?? cleanDisplayValue(actor.userName, userId);
   return display ? `**${display.replaceAll("*", "\\*")}**` : void 0;
@@ -545,7 +559,7 @@ function parseExistingLabels(blockContents) {
     return [];
   }
   const withoutLeadIn = trimmed.replace(/^(?:Requested by|via)\s+/i, "");
-  return withoutLeadIn.split(/,\s*(?=\*\*|Junior system actor `|via\s)/i).map((entry) => entry.trim().replace(/^via\s+/i, "")).filter(Boolean);
+  return withoutLeadIn.split(/,\s*(?=\*\*|@|Junior system actor `|via\s)/i).map((entry) => entry.trim().replace(/^via\s+/i, "")).filter(Boolean);
 }
 function formatAttributionBlock(labels) {
   return `${GITHUB_REQUEST_ATTRIBUTION_START}
@@ -1360,7 +1374,7 @@ async function assignPullRequestRequester(ctx, input, result) {
   if (!ctx.actor || ctx.actor.platform === "system") return;
   try {
     const requester = await ctx.users.resolveActor();
-    const assignee = requester?.user?.identities.find((identity) => identity.provider === "github")?.handle?.trim();
+    const assignee = linkedGitHubLogin(requester?.user);
     if (!assignee) return;
     const repo = parseRepo4(input.repo);
     const response = await ctx.egress.fetch({
@@ -4695,16 +4709,19 @@ function githubPlugin(options = {}) {
       resourceTypes: [
         {
           type: "deployment_source",
+          identifier: GITHUB_DEPLOYMENT_SOURCE_IDENTIFIER,
           supportedEvents: [...GITHUB_DEPLOYMENT_EVENTS],
           suggestedEvents: [...GITHUB_DEPLOYMENT_SUGGESTED_EVENTS]
         },
         {
           type: "issue",
+          identifier: GITHUB_ISSUE_IDENTIFIER,
           supportedEvents: [...GITHUB_ISSUE_EVENTS],
           suggestedEvents: [...GITHUB_ISSUE_SUGGESTED_EVENTS]
         },
         {
           type: "pull_request",
+          identifier: GITHUB_PULL_REQUEST_IDENTIFIER,
           supportedEvents: [...GITHUB_PULL_REQUEST_EVENTS],
           suggestedEvents: [...GITHUB_PULL_REQUEST_SUGGESTED_EVENTS],
           matchFields: GITHUB_PULL_REQUEST_MATCH_FIELDS,
@@ -4714,11 +4731,13 @@ function githubPlugin(options = {}) {
         },
         {
           type: "release_source",
+          identifier: GITHUB_RELEASE_SOURCE_IDENTIFIER,
           supportedEvents: [...GITHUB_RELEASE_EVENTS],
           suggestedEvents: [...GITHUB_RELEASE_SUGGESTED_EVENTS]
         },
         {
           type: "repository",
+          identifier: GITHUB_REPOSITORY_IDENTIFIER,
           supportedEvents: [
             ...GITHUB_ISSUE_EVENTS,
             ...GITHUB_PULL_REQUEST_EVENTS

package/dist/testing.js

@@ -1,6 +1,6 @@
 import {
   normalizeGitHubEvents
-} from "./chunk-UB3DDGLH.js";
+} from "./chunk-EYBKPQTJ.js";
 export {
   normalizeGitHubEvents
 };

package/dist/tool-support/attribution.d.ts

@@ -1,6 +1,13 @@
 import type { Actor, Identity, PluginLogger, User } from "@sentry/junior-plugin-api";
 export declare const GITHUB_REQUEST_ATTRIBUTION_START = "<!-- junior-request-attribution:start -->";
 export declare const GITHUB_REQUEST_ATTRIBUTION_END = "<!-- junior-request-attribution:end -->";
+/**
+ * Return the GitHub login linked to a user, when it is a valid login.
+ *
+ * Attribution mentions and PR assignment use this login so the requester gets
+ * GitHub notifications for the issue or pull request.
+ */
+export declare function linkedGitHubLogin(user: User | undefined): string | undefined;
 /**
  * Append or replace runtime-owned requester attribution in a GitHub body.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.236.0",
+  "version": "0.238.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
     "@sinclair/typebox": "^0.34.49",
     "drizzle-orm": "^0.45.2",
     "zod": "^4.5.4",
-    "@sentry/junior-plugin-api": "0.236.0"
+    "@sentry/junior-plugin-api": "0.238.0"
   },
   "devDependencies": {
     "@oxlint/plugins": "1.79.0",