@sentry/junior-github 0.203.0 → 0.205.0

package/dist/index.js

@@ -400,15 +400,29 @@ function requesterLabel(args) {
   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;
 }
+function parseExistingLabels(blockContents) {
+  const trimmed = blockContents.trim().replace(/\.$/, "");
+  if (!trimmed) {
+    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);
+}
+function formatAttributionBlock(labels) {
+  return `${GITHUB_REQUEST_ATTRIBUTION_START}
+via ${labels.join(", ")}.
+${GITHUB_REQUEST_ATTRIBUTION_END}`;
+}
 function applyAttribution(body, label) {
-  const attribution = label ? `${GITHUB_REQUEST_ATTRIBUTION_START}
-Requested by ${label}.
-${GITHUB_REQUEST_ATTRIBUTION_END}` : void 0;
   const normalizedBody = body.trimEnd();
   const existing = new RegExp(
-    `${GITHUB_REQUEST_ATTRIBUTION_START}[\\s\\S]*?${GITHUB_REQUEST_ATTRIBUTION_END}`
+    `${GITHUB_REQUEST_ATTRIBUTION_START}([\\s\\S]*?)${GITHUB_REQUEST_ATTRIBUTION_END}`
   );
-  if (existing.test(normalizedBody)) {
+  const existingMatch = normalizedBody.match(existing);
+  const existingLabels = existingMatch ? parseExistingLabels(existingMatch[1]) : [];
+  const labels = label && !existingLabels.includes(label) ? [...existingLabels, label] : existingLabels;
+  const attribution = labels.length ? formatAttributionBlock(labels) : void 0;
+  if (existingMatch) {
     return attribution ? normalizedBody.replace(existing, attribution) : normalizedBody.replace(existing, "").trimEnd();
   }
   if (!attribution) {
@@ -2295,22 +2309,27 @@ function createGitHubResolvePullRequestReviewThreadTool(ctx, botEmail) {
           `GitHub review thread lookup failed with HTTP ${lookupResponse.status}: ${githubError2(lookupPayload)}`
         );
       }
-      const thread = z11.object({
+      const threadNodeSchema = z11.object({
+        id: z11.string(),
+        isResolved: z11.boolean(),
+        pullRequest: z11.object({
+          author: z11.object({ databaseId: z11.number().optional() }).passthrough().nullable(),
+          number: z11.number(),
+          repository: z11.object({ nameWithOwner: z11.string() }).passthrough()
+        }).passthrough()
+      }).passthrough();
+      const lookupResultSchema = z11.object({
         data: z11.object({
-          node: z11.object({
-            id: z11.string(),
-            isResolved: z11.boolean(),
-            pullRequest: z11.object({
-              author: z11.object({ databaseId: z11.number().optional() }).nullable(),
-              number: z11.number(),
-              repository: z11.object({ nameWithOwner: z11.string() })
-            })
-          }).nullable()
-        })
-      }).parse(lookupPayload).data.node;
-      if (!thread) {
+          node: z11.unknown().nullable().optional()
+        }).passthrough()
+      }).passthrough();
+      const lookupResult = lookupResultSchema.safeParse(lookupPayload);
+      const rawNode = lookupResult.success ? lookupResult.data.data.node : void 0;
+      const parsedNode = rawNode == null ? void 0 : threadNodeSchema.safeParse(rawNode);
+      if (!parsedNode?.success) {
         throw new PluginToolInputError12("GitHub review thread was not found.");
       }
+      const thread = parsedNode.data;
       const pullRequest = thread.pullRequest;
       const ownsPullRequest = pullRequest.repository.nameWithOwner.toLowerCase() === repo.ref.toLowerCase() && pullRequest.author?.databaseId === botUserId;
       if (!ownsPullRequest) {
@@ -2351,13 +2370,21 @@ function createGitHubResolvePullRequestReviewThreadTool(ctx, botEmail) {
           `GitHub review thread resolution failed with HTTP ${resolveResponse.status}: ${githubError2(resolvePayload)}`
         );
       }
-      const resolved = z11.object({
+      const resolveResultSchema = z11.object({
         data: z11.object({
           resolveReviewThread: z11.object({
-            thread: z11.object({ id: z11.string(), isResolved: z11.boolean() })
-          })
-        })
-      }).parse(resolvePayload).data.resolveReviewThread.thread;
+            thread: z11.object({ id: z11.string(), isResolved: z11.boolean() }).passthrough()
+          }).passthrough()
+        }).passthrough()
+      }).passthrough();
+      const resolveResult = resolveResultSchema.safeParse(resolvePayload);
+      if (!resolveResult.success) {
+        throw new Error(
+          "GitHub review thread resolution returned an unexpected response shape.",
+          { cause: resolveResult.error }
+        );
+      }
+      const resolved = resolveResult.data.data.resolveReviewThread.thread;
       if (resolved.id !== thread.id || !resolved.isResolved) {
         throw new Error("GitHub did not resolve the requested review thread.");
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.203.0",
+  "version": "0.205.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.203.0"
+    "@sentry/junior-plugin-api": "0.205.0"
   },
   "devDependencies": {
     "@oxlint/plugins": "1.79.0",