@sentry/junior-github 0.173.0 → 0.175.0

package/dist/{chunk-IG5VPAKL.js → chunk-7CREKH4I.js}

@@ -98,10 +98,14 @@ function gitHubPullRequestResource(input) {
 }
 function gitHubPullRequestSubscribable(input) {
   if (!process.env.GITHUB_WEBHOOK_SECRET?.trim()) return void 0;
+  const omitted = new Set(input.omitSuggestedEvents ?? []);
+  const suggestedEvents = GITHUB_PULL_REQUEST_SUGGESTED_EVENTS.filter(
+    (eventType) => !omitted.has(eventType)
+  );
   return {
     ...gitHubPullRequestResource(input),
-    suggestedEvents: GITHUB_PULL_REQUEST_SUGGESTED_EVENTS,
-    supportedEvents: GITHUB_PULL_REQUEST_EVENTS,
+    ...suggestedEvents.length > 0 ? { suggestedEvents: [...suggestedEvents] } : {},
+    supportedEvents: [...GITHUB_PULL_REQUEST_EVENTS],
     type: "pull_request"
   };
 }

package/dist/index.js

@@ -15,7 +15,7 @@ import {
   normalizeGitHubResourceEvents,
   parseCheckSuiteEnrichmentTarget,
   selectFailingChecks
-} from "./chunk-IG5VPAKL.js";
+} from "./chunk-7CREKH4I.js";
 
 // src/plugin.ts
 import {
@@ -1623,12 +1623,13 @@ import {
   definePluginTool as definePluginTool4,
   EgressAuthRequired as EgressAuthRequired2,
   PluginToolInputError as PluginToolInputError5,
-  pluginToolOutputSchema as pluginToolOutputSchema4
+  pluginToolOutputSchema as pluginToolOutputSchema4,
+  resourceEventSubscriptionResultSchema,
+  subscribableResourceSchema as subscribableResourceSchema3
 } from "@sentry/junior-plugin-api";
 import { Type as Type2 } from "@sinclair/typebox";
 import { Value as Value2 } from "@sinclair/typebox/value";
 import { z as z4 } from "zod";
-import { subscribableResourceSchema as subscribableResourceSchema3 } from "@sentry/junior-plugin-api";
 var GITHUB_PULL_REQUEST_CREATE_IDEMPOTENCY_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
 var GITHUB_PULL_REQUEST_CREATE_LOCK_TTL_MS = 6e4;
 var GitHubPullRequestCreateRejectedError = class extends Error {
@@ -1697,7 +1698,8 @@ var createPullRequestStateSchema = Type2.Union([
 var gitHubPullRequestDataSchema = z4.object({
   number: z4.number(),
   url: z4.string(),
-  subscribable: subscribableResourceSchema3.optional()
+  subscribable: subscribableResourceSchema3.optional(),
+  subscription: resourceEventSubscriptionResultSchema.optional()
 });
 var gitHubPullRequestOutputSchema = pluginToolOutputSchema4.extend({
   target: z4.literal("createPullRequest"),
@@ -1850,11 +1852,12 @@ async function createGitHubPullRequest(ctx, request) {
     url: pullRequest.html_url
   };
 }
-function gitHubPullRequestToolResult(input, result, canSubscribe) {
+function gitHubPullRequestToolResult(input, result, canSubscribe, omitSuggestedEvents) {
   const repo = parseRepo4(input.repo);
   const subscribable = canSubscribe ? gitHubPullRequestSubscribable({
     number: result.number,
-    repo: `${repo.owner}/${repo.name}`
+    repo: `${repo.owner}/${repo.name}`,
+    ...omitSuggestedEvents ? { omitSuggestedEvents } : {}
   }) : void 0;
   return { ...result, ...subscribable ? { subscribable } : {} };
 }
@@ -1868,14 +1871,48 @@ async function annotatePullRequest(ctx, input, result) {
     status: input.draft ? "draft" : "open"
   });
 }
-function gitHubPullRequestStructuredResult(input, result, canSubscribe) {
-  const data = gitHubPullRequestToolResult(input, result, canSubscribe);
-  return {
-    target: "createPullRequest",
-    ...data
-  };
+async function gitHubPullRequestStructuredResult(ctx, input, result, subscriptionConfig) {
+  const base = gitHubPullRequestToolResult(
+    input,
+    result,
+    ctx.resourceEvents.canSubscribe
+  );
+  if (!subscriptionConfig || !base.subscribable) {
+    return {
+      target: "createPullRequest",
+      ...base
+    };
+  }
+  try {
+    const subscription = await ctx.resourceEvents.subscribe({
+      events: subscriptionConfig.events,
+      intent: subscriptionConfig.intent,
+      resource: base.subscribable
+    });
+    const data = gitHubPullRequestToolResult(
+      input,
+      result,
+      ctx.resourceEvents.canSubscribe,
+      subscriptionConfig.events
+    );
+    return {
+      target: "createPullRequest",
+      ...data,
+      subscription
+    };
+  } catch (error) {
+    ctx.log.warn("github.pull_request.subscribe_after_create.failed", {
+      error: error instanceof Error ? error.message : String(error),
+      number: result.number,
+      repo: input.repo
+    });
+    return {
+      target: "createPullRequest",
+      ...base
+    };
+  }
 }
-function createGitHubPullRequestTool(ctx) {
+function createGitHubPullRequestTool(ctx, subscriptionConfig) {
   return definePluginTool4({
     annotations: {
       destructiveHint: false,
@@ -1906,10 +1943,11 @@ function createGitHubPullRequestTool(ctx) {
               url: state.url
             };
             await annotatePullRequest(ctx, completedInput, completedResult);
-            return gitHubPullRequestStructuredResult(
+            return await gitHubPullRequestStructuredResult(
+              ctx,
               completedInput,
               completedResult,
-              ctx.resourceEvents.canSubscribe
+              subscriptionConfig
             );
           }
           if (state?.status === "pending") {
@@ -1949,10 +1987,11 @@ function createGitHubPullRequestTool(ctx) {
               );
             }
             await annotatePullRequest(ctx, parsedInput, result);
-            return gitHubPullRequestStructuredResult(
+            return await gitHubPullRequestStructuredResult(
+              ctx,
               parsedInput,
               result,
-              ctx.resourceEvents.canSubscribe
+              subscriptionConfig
             );
           } catch (error) {
             if (isEgressAuthRequired2(error) || isDefinitiveGitHubPullRequestCreateRejection(error)) {
@@ -2628,17 +2667,20 @@ import {
 import { z as z10 } from "zod";
 
 // src/webhooks/ownership.ts
-var GITHUB_NOREPLY_DOMAIN = "users.noreply.github.com";
+var GITHUB_BOT_NOREPLY_EMAIL = /^(?<userId>[1-9]\d*)\+(?<login>[^@]+\[bot\])@users\.noreply\.github\.com$/i;
+function parseGitHubBotIdentity(value) {
+  const match = GITHUB_BOT_NOREPLY_EMAIL.exec(value?.trim() ?? "");
+  if (!match?.groups) return void 0;
+  return {
+    login: match.groups.login,
+    userId: Number(match.groups.userId)
+  };
+}
 function botLoginFromEmail(value) {
-  const email = value?.trim();
-  if (!email) return void 0;
-  const separator = email.lastIndexOf("@");
-  if (separator <= 0) return void 0;
-  const domain = email.slice(separator + 1).toLowerCase();
-  if (domain !== GITHUB_NOREPLY_DOMAIN) return void 0;
-  const localPart = email.slice(0, separator);
-  const login = localPart.slice(localPart.indexOf("+") + 1).trim();
-  return login.toLowerCase().endsWith("[bot]") ? login : void 0;
+  return parseGitHubBotIdentity(value)?.login;
+}
+function botUserIdFromEmail(value) {
+  return parseGitHubBotIdentity(value)?.userId;
 }
 
 // src/tools/resolve-pull-request-review-thread.ts
@@ -2700,8 +2742,8 @@ function createGitHubResolvePullRequestReviewThreadTool(ctx, botEmail) {
         );
       }
       const repo = parseRepo10(parsedInput.data.repo);
-      const botLogin = botLoginFromEmail(botEmail)?.toLowerCase();
-      if (!botLogin) {
+      const botUserId = botUserIdFromEmail(botEmail);
+      if (botUserId === void 0) {
         throw new Error("GitHub App bot identity is not configured.");
       }
       const query = `query ReviewThreadOwnership($threadId: ID!) {
@@ -2712,7 +2754,7 @@ function createGitHubResolvePullRequestReviewThreadTool(ctx, botEmail) {
             pullRequest {
               number
               repository { nameWithOwner }
-              author { login }
+              author { ... on Bot { databaseId } }
             }
           }
         }
@@ -2742,7 +2784,7 @@ function createGitHubResolvePullRequestReviewThreadTool(ctx, botEmail) {
             id: z10.string(),
             isResolved: z10.boolean(),
             pullRequest: z10.object({
-              author: z10.object({ login: z10.string() }),
+              author: z10.object({ databaseId: z10.number().optional() }).nullable(),
               number: z10.number(),
               repository: z10.object({ nameWithOwner: z10.string() })
             })
@@ -2753,7 +2795,7 @@ function createGitHubResolvePullRequestReviewThreadTool(ctx, botEmail) {
         throw new PluginToolInputError11("GitHub review thread was not found.");
       }
       const pullRequest = thread.pullRequest;
-      const ownsPullRequest = pullRequest.repository.nameWithOwner.toLowerCase() === repo.ref.toLowerCase() && pullRequest.author.login.toLowerCase() === botLogin;
+      const ownsPullRequest = pullRequest.repository.nameWithOwner.toLowerCase() === repo.ref.toLowerCase() && pullRequest.author?.databaseId === botUserId;
       if (!ownsPullRequest) {
         throw new PluginToolInputError11(
           "Junior can only resolve review threads on pull requests it authored."
@@ -2814,11 +2856,14 @@ function createGitHubResolvePullRequestReviewThreadTool(ctx, botEmail) {
 }
 
 // src/tools.ts
-function createGitHubTools(ctx, botEmail) {
+function createGitHubTools(ctx, botEmail, pullRequestSubscription) {
   return {
     cloneRepository: createGitHubCloneRepositoryTool(ctx),
     createIssue: createGitHubIssueTool(ctx),
-    createPullRequest: createGitHubPullRequestTool(ctx),
+    createPullRequest: createGitHubPullRequestTool(
+      ctx,
+      pullRequestSubscription
+    ),
     getDeployment: createGitHubGetDeploymentTool(ctx),
     getPullRequest: createGitHubGetPullRequestTool(ctx),
     getRelease: createGitHubGetReleaseTool(ctx),
@@ -5629,7 +5674,8 @@ function githubPlugin(options = {}) {
         {
           type: "pull_request",
           supportedEvents: [...GITHUB_PULL_REQUEST_EVENTS],
-          suggestedEvents: [...GITHUB_PULL_REQUEST_SUGGESTED_EVENTS]
+          suggestedEvents: [...GITHUB_PULL_REQUEST_SUGGESTED_EVENTS],
+          ...options.pullRequestEvents?.guidance ? { guidance: options.pullRequestEvents.guidance } : {}
         },
         {
           type: "release_source",
@@ -5792,7 +5838,11 @@ function githubPlugin(options = {}) {
         });
       },
       tools(ctx) {
-        return createGitHubTools(ctx, readEnv(botEmailEnv));
+        return createGitHubTools(
+          ctx,
+          readEnv(botEmailEnv),
+          options.pullRequestEvents?.subscribeAfterCreate
+        );
       },
       workspacePrepare: prepareWorkspace,
       async sandboxPrepare(ctx) {

package/dist/plugin.d.ts

@@ -5,6 +5,7 @@
  */
 import { type PluginRegistration } from "@sentry/junior-plugin-api";
 import { type GitHubAppPermissions } from "./permissions.js";
+import { type GitHubPullRequestEventOptions } from "./resource-events/pull-request.js";
 /** Configure the built-in GitHub plugin manifest and hooks. */
 export interface GitHubPluginOptions {
     /**
@@ -39,6 +40,8 @@ export interface GitHubPluginOptions {
     installationIdEnv?: string;
     /** Environment variable containing the GitHub App private key. */
     privateKeyEnv?: string;
+    /** Install-local pull request resource event behavior. */
+    pullRequestEvents?: GitHubPullRequestEventOptions;
 }
 /** Register GitHub runtime hooks for repository workflows. */
 export declare function githubPlugin(options?: GitHubPluginOptions): PluginRegistration;

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

@@ -1,6 +1,19 @@
 import type { SubscribableResource } from "@sentry/junior-plugin-api";
-export declare const GITHUB_PULL_REQUEST_EVENTS: string[];
-export declare const GITHUB_PULL_REQUEST_SUGGESTED_EVENTS: string[];
+export declare const GITHUB_PULL_REQUEST_EVENTS: readonly ["pull_request.checks.failed", "pull_request.checks.recovered", "pull_request.comment.created", "pull_request.opened", "pull_request.ready_for_review", "pull_request.review.approved", "pull_request.review.changes_requested", "pull_request.review.commented", "pull_request.review_comment.created", "pull_request.merged", "pull_request.closed_unmerged"];
+export type GitHubPullRequestEvent = (typeof GITHUB_PULL_REQUEST_EVENTS)[number];
+/** Install-local pull request resource event behavior. */
+export interface GitHubPullRequestEventOptions {
+    /** Guidance added when one pull request event reaches the agent. */
+    guidance?: Partial<Record<GitHubPullRequestEvent, string>>;
+    /** Temporary subscription created after Junior creates a pull request. */
+    subscribeAfterCreate?: GitHubPullRequestSubscriptionConfig;
+}
+/** Temporary subscription created after Junior creates a pull request. */
+export interface GitHubPullRequestSubscriptionConfig {
+    events: GitHubPullRequestEvent[];
+    intent: string;
+}
+export declare const GITHUB_PULL_REQUEST_SUGGESTED_EVENTS: readonly ["pull_request.checks.failed", "pull_request.comment.created", "pull_request.ready_for_review", "pull_request.review.changes_requested", "pull_request.review.commented", "pull_request.review_comment.created", "pull_request.merged", "pull_request.closed_unmerged"];
 /** Build the stable pull request identity shared by tools and webhooks. */
 export declare function gitHubPullRequestResource(input: {
     number: number;
@@ -10,4 +23,6 @@ export declare function gitHubPullRequestResource(input: {
 export declare function gitHubPullRequestSubscribable(input: {
     number: number;
     repo: string;
+    /** Events already covered by a forced subscription; omit them from suggestions. */
+    omitSuggestedEvents?: readonly string[];
 }): SubscribableResource | undefined;

package/dist/testing.js

@@ -1,6 +1,6 @@
 import {
   normalizeGitHubResourceEvents
-} from "./chunk-IG5VPAKL.js";
+} from "./chunk-7CREKH4I.js";
 export {
   normalizeGitHubResourceEvents
 };

package/dist/tools/create-pull-request.d.ts

@@ -1,6 +1,7 @@
 import { type ToolRegistrationHookContext } from "@sentry/junior-plugin-api";
+import { type GitHubPullRequestSubscriptionConfig } from "../resource-events/pull-request.js";
 /** Own PR creation so provider writes use host egress and the footer stays deterministic. */
-export declare function createGitHubPullRequestTool(ctx: ToolRegistrationHookContext): import("@sentry/junior-plugin-api").PluginToolDefinition<{
+export declare function createGitHubPullRequestTool(ctx: ToolRegistrationHookContext, subscriptionConfig?: GitHubPullRequestSubscriptionConfig): import("@sentry/junior-plugin-api").PluginToolDefinition<{
     repo: string;
     title: string;
     head: string;
@@ -25,6 +26,10 @@ export declare function createGitHubPullRequestTool(ctx: ToolRegistrationHookCon
         type: string;
         suggestedEvents?: string[] | undefined;
     } | undefined;
+    subscription?: {
+        events: string[];
+        id: string;
+    } | undefined;
 }, {
     [x: string]: unknown;
     number: number;
@@ -43,4 +48,8 @@ export declare function createGitHubPullRequestTool(ctx: ToolRegistrationHookCon
         type: string;
         suggestedEvents?: string[] | undefined;
     } | undefined;
+    subscription?: {
+        events: string[];
+        id: string;
+    } | undefined;
 }>;

package/dist/tools.d.ts

@@ -1,3 +1,4 @@
 import type { PluginToolDefinition, ToolRegistrationHookContext } from "@sentry/junior-plugin-api";
+import type { GitHubPullRequestSubscriptionConfig } from "./resource-events/pull-request.js";
 /** Build the GitHub plugin's runtime tools from their per-tool modules. */
-export declare function createGitHubTools(ctx: ToolRegistrationHookContext, botEmail?: string): Record<string, PluginToolDefinition>;
+export declare function createGitHubTools(ctx: ToolRegistrationHookContext, botEmail?: string, pullRequestSubscription?: GitHubPullRequestSubscriptionConfig): Record<string, PluginToolDefinition>;

package/dist/webhooks/ownership.d.ts

@@ -1,2 +1,4 @@
 /** Derive the provider login encoded in a standard GitHub noreply address. */
 export declare function botLoginFromEmail(value: string | undefined): string | undefined;
+/** Derive the GitHub user id encoded in a standard GitHub noreply address. */
+export declare function botUserIdFromEmail(value: string | undefined): number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.173.0",
+  "version": "0.175.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
     "@sinclair/typebox": "^0.34.49",
     "drizzle-orm": "^0.45.2",
     "zod": "^4.4.3",
-    "@sentry/junior-plugin-api": "0.173.0"
+    "@sentry/junior-plugin-api": "0.175.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",