@sentry/junior-github 0.82.0 → 0.84.0

package/dist/index.js

@@ -73,12 +73,81 @@ function permissionCapabilities(permissions) {
 // src/tools/create-issue.ts
 import {
   EgressAuthRequired,
-  PluginToolInputError
+  PluginToolInputError as PluginToolInputError2
 } from "@sentry/junior-plugin-api";
 import { Type } from "@sinclair/typebox";
 import { Value } from "@sinclair/typebox/value";
-var GITHUB_ISSUE_FOOTER_START = "<!-- junior-session-footer:start -->";
-var GITHUB_ISSUE_FOOTER_END = "<!-- junior-session-footer:end -->";
+
+// src/tools/footer.ts
+import { PluginToolInputError } from "@sentry/junior-plugin-api";
+var GITHUB_SESSION_FOOTER_START = "<!-- junior-session-footer:start -->";
+var GITHUB_SESSION_FOOTER_END = "<!-- junior-session-footer:end -->";
+function nonEmptyString(value, name) {
+  if (!value?.trim()) {
+    throw new PluginToolInputError(`${name} is required`);
+  }
+  return value.trim();
+}
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function sentryConversationUrl(conversationId) {
+  const dsn = process.env.SENTRY_DSN?.trim();
+  const orgSlug = process.env.SENTRY_ORG_SLUG?.trim();
+  if (!dsn || !orgSlug) {
+    return void 0;
+  }
+  let parsed;
+  try {
+    parsed = new URL(dsn);
+  } catch {
+    return void 0;
+  }
+  const projectId = parsed.pathname.split("/").filter(Boolean).at(-1);
+  if (!parsed.hostname || !projectId) {
+    return void 0;
+  }
+  const encodedConversationId = encodeURIComponent(conversationId);
+  const params = new URLSearchParams({ project: projectId });
+  const path = `explore/conversations/${encodedConversationId}/?${params.toString()}`;
+  if (parsed.hostname === "sentry.io" || parsed.hostname.endsWith(".sentry.io")) {
+    return `https://${orgSlug}.sentry.io/${path}`;
+  }
+  const port = parsed.port ? `:${parsed.port}` : "";
+  return `${parsed.protocol}//${parsed.hostname}${port}/organizations/${orgSlug}/${path}`;
+}
+function githubConversationFooter(conversationId) {
+  const id = nonEmptyString(conversationId, "conversationId");
+  const sessionUrl = sentryConversationUrl(id);
+  if (!sessionUrl) {
+    return void 0;
+  }
+  return `${GITHUB_SESSION_FOOTER_START}
+
+--
+
+[View Junior Session in Sentry](${sessionUrl})
+
+${GITHUB_SESSION_FOOTER_END}`;
+}
+function appendGitHubFooter(body, conversationId) {
+  const footer = githubConversationFooter(conversationId);
+  const normalizedBody = body.trimEnd();
+  const existingFooter = new RegExp(
+    `${escapeRegExp(GITHUB_SESSION_FOOTER_START)}[\\s\\S]*?${escapeRegExp(GITHUB_SESSION_FOOTER_END)}`
+  );
+  if (existingFooter.test(normalizedBody)) {
+    return footer ? normalizedBody.replace(existingFooter, footer) : normalizedBody.replace(existingFooter, "").trimEnd();
+  }
+  if (!footer) {
+    return normalizedBody;
+  }
+  return normalizedBody ? `${normalizedBody}
+
+${footer}` : footer;
+}
+
+// src/tools/create-issue.ts
 var GITHUB_ISSUE_CREATE_IDEMPOTENCY_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
 var GITHUB_ISSUE_CREATE_LOCK_TTL_MS = 6e4;
 var GitHubIssueCreateRejectedError = class extends Error {
@@ -132,86 +201,28 @@ function parseCreateIssueInput(input) {
   try {
     return Value.Parse(createIssueInputSchema, input);
   } catch (error) {
-    throw new PluginToolInputError("Invalid GitHub createIssue input.", {
+    throw new PluginToolInputError2("Invalid GitHub createIssue input.", {
       cause: error
     });
   }
 }
-function nonEmptyString(value, name) {
+function nonEmptyString2(value, name) {
   if (!value?.trim()) {
-    throw new PluginToolInputError(`${name} is required`);
+    throw new PluginToolInputError2(`${name} is required`);
   }
   return value.trim();
 }
 function parseRepo(value) {
-  const repo = nonEmptyString(value, "repo");
+  const repo = nonEmptyString2(value, "repo");
   const parts = repo.split("/");
   if (parts.length !== 2 || !parts[0]?.trim() || !parts[1]?.trim()) {
-    throw new PluginToolInputError('repo must use "owner/name" format');
+    throw new PluginToolInputError2('repo must use "owner/name" format');
   }
   return {
     owner: parts[0].trim(),
     name: parts[1].trim()
   };
 }
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function sentryConversationUrl(conversationId) {
-  const dsn = process.env.SENTRY_DSN?.trim();
-  const orgSlug = process.env.SENTRY_ORG_SLUG?.trim();
-  if (!dsn || !orgSlug) {
-    return void 0;
-  }
-  let parsed;
-  try {
-    parsed = new URL(dsn);
-  } catch {
-    return void 0;
-  }
-  const projectId = parsed.pathname.split("/").filter(Boolean).at(-1);
-  if (!parsed.hostname || !projectId) {
-    return void 0;
-  }
-  const encodedConversationId = encodeURIComponent(conversationId);
-  const params = new URLSearchParams({ project: projectId });
-  const path = `explore/conversations/${encodedConversationId}/?${params.toString()}`;
-  if (parsed.hostname === "sentry.io" || parsed.hostname.endsWith(".sentry.io")) {
-    return `https://${orgSlug}.sentry.io/${path}`;
-  }
-  const port = parsed.port ? `:${parsed.port}` : "";
-  return `${parsed.protocol}//${parsed.hostname}${port}/organizations/${orgSlug}/${path}`;
-}
-function githubIssueConversationFooter(conversationId) {
-  const id = nonEmptyString(conversationId, "conversationId");
-  const sessionUrl = sentryConversationUrl(id);
-  if (!sessionUrl) {
-    return void 0;
-  }
-  return `${GITHUB_ISSUE_FOOTER_START}
-
-[View Session in Sentry](${sessionUrl})
-
-${GITHUB_ISSUE_FOOTER_END}`;
-}
-function appendGitHubIssueFooter(body, conversationId) {
-  const footer = githubIssueConversationFooter(conversationId);
-  const normalizedBody = body.trimEnd();
-  const existingFooter = new RegExp(
-    `${escapeRegExp(GITHUB_ISSUE_FOOTER_START)}[\\s\\S]*?${escapeRegExp(
-      GITHUB_ISSUE_FOOTER_END
-    )}`
-  );
-  if (existingFooter.test(normalizedBody)) {
-    return footer ? normalizedBody.replace(existingFooter, footer) : normalizedBody.replace(existingFooter, "").trimEnd();
-  }
-  if (!footer) {
-    return normalizedBody;
-  }
-  return normalizedBody ? `${normalizedBody}
-
-${footer}` : footer;
-}
 async function readJsonResponse(response) {
   const text = await response.text();
   if (!text) {
@@ -259,11 +270,11 @@ function isDefinitiveGitHubIssueCreateRejection(error) {
 function createGitHubIssueRequest(conversationId, input) {
   const repo = parseRepo(input.repo);
   const labels = input.labels?.map(
-    (label) => nonEmptyString(label, "labels entry")
+    (label) => nonEmptyString2(label, "labels entry")
   );
   const payload = {
-    title: nonEmptyString(input.title, "title"),
-    body: appendGitHubIssueFooter(input.body ?? "", conversationId),
+    title: nonEmptyString2(input.title, "title"),
+    body: appendGitHubFooter(input.body ?? "", conversationId),
     ...labels?.length ? { labels } : {}
   };
   return new Request(
@@ -314,11 +325,11 @@ function createGitHubIssueTool(ctx) {
     inputSchema: createIssueInputSchema,
     async execute(input, options) {
       const parsedInput = parseCreateIssueInput(input);
-      const conversationId = nonEmptyString(
+      const conversationId = nonEmptyString2(
         ctx.conversationId,
         "conversationId"
       );
-      const toolCallId = nonEmptyString(options?.toolCallId, "toolCallId");
+      const toolCallId = nonEmptyString2(options?.toolCallId, "toolCallId");
       const key = `createIssue:${conversationId}:${toolCallId}`;
       return await ctx.state.withLock(
         `${key}:lock`,
@@ -377,12 +388,10 @@ function createGitHubIssueTool(ctx) {
 // src/tools/create-pull-request.ts
 import {
   EgressAuthRequired as EgressAuthRequired2,
-  PluginToolInputError as PluginToolInputError2
+  PluginToolInputError as PluginToolInputError3
 } from "@sentry/junior-plugin-api";
 import { Type as Type2 } from "@sinclair/typebox";
 import { Value as Value2 } from "@sinclair/typebox/value";
-var GITHUB_PULL_REQUEST_FOOTER_START = "<!-- junior-session-footer:start -->";
-var GITHUB_PULL_REQUEST_FOOTER_END = "<!-- junior-session-footer:end -->";
 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 {
@@ -424,6 +433,7 @@ var createPullRequestStateSchema = Type2.Union([
   Type2.Object(
     {
       createdAtMs: Type2.Number(),
+      input: Type2.Optional(createPullRequestInputSchema),
       number: Type2.Number(),
       status: Type2.Literal("completed"),
       url: Type2.String()
@@ -433,6 +443,7 @@ var createPullRequestStateSchema = Type2.Union([
   Type2.Object(
     {
       createdAtMs: Type2.Number(),
+      input: Type2.Optional(createPullRequestInputSchema),
       status: Type2.Literal("pending")
     },
     { additionalProperties: false }
@@ -442,86 +453,28 @@ function parseCreatePullRequestInput(input) {
   try {
     return Value2.Parse(createPullRequestInputSchema, input);
   } catch (error) {
-    throw new PluginToolInputError2("Invalid GitHub createPullRequest input.", {
+    throw new PluginToolInputError3("Invalid GitHub createPullRequest input.", {
       cause: error
     });
   }
 }
-function nonEmptyString2(value, name) {
+function nonEmptyString3(value, name) {
   if (!value?.trim()) {
-    throw new PluginToolInputError2(`${name} is required`);
+    throw new PluginToolInputError3(`${name} is required`);
   }
   return value.trim();
 }
 function parseRepo2(value) {
-  const repo = nonEmptyString2(value, "repo");
+  const repo = nonEmptyString3(value, "repo");
   const parts = repo.split("/");
   if (parts.length !== 2 || !parts[0]?.trim() || !parts[1]?.trim()) {
-    throw new PluginToolInputError2('repo must use "owner/name" format');
+    throw new PluginToolInputError3('repo must use "owner/name" format');
   }
   return {
     owner: parts[0].trim(),
     name: parts[1].trim()
   };
 }
-function escapeRegExp2(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function sentryConversationUrl2(conversationId) {
-  const dsn = process.env.SENTRY_DSN?.trim();
-  const orgSlug = process.env.SENTRY_ORG_SLUG?.trim();
-  if (!dsn || !orgSlug) {
-    return void 0;
-  }
-  let parsed;
-  try {
-    parsed = new URL(dsn);
-  } catch {
-    return void 0;
-  }
-  const projectId = parsed.pathname.split("/").filter(Boolean).at(-1);
-  if (!parsed.hostname || !projectId) {
-    return void 0;
-  }
-  const encodedConversationId = encodeURIComponent(conversationId);
-  const params = new URLSearchParams({ project: projectId });
-  const path = `explore/conversations/${encodedConversationId}/?${params.toString()}`;
-  if (parsed.hostname === "sentry.io" || parsed.hostname.endsWith(".sentry.io")) {
-    return `https://${orgSlug}.sentry.io/${path}`;
-  }
-  const port = parsed.port ? `:${parsed.port}` : "";
-  return `${parsed.protocol}//${parsed.hostname}${port}/organizations/${orgSlug}/${path}`;
-}
-function githubPullRequestConversationFooter(conversationId) {
-  const id = nonEmptyString2(conversationId, "conversationId");
-  const sessionUrl = sentryConversationUrl2(id);
-  if (!sessionUrl) {
-    return void 0;
-  }
-  return `${GITHUB_PULL_REQUEST_FOOTER_START}
-
-[View Session in Sentry](${sessionUrl})
-
-${GITHUB_PULL_REQUEST_FOOTER_END}`;
-}
-function appendGitHubPullRequestFooter(body, conversationId) {
-  const footer = githubPullRequestConversationFooter(conversationId);
-  const normalizedBody = body.trimEnd();
-  const existingFooter = new RegExp(
-    `${escapeRegExp2(GITHUB_PULL_REQUEST_FOOTER_START)}[\\s\\S]*?${escapeRegExp2(
-      GITHUB_PULL_REQUEST_FOOTER_END
-    )}`
-  );
-  if (existingFooter.test(normalizedBody)) {
-    return footer ? normalizedBody.replace(existingFooter, footer) : normalizedBody.replace(existingFooter, "").trimEnd();
-  }
-  if (!footer) {
-    return normalizedBody;
-  }
-  return normalizedBody ? `${normalizedBody}
-
-${footer}` : footer;
-}
 async function readJsonResponse2(response) {
   const text = await response.text();
   if (!text) {
@@ -569,10 +522,10 @@ function isDefinitiveGitHubPullRequestCreateRejection(error) {
 function createGitHubPullRequestRequest(conversationId, input) {
   const repo = parseRepo2(input.repo);
   const payload = {
-    title: nonEmptyString2(input.title, "title"),
-    head: nonEmptyString2(input.head, "head"),
-    base: nonEmptyString2(input.base, "base"),
-    body: appendGitHubPullRequestFooter(input.body ?? "", conversationId),
+    title: nonEmptyString3(input.title, "title"),
+    head: nonEmptyString3(input.head, "head"),
+    base: nonEmptyString3(input.base, "base"),
+    body: appendGitHubFooter(input.body ?? "", conversationId),
     ...input.draft !== void 0 ? { draft: input.draft } : {}
   };
   return new Request(
@@ -621,17 +574,51 @@ async function createGitHubPullRequest(ctx, request) {
     url: pullRequest.html_url
   };
 }
+function gitHubPullRequestSubscribable(input, result) {
+  const repo = parseRepo2(input.repo);
+  const repoRef = `${repo.owner}/${repo.name}`;
+  const supportedEvents = [
+    "checks.failed",
+    "checks.recovered",
+    "review.approved",
+    "review.changes_requested",
+    "state.merged",
+    "state.closed_unmerged"
+  ];
+  return {
+    label: `GitHub PR ${repoRef}#${result.number}`,
+    provider: "github",
+    resourceRef: `github:pull_request:${repoRef}#${result.number}`,
+    suggestedEvents: [
+      "checks.failed",
+      "review.changes_requested",
+      "state.merged",
+      "state.closed_unmerged"
+    ],
+    supportedEvents,
+    type: "pull_request"
+  };
+}
+function gitHubPullRequestToolResult(input, result) {
+  if (!process.env.GITHUB_WEBHOOK_SECRET?.trim()) {
+    return result;
+  }
+  return {
+    ...result,
+    subscribable: gitHubPullRequestSubscribable(input, result)
+  };
+}
 function createGitHubPullRequestTool(ctx) {
   return {
     description: "Create a GitHub pull request with a runtime-owned Junior conversation footer. Use this instead of shelling out to gh pr create when creating pull requests.",
     inputSchema: createPullRequestInputSchema,
     async execute(input, options) {
       const parsedInput = parseCreatePullRequestInput(input);
-      const conversationId = nonEmptyString2(
+      const conversationId = nonEmptyString3(
         ctx.conversationId,
         "conversationId"
       );
-      const toolCallId = nonEmptyString2(options?.toolCallId, "toolCallId");
+      const toolCallId = nonEmptyString3(options?.toolCallId, "toolCallId");
       const key = `createPullRequest:${conversationId}:${toolCallId}`;
       return await ctx.state.withLock(
         `${key}:lock`,
@@ -639,10 +626,10 @@ function createGitHubPullRequestTool(ctx) {
         async () => {
           const state = createPullRequestState(await ctx.state.get(key));
           if (state?.status === "completed") {
-            return {
+            return gitHubPullRequestToolResult(state.input ?? parsedInput, {
               number: state.number,
               url: state.url
-            };
+            });
           }
           if (state?.status === "pending") {
             throw new Error(
@@ -655,7 +642,8 @@ function createGitHubPullRequestTool(ctx) {
           );
           const pendingState = {
             status: "pending",
-            createdAtMs: Date.now()
+            createdAtMs: Date.now(),
+            input: parsedInput
           };
           await ctx.state.set(
             key,
@@ -677,7 +665,7 @@ function createGitHubPullRequestTool(ctx) {
                 { cause: error }
               );
             }
-            return result;
+            return gitHubPullRequestToolResult(parsedInput, result);
           } catch (error) {
             if (isEgressAuthRequired2(error) || isDefinitiveGitHubPullRequestCreateRejection(error)) {
               await ctx.state.delete(key);
@@ -1359,7 +1347,7 @@ function parseGitHubGraphqlOperation(bodyText) {
   if (operationName) {
     const namedOperation = normalized.match(
       new RegExp(
-        `\\b(query|mutation|subscription)\\s+${escapeRegExp3(operationName)}\\b`
+        `\\b(query|mutation|subscription)\\s+${escapeRegExp2(operationName)}\\b`
       )
     )?.[1];
     return namedOperation ? graphqlOperationAccess(namedOperation) : void 0;
@@ -1400,7 +1388,7 @@ function parseGitHubGraphqlRequest(bodyText) {
     ...operationName ? { operationName } : {}
   };
 }
-function escapeRegExp3(value) {
+function escapeRegExp2(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function graphqlOperationAccess(operation) {
@@ -1529,7 +1517,7 @@ function isGitHubIssueCreateGraphqlMutation(method, upstreamUrl, bodyText) {
     return /\bmutation\b/.test(parsed.normalized);
   }
   return new RegExp(
-    `\\bmutation\\s+${escapeRegExp3(parsed.operationName)}\\b`
+    `\\bmutation\\s+${escapeRegExp2(parsed.operationName)}\\b`
   ).test(parsed.normalized);
 }
 function isGitHubPullCreateGraphqlMutation(method, upstreamUrl, bodyText) {
@@ -1547,7 +1535,7 @@ function isGitHubPullCreateGraphqlMutation(method, upstreamUrl, bodyText) {
     return /\bmutation\b/.test(parsed.normalized);
   }
   return new RegExp(
-    `\\bmutation\\s+${escapeRegExp3(parsed.operationName)}\\b`
+    `\\bmutation\\s+${escapeRegExp2(parsed.operationName)}\\b`
   ).test(parsed.normalized);
 }
 function assertGitHubWriteAllowed(input) {

package/dist/tools/footer.d.ts

@@ -0,0 +1,13 @@
+export declare const GITHUB_SESSION_FOOTER_START = "<!-- junior-session-footer:start -->";
+export declare const GITHUB_SESSION_FOOTER_END = "<!-- junior-session-footer:end -->";
+export declare function sentryConversationUrl(conversationId: string): string | undefined;
+/**
+ * Build the Junior session footer block for GitHub issues and pull requests.
+ * Returns undefined when Sentry DSN/org are not configured.
+ */
+export declare function githubConversationFooter(conversationId: string): string | undefined;
+/**
+ * Append (or replace an existing) Junior session footer to a GitHub body string.
+ * When Sentry is not configured, returns the body unchanged (existing footer stripped).
+ */
+export declare function appendGitHubFooter(body: string, conversationId: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.82.0",
+  "version": "0.84.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "@sinclair/typebox": "^0.34.49",
-    "@sentry/junior-plugin-api": "0.82.0"
+    "@sentry/junior-plugin-api": "0.84.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",