@sentry/junior-github 0.154.0 → 0.155.0

package/dist/index.js

@@ -333,22 +333,36 @@ ${footer}` : footer;
 // src/tool-support/attribution.ts
 var GITHUB_REQUEST_ATTRIBUTION_START = "<!-- junior-request-attribution:start -->";
 var GITHUB_REQUEST_ATTRIBUTION_END = "<!-- junior-request-attribution:end -->";
-function cleanDisplayValue(value) {
+var SLACK_USER_ID_DISPLAY_PATTERN = /^[UW][A-Z0-9]{5,}$/;
+function cleanDisplayValue(value, userId) {
   const cleaned = value?.replace(/[\r\n<>]/g, " ").trim();
-  return cleaned || void 0;
+  if (!cleaned) {
+    return void 0;
+  }
+  if (cleaned.toLowerCase() === "unknown") {
+    return void 0;
+  }
+  if (userId && cleaned === userId) {
+    return void 0;
+  }
+  if (SLACK_USER_ID_DISPLAY_PATTERN.test(cleaned)) {
+    return void 0;
+  }
+  return cleaned;
 }
-function actorLabel(actor) {
+function requesterLabel(args) {
+  const { actor, identity, user } = args;
   if (!actor) {
     return void 0;
   }
   if (actor.platform === "system") {
     return `Junior system actor \`${actor.name}\``;
   }
-  const display = cleanDisplayValue(actor.fullName) ?? cleanDisplayValue(actor.userName) ?? cleanDisplayValue(actor.userId);
+  const userId = actor.userId;
+  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 appendGitHubRequesterAttribution(body, actor) {
-  const label = actorLabel(actor);
+function applyAttribution(body, label) {
   const attribution = label ? `${GITHUB_REQUEST_ATTRIBUTION_START}
 Requested by ${label}.
 ${GITHUB_REQUEST_ATTRIBUTION_END}` : void 0;
@@ -366,6 +380,26 @@ ${GITHUB_REQUEST_ATTRIBUTION_END}` : void 0;
 
 ${attribution}` : attribution;
 }
+async function appendGitHubRequesterAttribution(body, ctx) {
+  let resolved;
+  if (ctx.actor) {
+    try {
+      resolved = await ctx.users.resolveActor();
+    } catch (error) {
+      ctx.log.warn("github.requester_attribution.resolve_actor.failed", {
+        "exception.message": error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  return applyAttribution(
+    body,
+    requesterLabel({
+      actor: ctx.actor,
+      identity: resolved?.identity,
+      user: resolved?.user
+    })
+  );
+}
 
 // src/tools/create-issue.ts
 var GITHUB_ISSUE_CREATE_IDEMPOTENCY_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
@@ -516,7 +550,7 @@ function isDefinitiveGitHubIssueCreateRejection(error) {
   }
   return [400, 401, 404, 410, 422].includes(error.status);
 }
-function createGitHubIssueRequest(conversationId, input, actor, dashboardUrl) {
+async function createGitHubIssueRequest(conversationId, input, ctx, dashboardUrl) {
   const repo = parseRepo2(input.repo);
   const labels = input.labels?.map(
     (label) => nonEmptyString2(label, "labels entry")
@@ -524,7 +558,7 @@ function createGitHubIssueRequest(conversationId, input, actor, dashboardUrl) {
   const payload = {
     title: nonEmptyString2(input.title, "title"),
     body: appendGitHubFooter(
-      appendGitHubRequesterAttribution(input.body ?? "", actor),
+      await appendGitHubRequesterAttribution(input.body ?? "", ctx),
       conversationId,
       dashboardUrl
     ),
@@ -624,10 +658,10 @@ function createGitHubIssueTool(ctx) {
               "GitHub issue creation for this tool call has an uncertain pending result; refusing to create a duplicate issue."
             );
           }
-          const request = createGitHubIssueRequest(
+          const request = await createGitHubIssueRequest(
             conversationId,
             parsedInput,
-            ctx.actor,
+            ctx,
             ctx.slack?.conversationLink?.url
           );
           const pendingState = {
@@ -1047,14 +1081,14 @@ function isDefinitiveGitHubPullRequestCreateRejection(error) {
   }
   return [400, 401, 404, 410, 422].includes(error.status);
 }
-function createGitHubPullRequestRequest(conversationId, input, actor, dashboardUrl) {
+async function createGitHubPullRequestRequest(conversationId, input, ctx, dashboardUrl) {
   const repo = parseRepo4(input.repo);
   const payload = {
     title: nonEmptyString3(input.title, "title"),
     head: nonEmptyString3(input.head, "head"),
     base: nonEmptyString3(input.base, "base"),
     body: appendGitHubFooter(
-      appendGitHubRequesterAttribution(input.body ?? "", actor),
+      await appendGitHubRequesterAttribution(input.body ?? "", ctx),
       conversationId,
       dashboardUrl
     ),
@@ -1173,10 +1207,10 @@ function createGitHubPullRequestTool(ctx) {
               "GitHub pull request creation for this tool call has an uncertain pending result; refusing to create a duplicate pull request."
             );
           }
-          const request = createGitHubPullRequestRequest(
+          const request = await createGitHubPullRequestRequest(
             conversationId,
             parsedInput,
-            ctx.actor,
+            ctx,
             ctx.slack?.conversationLink?.url
           );
           const pendingState = {
@@ -1674,7 +1708,7 @@ function createGitHubUpdatePullRequestTool(ctx) {
         ...update.title !== void 0 ? { title: update.title } : {},
         ...update.body !== void 0 ? {
           body: appendGitHubFooter(
-            appendGitHubRequesterAttribution(update.body, ctx.actor),
+            await appendGitHubRequesterAttribution(update.body, ctx),
             nonEmptyString4(ctx.conversationId, "conversationId"),
             ctx.slack?.conversationLink?.url
           )
@@ -1822,7 +1856,8 @@ var juniorGitHubPullRequests = pgTable(
     index("junior_github_pull_requests_opened_at_idx").on(table.openedAt),
     index("junior_github_pull_requests_merged_at_idx").on(table.mergedAt),
     index("junior_github_pull_requests_closed_at_idx").on(table.closedAt),
-    index("junior_github_pull_requests_open_idx").on(table.pullRequestId).where(sql`${table.state} = 'open'`)
+    index("junior_github_pull_requests_open_idx").on(table.pullRequestId).where(sql`${table.state} = 'open'`),
+    index("junior_github_pull_requests_unmerged_conversations_idx").using("gin", table.conversationIds).where(sql`${table.state} <> 'merged'`)
   ]
 );
 var juniorGitHubPullRequestIssues = pgTable(
@@ -1912,7 +1947,7 @@ async function recordGitHubIssueConversations(db, input) {
 }
 
 // src/pull-request-outcomes/store.ts
-import { and as and2, eq as eq2, lte as lte2, sql as sql3 } from "drizzle-orm";
+import { and as and2, eq as eq2, lte as lte2, ne, sql as sql3 } from "drizzle-orm";
 import { z as z11 } from "zod";
 var githubPullRequestOutcomeInputSchema = z11.object({
   candidateOwned: z11.boolean(),
@@ -1986,6 +2021,29 @@ async function recordGitHubPullRequestOutcome(db, input) {
     conversationIds: inserted[0]?.conversationIds ?? []
   };
 }
+async function listGitHubUnfinishedWork(db, conversationIds) {
+  if (conversationIds.length === 0) return [];
+  const values = sql3.join(
+    conversationIds.map((id) => sql3`${id}`),
+    sql3`, `
+  );
+  const rows = await db.select({ conversationIds: juniorGitHubPullRequests.conversationIds }).from(juniorGitHubPullRequests).where(
+    and2(
+      ne(juniorGitHubPullRequests.state, "merged"),
+      sql3`${juniorGitHubPullRequests.conversationIds} && ARRAY[${values}]::text[]`
+    )
+  );
+  const candidates = new Set(conversationIds);
+  return [
+    ...new Set(
+      rows.flatMap(
+        (row) => row.conversationIds.filter(
+          (conversationId) => candidates.has(conversationId)
+        )
+      )
+    )
+  ];
+}
 async function recordGitHubPullRequestConversations(db, input) {
   const association = githubPullRequestConversationsInputSchema.parse(input);
   const conversationIds = sql3.join(
@@ -4647,6 +4705,14 @@ function githubPlugin(options = {}) {
       ]
     },
     hooks: {
+      async unfinishedWork(ctx) {
+        return {
+          conversationIds: await listGitHubUnfinishedWork(
+            ctx.db,
+            ctx.conversationIds
+          )
+        };
+      },
       routes(ctx) {
         return [
           createGitHubWebhookRoute({

package/dist/pull-request-outcomes/store.d.ts

@@ -46,6 +46,8 @@ export declare function recordGitHubPullRequestOutcome(db: GitHubDb, input: GitH
     commitComposition: GitHubPullRequestCommitComposition | undefined;
     conversationIds: string[];
 }>;
+/** Return candidate conversations that have an associated unmerged pull request. */
+export declare function listGitHubUnfinishedWork(db: GitHubDb, conversationIds: string[]): Promise<string[]>;
 /** Append native conversation ids to an existing Junior-owned PR projection. */
 export declare function recordGitHubPullRequestConversations(db: GitHubDb, input: GitHubPullRequestConversationsInput): Promise<boolean>;
 /** Link an existing Junior-owned PR to tracked issues across repositories. */

package/dist/tool-support/attribution.d.ts

@@ -1,5 +1,10 @@
-import type { Actor } from "@sentry/junior-plugin-api";
+import type { ToolRegistrationHookContext } from "@sentry/junior-plugin-api";
 export declare const GITHUB_REQUEST_ATTRIBUTION_START = "<!-- junior-request-attribution:start -->";
 export declare const GITHUB_REQUEST_ATTRIBUTION_END = "<!-- junior-request-attribution:end -->";
-/** Append or replace runtime-owned requester attribution in a GitHub body. */
-export declare function appendGitHubRequesterAttribution(body: string, actor: Actor | undefined): string;
+/**
+ * Append or replace runtime-owned requester attribution in a GitHub body.
+ *
+ * Identity lookup is best-effort presentation data. A storage failure falls
+ * back to the already-hydrated actor profile instead of blocking the write.
+ */
+export declare function appendGitHubRequesterAttribution(body: string, ctx: Pick<ToolRegistrationHookContext, "actor" | "log" | "users">): Promise<string>;

package/migrations/0007_shallow_millenium_guard.sql

@@ -0,0 +1 @@
+CREATE INDEX "junior_github_pull_requests_unmerged_conversations_idx" ON "junior_github_pull_requests" USING gin ("conversation_ids") WHERE "junior_github_pull_requests"."state" <> 'merged';

package/migrations/meta/0007_snapshot.json

@@ -0,0 +1,352 @@
+{
+  "id": "a54d392c-28bb-4cd3-ba14-1bcfa793fcce",
+  "prevId": "5c4638ae-9d00-4ebe-8d93-989a8c3f879b",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.junior_github_issues": {
+      "name": "junior_github_issues",
+      "schema": "",
+      "columns": {
+        "issue_id": {
+          "name": "issue_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repository_full_name": {
+          "name": "repository_full_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number": {
+          "name": "number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_reason": {
+          "name": "state_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "conversation_ids": {
+          "name": "conversation_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "ARRAY[]::text[]"
+        },
+        "opened_at": {
+          "name": "opened_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "closed_at": {
+          "name": "closed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "junior_github_issues_opened_at_idx": {
+          "name": "junior_github_issues_opened_at_idx",
+          "columns": [
+            {
+              "expression": "opened_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "junior_github_issues_closed_at_idx": {
+          "name": "junior_github_issues_closed_at_idx",
+          "columns": [
+            {
+              "expression": "closed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "junior_github_issues_open_idx": {
+          "name": "junior_github_issues_open_idx",
+          "columns": [
+            {
+              "expression": "issue_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"junior_github_issues\".\"state\" = 'open'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.junior_github_pull_request_issues": {
+      "name": "junior_github_pull_request_issues",
+      "schema": "",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "issue_repository_full_name": {
+          "name": "issue_repository_full_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "issue_number": {
+          "name": "issue_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "junior_github_pull_request_issues_pull_request_id_junior_github_pull_requests_pull_request_id_fk": {
+          "name": "junior_github_pull_request_issues_pull_request_id_junior_github_pull_requests_pull_request_id_fk",
+          "tableFrom": "junior_github_pull_request_issues",
+          "tableTo": "junior_github_pull_requests",
+          "columnsFrom": [
+            "pull_request_id"
+          ],
+          "columnsTo": [
+            "pull_request_id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "junior_github_pull_request_issues_pull_request_id_issue_repository_full_name_issue_number_pk": {
+          "name": "junior_github_pull_request_issues_pull_request_id_issue_repository_full_name_issue_number_pk",
+          "columns": [
+            "pull_request_id",
+            "issue_repository_full_name",
+            "issue_number"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.junior_github_pull_requests": {
+      "name": "junior_github_pull_requests",
+      "schema": "",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "repository_id": {
+          "name": "repository_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repository_full_name": {
+          "name": "repository_full_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number": {
+          "name": "number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "commit_composition": {
+          "name": "commit_composition",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "conversation_ids": {
+          "name": "conversation_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "ARRAY[]::text[]"
+        },
+        "opened_at": {
+          "name": "opened_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "merged_at": {
+          "name": "merged_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "closed_at": {
+          "name": "closed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "junior_github_pull_requests_opened_at_idx": {
+          "name": "junior_github_pull_requests_opened_at_idx",
+          "columns": [
+            {
+              "expression": "opened_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "junior_github_pull_requests_merged_at_idx": {
+          "name": "junior_github_pull_requests_merged_at_idx",
+          "columns": [
+            {
+              "expression": "merged_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "junior_github_pull_requests_closed_at_idx": {
+          "name": "junior_github_pull_requests_closed_at_idx",
+          "columns": [
+            {
+              "expression": "closed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "junior_github_pull_requests_open_idx": {
+          "name": "junior_github_pull_requests_open_idx",
+          "columns": [
+            {
+              "expression": "pull_request_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"junior_github_pull_requests\".\"state\" = 'open'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "junior_github_pull_requests_unmerged_conversations_idx": {
+          "name": "junior_github_pull_requests_unmerged_conversations_idx",
+          "columns": [
+            {
+              "expression": "conversation_ids",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"junior_github_pull_requests\".\"state\" <> 'merged'",
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}

package/migrations/meta/_journal.json

@@ -50,6 +50,13 @@
       "when": 1784947522832,
       "tag": "0006_fat_korvac",
       "breakpoints": true
+    },
+    {
+      "idx": 7,
+      "version": "7",
+      "when": 1786486305688,
+      "tag": "0007_shallow_millenium_guard",
+      "breakpoints": true
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.154.0",
+  "version": "0.155.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.154.0"
+    "@sentry/junior-plugin-api": "0.155.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",