@sentry/junior-github 0.89.0 → 0.90.0

package/SETUP.md

@@ -153,13 +153,14 @@ For PR creation in automation, push explicitly and pass that branch as `head`:
 
 ```bash
 git -C repo push -u origin BRANCH
+gh repo view owner/repo --json defaultBranchRef --jq .defaultBranchRef.name
 ```
 
 ```ts
 github_createPullRequest({
   repo: "owner/repo",
   head: "BRANCH",
-  base: "main",
+  base: "<DEFAULT_BRANCH>",
   title: "Example PR",
   body: "Example body",
   draft: true,

package/dist/index.js

@@ -72,11 +72,14 @@ function permissionCapabilities(permissions) {
 
 // src/tools/create-issue.ts
 import {
+  definePluginTool,
   EgressAuthRequired,
-  PluginToolInputError as PluginToolInputError2
+  PluginToolInputError as PluginToolInputError2,
+  pluginToolResultSchema
 } from "@sentry/junior-plugin-api";
 import { Type } from "@sinclair/typebox";
 import { Value } from "@sinclair/typebox/value";
+import { z } from "zod";
 
 // src/tools/footer.ts
 import { PluginToolInputError } from "@sentry/junior-plugin-api";
@@ -179,6 +182,12 @@ var createIssueInputSchema = Type.Object(
   },
   { additionalProperties: false }
 );
+var createIssueToolInputSchema = z.object({
+  repo: z.string().describe('Repository in "owner/name" format.'),
+  title: z.string().describe("Issue title."),
+  body: z.string().describe("Issue body. Junior appends the conversation footer.").optional(),
+  labels: z.array(z.string()).describe("Labels to apply to the issue.").optional()
+}).strict();
 var createIssueStateSchema = Type.Union([
   Type.Object(
     {
@@ -197,6 +206,27 @@ var createIssueStateSchema = Type.Union([
     { additionalProperties: false }
   )
 ]);
+var gitHubIssueDataSchema = z.object({
+  number: z.number(),
+  url: z.string()
+});
+var gitHubIssueOutputSchema = pluginToolResultSchema.extend({
+  ok: z.literal(true),
+  status: z.literal("success"),
+  target: z.literal("createIssue"),
+  data: gitHubIssueDataSchema,
+  number: z.number(),
+  url: z.string()
+});
+function gitHubIssueToolResult(result) {
+  return {
+    ok: true,
+    status: "success",
+    target: "createIssue",
+    data: result,
+    ...result
+  };
+}
 function parseCreateIssueInput(input) {
   try {
     return Value.Parse(createIssueInputSchema, input);
@@ -320,9 +350,10 @@ async function createGitHubIssue(ctx, request) {
   };
 }
 function createGitHubIssueTool(ctx) {
-  return {
+  return definePluginTool({
     description: "Create a GitHub issue with a runtime-owned Junior conversation footer. Use this instead of shelling out to gh issue create when creating issues.",
-    inputSchema: createIssueInputSchema,
+    inputSchema: createIssueToolInputSchema,
+    outputSchema: gitHubIssueOutputSchema,
     async execute(input, options) {
       const parsedInput = parseCreateIssueInput(input);
       const conversationId = nonEmptyString2(
@@ -337,10 +368,10 @@ function createGitHubIssueTool(ctx) {
         async () => {
           const state = createIssueState(await ctx.state.get(key));
           if (state?.status === "completed") {
-            return {
+            return gitHubIssueToolResult({
               number: state.number,
               url: state.url
-            };
+            });
           }
           if (state?.status === "pending") {
             throw new Error(
@@ -372,7 +403,7 @@ function createGitHubIssueTool(ctx) {
                 { cause: error }
               );
             }
-            return result;
+            return gitHubIssueToolResult(result);
           } catch (error) {
             if (isEgressAuthRequired(error) || isDefinitiveGitHubIssueCreateRejection(error)) {
               await ctx.state.delete(key);
@@ -382,16 +413,19 @@ function createGitHubIssueTool(ctx) {
         }
       );
     }
-  };
+  });
 }
 
 // src/tools/create-pull-request.ts
 import {
+  definePluginTool as definePluginTool2,
   EgressAuthRequired as EgressAuthRequired2,
-  PluginToolInputError as PluginToolInputError3
+  PluginToolInputError as PluginToolInputError3,
+  pluginToolResultSchema as pluginToolResultSchema2
 } from "@sentry/junior-plugin-api";
 import { Type as Type2 } from "@sinclair/typebox";
 import { Value as Value2 } from "@sinclair/typebox/value";
+import { z as z2 } from "zod";
 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 {
@@ -429,6 +463,14 @@ var createPullRequestInputSchema = Type2.Object(
   },
   { additionalProperties: false }
 );
+var createPullRequestToolInputSchema = z2.object({
+  repo: z2.string().describe('Repository in "owner/name" format.'),
+  title: z2.string().describe("Pull request title."),
+  head: z2.string().describe("Head branch or owner:branch ref."),
+  base: z2.string().describe("Base branch."),
+  body: z2.string().describe("Pull request body. Junior appends the conversation footer.").optional(),
+  draft: z2.boolean().describe("Whether to open the pull request as a draft.").optional()
+}).strict();
 var createPullRequestStateSchema = Type2.Union([
   Type2.Object(
     {
@@ -449,6 +491,28 @@ var createPullRequestStateSchema = Type2.Union([
     { additionalProperties: false }
   )
 ]);
+var subscribableResourceSchema = z2.object({
+  provider: z2.string(),
+  type: z2.string(),
+  resourceRef: z2.string(),
+  label: z2.string(),
+  supportedEvents: z2.array(z2.string()),
+  suggestedEvents: z2.array(z2.string()).optional()
+}).strict();
+var gitHubPullRequestDataSchema = z2.object({
+  number: z2.number(),
+  url: z2.string(),
+  subscribable: subscribableResourceSchema.optional()
+});
+var gitHubPullRequestOutputSchema = pluginToolResultSchema2.extend({
+  ok: z2.literal(true),
+  status: z2.literal("success"),
+  target: z2.literal("createPullRequest"),
+  data: gitHubPullRequestDataSchema,
+  number: z2.number(),
+  url: z2.string(),
+  subscribable: subscribableResourceSchema.optional()
+});
 function parseCreatePullRequestInput(input) {
   try {
     return Value2.Parse(createPullRequestInputSchema, input);
@@ -490,7 +554,8 @@ function githubApiErrorMessage2(payload) {
   if (payload && typeof payload === "object" && !Array.isArray(payload)) {
     const message = payload.message;
     if (typeof message === "string") {
-      return message;
+      const details = githubApiErrorDetails(payload);
+      return details ? `${message}: ${details}` : message;
     }
   }
   if (typeof payload === "string" && payload.trim()) {
@@ -498,6 +563,23 @@ function githubApiErrorMessage2(payload) {
   }
   return "GitHub request failed";
 }
+function githubApiErrorDetails(payload) {
+  const errors = payload.errors;
+  if (!Array.isArray(errors)) {
+    return void 0;
+  }
+  const details = errors.map((error) => {
+    if (!error || typeof error !== "object" || Array.isArray(error)) {
+      return void 0;
+    }
+    const fields = ["resource", "field", "code", "message"].map((name) => {
+      const value = error[name];
+      return typeof value === "string" && value.trim() ? `${name}=${value.trim()}` : void 0;
+    }).filter((value) => value !== void 0);
+    return fields.length ? fields.join(" ") : void 0;
+  }).filter((value) => value !== void 0);
+  return details.length ? details.join("; ") : void 0;
+}
 function createPullRequestState(value) {
   if (value === void 0) {
     return void 0;
@@ -614,10 +696,21 @@ function gitHubPullRequestToolResult(input, result) {
     subscribable: gitHubPullRequestSubscribable(input, result)
   };
 }
-function createGitHubPullRequestTool(ctx) {
+function gitHubPullRequestStructuredResult(input, result) {
+  const data = gitHubPullRequestToolResult(input, result);
   return {
+    ok: true,
+    status: "success",
+    target: "createPullRequest",
+    data,
+    ...data
+  };
+}
+function createGitHubPullRequestTool(ctx) {
+  return definePluginTool2({
     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,
+    inputSchema: createPullRequestToolInputSchema,
+    outputSchema: gitHubPullRequestOutputSchema,
     async execute(input, options) {
       const parsedInput = parseCreatePullRequestInput(input);
       const conversationId = nonEmptyString3(
@@ -632,10 +725,13 @@ function createGitHubPullRequestTool(ctx) {
         async () => {
           const state = createPullRequestState(await ctx.state.get(key));
           if (state?.status === "completed") {
-            return gitHubPullRequestToolResult(state.input ?? parsedInput, {
-              number: state.number,
-              url: state.url
-            });
+            return gitHubPullRequestStructuredResult(
+              state.input ?? parsedInput,
+              {
+                number: state.number,
+                url: state.url
+              }
+            );
           }
           if (state?.status === "pending") {
             throw new Error(
@@ -671,7 +767,7 @@ function createGitHubPullRequestTool(ctx) {
                 { cause: error }
               );
             }
-            return gitHubPullRequestToolResult(parsedInput, result);
+            return gitHubPullRequestStructuredResult(parsedInput, result);
           } catch (error) {
             if (isEgressAuthRequired2(error) || isDefinitiveGitHubPullRequestCreateRejection(error)) {
               await ctx.state.delete(key);
@@ -681,7 +777,7 @@ function createGitHubPullRequestTool(ctx) {
         }
       );
     }
-  };
+  });
 }
 
 // src/tools.ts

package/dist/tools/create-issue.d.ts

@@ -1,12 +1,29 @@
-import { type PluginToolDefinition, type ToolRegistrationHookContext } from "@sentry/junior-plugin-api";
-import { type Static } from "@sinclair/typebox";
-declare const createIssueInputSchema: import("@sinclair/typebox").TObject<{
-    repo: import("@sinclair/typebox").TString;
-    title: import("@sinclair/typebox").TString;
-    body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    labels: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
-}>;
-type CreateGitHubIssueInput = Static<typeof createIssueInputSchema>;
+import { type ToolRegistrationHookContext } from "@sentry/junior-plugin-api";
 /** Own issue creation so provider writes use host egress and the footer stays deterministic. */
-export declare function createGitHubIssueTool(ctx: ToolRegistrationHookContext): PluginToolDefinition<CreateGitHubIssueInput>;
-export {};
+export declare function createGitHubIssueTool(ctx: ToolRegistrationHookContext): import("@sentry/junior-plugin-api").PluginToolDefinition<{
+    repo: string;
+    title: string;
+    body?: string | undefined;
+    labels?: string[] | undefined;
+}, {
+    [x: string]: unknown;
+    ok: true;
+    status: "success";
+    target: "createIssue";
+    data: {
+        number: number;
+        url: string;
+    };
+    number: number;
+    url: string;
+    truncated?: boolean | undefined;
+    continuation?: {
+        arguments: Record<string, unknown>;
+        reason?: string | undefined;
+    } | undefined;
+    error?: string | {
+        kind: string;
+        message: string;
+        retryable?: boolean | undefined;
+    } | undefined;
+}>;

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

@@ -1,14 +1,47 @@
-import { type PluginToolDefinition, type ToolRegistrationHookContext } from "@sentry/junior-plugin-api";
-import { type Static } from "@sinclair/typebox";
-declare const createPullRequestInputSchema: import("@sinclair/typebox").TObject<{
-    repo: import("@sinclair/typebox").TString;
-    title: import("@sinclair/typebox").TString;
-    head: import("@sinclair/typebox").TString;
-    base: import("@sinclair/typebox").TString;
-    body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    draft: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
-}>;
-type CreateGitHubPullRequestInput = Static<typeof createPullRequestInputSchema>;
+import { type ToolRegistrationHookContext } from "@sentry/junior-plugin-api";
 /** Own PR creation so provider writes use host egress and the footer stays deterministic. */
-export declare function createGitHubPullRequestTool(ctx: ToolRegistrationHookContext): PluginToolDefinition<CreateGitHubPullRequestInput>;
-export {};
+export declare function createGitHubPullRequestTool(ctx: ToolRegistrationHookContext): import("@sentry/junior-plugin-api").PluginToolDefinition<{
+    repo: string;
+    title: string;
+    head: string;
+    base: string;
+    body?: string | undefined;
+    draft?: boolean | undefined;
+}, {
+    [x: string]: unknown;
+    ok: true;
+    status: "success";
+    target: "createPullRequest";
+    data: {
+        number: number;
+        url: string;
+        subscribable?: {
+            provider: string;
+            type: string;
+            resourceRef: string;
+            label: string;
+            supportedEvents: string[];
+            suggestedEvents?: string[] | undefined;
+        } | undefined;
+    };
+    number: number;
+    url: string;
+    truncated?: boolean | undefined;
+    continuation?: {
+        arguments: Record<string, unknown>;
+        reason?: string | undefined;
+    } | undefined;
+    error?: string | {
+        kind: string;
+        message: string;
+        retryable?: boolean | undefined;
+    } | undefined;
+    subscribable?: {
+        provider: string;
+        type: string;
+        resourceRef: string;
+        label: string;
+        supportedEvents: string[];
+        suggestedEvents?: string[] | undefined;
+    } | undefined;
+}>;

package/package.json

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

package/skills/github-code/SKILL.md

@@ -109,7 +109,8 @@ Before creating:
 
 1. Changes committed on a non-default branch.
 2. Push the branch explicitly: `git push -u origin BRANCH`.
-3. Create with explicit targeting: `github_createPullRequest({ repo: "owner/repo", head: "BRANCH", base: "main", title: "...", body: "...", draft: true })`.
+3. Resolve the actual default branch: `gh repo view owner/repo --json defaultBranchRef --jq .defaultBranchRef.name`.
+4. Create with explicit targeting, using that default branch as `base`: `github_createPullRequest({ repo: "owner/repo", head: "BRANCH", base: "<DEFAULT_BRANCH>", title: "...", body: "...", draft: true })`.
 
 Defaults:
 

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

@@ -32,6 +32,7 @@ Treat explicit repo flags as command-targeting safety rails, not as a credential
 | Check worktree state               | `git -C DIRECTORY status --short --branch`                                                                               |
 | View commit log against base       | `git -C DIRECTORY log BASE..HEAD --oneline`                                                                              |
 | Diff against base                  | `git -C DIRECTORY diff BASE...HEAD`                                                                                      |
+| Resolve default branch             | `gh repo view owner/repo --json defaultBranchRef --jq .defaultBranchRef.name`                                            |
 | Create branch                      | `git -C DIRECTORY checkout -b BRANCH`                                                                                    |
 | Stage and commit                   | `git -C DIRECTORY add -A && git -C DIRECTORY commit -m "message"`                                                        |
 | Push branch before PR creation     | `git -C DIRECTORY push -u origin BRANCH`                                                                                 |
@@ -64,7 +65,7 @@ jr-rpc config set github.repo owner/repo
 - A local `git commit` does not call GitHub. Pushing that commit does: `git push` requires `github.contents.write` on the target repo and requester write access.
 - REST Git commit construction also requires `github.contents.write`: `POST /git/blobs`, `POST /git/trees`, `POST /git/commits`, `POST /git/refs`, and `PATCH /git/refs/{ref}`.
 - If the commit changes workflow files under `.github/workflows`, expect `github.workflows.write` in addition to contents write.
-- Before `github_createPullRequest`, push the head branch explicitly. That push requires GitHub write access to the remote.
+- Before `github_createPullRequest`, push the head branch explicitly and resolve the target repo's default branch for `base`. That push requires GitHub write access to the remote.
 - Do not use fork creation as the normal PR path. GitHub requires Administration write plus Contents read for `POST /repos/{owner}/{repo}/forks`, and the app must be installed on both source and destination accounts.
 - If the explicit `git push` fails with 401/403 or another access/permission error, verify the repo context and retry once. If it still fails, load troubleshooting guidance and report the exact command failure.
 - `gh pr edit` is not a single-permission command: title/body/base/reviewer changes need pull request write permission; label, assignee, and milestone changes need issue write permission (use the `github-issues` skill); project flags are outside the current GitHub App permission guidance.

package/skills/github-code/references/troubleshooting-workarounds.md

@@ -16,6 +16,7 @@ Use this table to recover quickly while keeping operations deterministic.
 | 403 Forbidden                                                         | App lacks required permission on repo or install scope is too narrow.            | Verify the repo context, then confirm GitHub App permissions and installation scope.                                                                                                 |
 | `gh auth status` shows `Token scopes: none`                           | Expected for GitHub App user-to-server tokens.                                   | Do not treat this as read-only proof. Use the failed command, `permission_denied.acceptedPermissions`, and GitHub App permissions instead.                                           |
 | `github_createPullRequest` fails with auth/permission errors          | The branch was not pushed first, or repo context is wrong.                       | Push the branch explicitly first, then retry `github_createPullRequest` with explicit `repo`, `head`, and `base` values.                                                             |
+| `github_createPullRequest` fails with 422 validation on `base`        | The `base` branch does not exist in the target repo.                             | Resolve the default branch with `gh repo view owner/repo --json defaultBranchRef --jq .defaultBranchRef.name`, then retry with that value as `base`.                                 |
 | `git blame`, long log history, or old commits are missing after clone | Repo was cloned shallow by design.                                               | Deepen incrementally with `git -C DIRECTORY fetch --depth=N origin`, or `git -C DIRECTORY fetch --unshallow` when full history is required.                                          |
 | `sandbox setup failed (dnf install gh failed ...)`                    | `gh` package not available from the plugin runtime dependency bootstrap.         | Report the plugin runtime bootstrap failure; do not try to repair package installation from the skill workflow.                                                                      |