@sentry/junior-github 0.239.0 → 0.240.0

package/dist/index.js

@@ -2123,11 +2123,30 @@ var inputSchema7 = z10.object({
     "Replacement pull request body. The runtime appends requester attribution and the conversation footer."
   ),
   base: z10.string().trim().min(1).optional().describe("Replacement base branch."),
-  state: z10.enum(["open", "closed"]).optional().describe("Replacement pull request state.")
+  state: z10.enum(["open", "closed"]).optional().describe("Replacement pull request state."),
+  draft: z10.boolean().optional().describe(
+    "Set false to mark a draft pull request ready for review, or true to convert it back to a draft."
+  )
 }).strict().refine(
-  ({ title, body, base, state }) => title !== void 0 || body !== void 0 || base !== void 0 || state !== void 0,
+  ({ title, body, base, state, draft }) => title !== void 0 || body !== void 0 || base !== void 0 || state !== void 0 || draft !== void 0,
   { message: "At least one pull request field must be provided." }
 );
+var MARK_READY_FOR_REVIEW = {
+  operationName: "MarkPullRequestReadyForReview",
+  query: "mutation MarkPullRequestReadyForReview($id: ID!) { result: markPullRequestReadyForReview(input: {pullRequestId: $id}) { pullRequest { isDraft } } }"
+};
+var CONVERT_TO_DRAFT = {
+  operationName: "ConvertPullRequestToDraft",
+  query: "mutation ConvertPullRequestToDraft($id: ID!) { result: convertPullRequestToDraft(input: {pullRequestId: $id}) { pullRequest { isDraft } } }"
+};
+var draftMutationResponseSchema = z10.object({
+  data: z10.object({
+    result: z10.object({ pullRequest: z10.object({ isDraft: z10.boolean() }) })
+  })
+});
+var graphqlErrorsSchema = z10.object({
+  errors: z10.array(z10.object({ message: z10.string() })).min(1)
+});
 var pullRequestSchema2 = z10.object({
   base: z10.string(),
   body: z10.string().nullable(),
@@ -2173,6 +2192,34 @@ function githubApiErrorMessage4(payload) {
   if (typeof payload === "string" && payload.trim()) return payload.trim();
   return "GitHub request failed";
 }
+async function setPullRequestDraft(input) {
+  const mutation = input.draft ? CONVERT_TO_DRAFT : MARK_READY_FOR_REVIEW;
+  const response = await input.egress.fetch({
+    provider: "github",
+    operation: `github.pull.draft.update:${input.repo.toLowerCase()}`,
+    request: new Request("https://api.github.com/graphql", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        operationName: mutation.operationName,
+        query: mutation.query,
+        variables: { id: input.nodeId }
+      })
+    })
+  });
+  const payload = await readJson6(response);
+  const isDraft = draftMutationResponseSchema.safeParse(payload).data?.data.result.pullRequest.isDraft;
+  if (!response.ok || isDraft !== input.draft) {
+    throw new Error(
+      `GitHub pull request draft update failed with HTTP ${response.status}: ${githubGraphqlErrorMessage(payload)}`
+    );
+  }
+  return isDraft;
+}
+function githubGraphqlErrorMessage(payload) {
+  const result = graphqlErrorsSchema.safeParse(payload);
+  return result.success ? result.data.errors.map((error) => error.message).join("; ") : githubApiErrorMessage4(payload);
+}
 function createGitHubUpdatePullRequestTool(ctx) {
   return definePluginTool9({
     annotations: {
@@ -2181,7 +2228,7 @@ function createGitHubUpdatePullRequestTool(ctx) {
       openWorldHint: true,
       readOnlyHint: false
     },
-    description: "Update an existing GitHub pull request's title, body, base branch, or open/closed state. Use this instead of raw GitHub API calls when changing PR metadata.",
+    description: "Update an existing GitHub pull request's title, body, base branch, open/closed state, or draft state. Use this instead of raw GitHub API calls when changing PR metadata or marking a PR ready for review.",
     inputSchema: inputSchema7,
     outputSchema: outputSchema7,
     async execute(input) {
@@ -2206,21 +2253,20 @@ function createGitHubUpdatePullRequestTool(ctx) {
         ...update.base !== void 0 ? { base: update.base } : void 0,
         ...update.state !== void 0 ? { state: update.state } : void 0
       };
+      const pullUrl = `https://api.github.com/repos/${encodeURIComponent(repo.owner)}/${encodeURIComponent(repo.name)}/pulls/${update.number}`;
+      const hasRestUpdate = Object.keys(payload).length > 0;
       const response = await ctx.egress.fetch({
         provider: "github",
-        operation: "github.pull.update",
-        request: new Request(
-          `https://api.github.com/repos/${encodeURIComponent(repo.owner)}/${encodeURIComponent(repo.name)}/pulls/${update.number}`,
-          {
-            method: "PATCH",
-            headers: {
-              Accept: "application/vnd.github+json",
-              "Content-Type": "application/json",
-              "X-GitHub-Api-Version": "2022-11-28"
-            },
-            body: JSON.stringify(payload)
-          }
-        )
+        operation: hasRestUpdate ? "github.pull.update" : "github.pull.get",
+        request: new Request(pullUrl, {
+          method: hasRestUpdate ? "PATCH" : "GET",
+          headers: {
+            Accept: "application/vnd.github+json",
+            "X-GitHub-Api-Version": "2022-11-28",
+            ...hasRestUpdate ? { "Content-Type": "application/json" } : void 0
+          },
+          ...hasRestUpdate ? { body: JSON.stringify(payload) } : void 0
+        })
       });
       const parsed = await readJson6(response);
       if (!response.ok) {
@@ -2234,10 +2280,24 @@ function createGitHubUpdatePullRequestTool(ctx) {
         draft: z10.boolean(),
         html_url: z10.string(),
         merged: z10.boolean(),
+        node_id: z10.string().optional(),
         number: z10.number(),
         state: z10.string(),
         title: z10.string()
       }).parse(parsed);
+      if (update.draft !== void 0 && update.draft !== providerResult.draft) {
+        if (!providerResult.node_id) {
+          throw new Error(
+            "GitHub pull request response did not include node_id."
+          );
+        }
+        providerResult.draft = await setPullRequestDraft({
+          draft: update.draft,
+          egress: ctx.egress,
+          nodeId: providerResult.node_id,
+          repo: repo.ref
+        });
+      }
       const subscribable = ctx.events.canSubscribe ? gitHubPullRequestSubscribable({
         number: providerResult.number,
         repo: repo.ref
@@ -2255,7 +2315,10 @@ function createGitHubUpdatePullRequestTool(ctx) {
       return {
         objectAnnotations: [
           githubObjectAnnotation({
-            ...githubObjectFacts("code_change", parsed),
+            ...githubObjectFacts("code_change", {
+              ...parsed,
+              draft: providerResult.draft
+            }),
             repo: repo.ref,
             number: providerResult.number,
             title: providerResult.title,
@@ -4512,9 +4575,6 @@ function githubApiWriteGrantName(method, upstreamUrl) {
   )) {
     return "installation-write";
   }
-  if (method === "POST" && /^\/repos\/[^/]+\/[^/]+\/pulls\/[^/]+\/ready_for_review$/.test(pathname)) {
-    return "installation-write";
-  }
   if ((method === "POST" || method === "DELETE") && /^\/repos\/[^/]+\/[^/]+\/pulls\/[^/]+\/requested_reviewers$/.test(pathname)) {
     return "installation-write";
   }
@@ -4536,18 +4596,36 @@ function githubApiWriteGrantName(method, upstreamUrl) {
   }
   return void 0;
 }
-function reviewThreadResolveRepository(operation, method, upstreamUrl, bodyText) {
-  const prefix = "github.pull.review-thread.resolve:";
-  if (method !== "POST" || !isGitHubGraphqlUrl(upstreamUrl) || !operation?.startsWith(prefix)) {
-    return void 0;
+var HOST_GRAPHQL_MUTATIONS = [
+  {
+    field: "resolveReviewThread",
+    operationName: "ResolveReviewThread",
+    operationPrefix: "github.pull.review-thread.resolve:"
+  },
+  {
+    field: "markPullRequestReadyForReview",
+    operationName: "MarkPullRequestReadyForReview",
+    operationPrefix: "github.pull.draft.update:"
+  },
+  {
+    field: "convertPullRequestToDraft",
+    operationName: "ConvertPullRequestToDraft",
+    operationPrefix: "github.pull.draft.update:"
   }
-  const repository = operation.slice(prefix.length);
-  if (!/^[^/]+\/[^/]+$/.test(repository)) return void 0;
-  const parsed = parseGitHubGraphqlRequest(bodyText);
-  if (parsed?.operationName !== "ResolveReviewThread" || !/\bmutation\s+ResolveReviewThread\b/.test(parsed.normalized) || !/\bresolveReviewThread\b/.test(parsed.normalized)) {
+];
+function hostGraphqlMutationRepository(operation, method, upstreamUrl, bodyText) {
+  if (method !== "POST" || !isGitHubGraphqlUrl(upstreamUrl) || !operation) {
     return void 0;
   }
-  return repository;
+  const parsed = parseGitHubGraphqlRequest(bodyText);
+  const mutation = HOST_GRAPHQL_MUTATIONS.find(
+    (candidate) => operation.startsWith(candidate.operationPrefix) && parsed?.operationName === candidate.operationName && new RegExp(`\\bmutation\\s+${candidate.operationName}\\b`).test(
+      parsed.normalized
+    ) && new RegExp(`\\b${candidate.field}\\b`).test(parsed.normalized)
+  );
+  if (!mutation) return void 0;
+  const repository = operation.slice(mutation.operationPrefix.length);
+  return /^[^/]+\/[^/]+$/.test(repository) ? repository : void 0;
 }
 function isGitHubGraphqlMutation(method, upstreamUrl, bodyText, field) {
   if (method !== "POST" || !isGitHubGraphqlUrl(upstreamUrl)) return false;
@@ -4650,13 +4728,13 @@ async function githubGrantForEgress(ctx) {
       writeGrantName
     );
   }
-  const reviewThreadRepository = reviewThreadResolveRepository(
+  const hostMutationRepository = hostGraphqlMutationRepository(
     ctx.request.operation,
     method,
     upstreamUrl,
     ctx.request.bodyText
   );
-  if (reviewThreadRepository) {
+  if (hostMutationRepository) {
     return grantForAccess(
       "write",
       "github.installation-write",

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

@@ -26,6 +26,7 @@ export declare function createGitHubUpdatePullRequestTool(ctx: {
     body?: string | undefined;
     base?: string | undefined;
     state?: "closed" | "open" | undefined;
+    draft?: boolean | undefined;
 }, {
     base: string;
     body: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.239.0",
+  "version": "0.240.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.239.0"
+    "@sentry/junior-plugin-api": "0.240.0"
   },
   "devDependencies": {
     "@oxlint/plugins": "1.79.0",

package/skills/github-code/SKILL.md

@@ -11,6 +11,7 @@ Use `git` and `gh` for repository work.
 | ------------------------------- | ------------------------------------------------------------------------ |
 | Create PR                       | `github_createPullRequest` (not `gh pr create`)                          |
 | Update PR title/body/base/state | `github_updatePullRequest`                                               |
+| Mark PR ready / draft           | `github_updatePullRequest` with `draft: false` / `draft: true`           |
 | Submit PR review                | `github_submitPullRequestReview`                                         |
 | Resolve review thread           | `github_resolvePullRequestReviewThread`                                  |
 | Clone missing repo              | `github_cloneRepository`; on Workspace match error use `switchWorkspace` |
@@ -33,7 +34,7 @@ Use `git` and `gh` for repository work.
 - Push before `github_createPullRequest`. Never ask for a token for bot pushes.
 - When an error names a tool, use it. Change permissions only when GitHub rejected the request.
 - Stop for an unclear target, missing access, destructive work, or a GitHub permission failure.
-- Unless the user opts out, push completed work and open a draft PR.
+- Unless the user opts out, push completed work and open a PR. Open it ready for review when the work is complete and the checks pass. Open a draft only when work, checks, or decisions remain.
 - Report repo, branch, PR, checks, and skipped checks.
 
 Do not install or repair the GitHub plugin from this skill.

package/skills/github-code/references/api-surface.md

@@ -1,6 +1,6 @@
 # GitHub commands and permissions
 
-Use the tools in `SKILL.md` to create or update a PR, submit a review, or resolve a review thread. Use supported REST endpoints for other writes. Do not use GraphQL mutations.
+Use the tools in `SKILL.md` to create or update a PR, mark it ready for review or draft, submit a review, or resolve a review thread. Use supported REST endpoints for other writes. Do not send GraphQL mutations, for example with `gh api graphql`. The egress proxy denies them.
 
 ## Repo targeting
 
@@ -35,7 +35,7 @@ If the user omits `owner/repo`, run `jr-rpc config get github.repo`. Then pass `
 | Push                    | `git -C DIR push -u origin BRANCH`                                                              |
 | Workflow dispatch       | `gh workflow run WORKFLOW --repo owner/repo --ref REF [-f key=value]`                           |
 | Rerun / cancel          | `gh run rerun RUN_ID -R owner/repo [--failed]` / `gh run cancel RUN_ID -R owner/repo`           |
-| Ready for review        | `gh api repos/owner/repo/pulls/NUMBER/ready_for_review --method POST`                           |
+| Mark PR ready / draft   | `github_updatePullRequest` with `draft: false` / `draft: true`                                  |
 | Request reviewers       | `gh api repos/owner/repo/pulls/NUMBER/requested_reviewers --method POST --input reviewers.json` |
 | Submit review           | `github_submitPullRequestReview`                                                                |
 | Set feedback status     | `github_updatePullRequestFeedback`                                                              |
@@ -52,7 +52,7 @@ If the user omits `owner/repo`, run `jr-rpc config get github.repo`. Then pass `
 - A local commit does not call GitHub. A push uses installation credentials. Workflow changes also need `workflows.write`.
 - Deepen a shallow clone before work that needs old history. Do not force-push to work around missing history.
 - Push `head` and read the default `base` before `github_createPullRequest`.
-- Junior does not support merges, forks, repository administration, REST content or Git database writes, direct PR update or review writes, or GraphQL mutations.
+- Junior does not support merges, forks, repository administration, REST content or Git database writes, direct PR update or review writes, auto-merge, or GraphQL mutations.
 - Reviews and inline comments use the App bot.
 - PR comments/labels/assignees use issue endpoints; load `github-issues` for those.
 - Embed local images with `publishImage` first (public URL). Do not use private Slack file links.

package/skills/github-code/references/workflow.md

@@ -35,7 +35,7 @@ Open this when making repository edits, not for read-only inspection.
 2. Commit with repo conventions, else `<type>(<scope>): <Subject>` imperative present, no agent branding.
 3. Push with `git push -u origin BRANCH`.
 4. Resolve the actual default branch.
-5. Update an existing PR for the branch with `github_updatePullRequest`, or create with `github_createPullRequest` (`draft: true` unless ready-for-review is required).
+5. Update an existing PR for the branch with `github_updatePullRequest`, or create with `github_createPullRequest` (`draft: true` only when work, checks, or decisions remain; otherwise ready for review).
 6. PR title matches the current dominant change, same conventional form as commits.
 7. PR body: short, plain English, what changed and why. Only context the diff cannot show. No empty sections, file lists, commit logs, or Checks/Verification/Test plan blocks. Put local check results in the user report only.
 8. After material follow-up commits, refresh title and body against the current diff.