@sentry/junior-github 0.109.0 → 0.111.0

package/dist/index.js

@@ -1687,6 +1687,20 @@ var issueStatsSchema = z10.object({
   ...row,
   medianCloseTimeMs: row.medianCloseTimeMs ?? void 0
 }));
+var pullRequestDaySchema = z10.object({
+  closed: z10.number().int().nonnegative(),
+  created: z10.number().int().nonnegative(),
+  date: z10.string().date(),
+  merged: z10.number().int().nonnegative()
+}).strict();
+var issueDaySchema = z10.object({
+  closedCompleted: z10.number().int().nonnegative(),
+  closedDuplicate: z10.number().int().nonnegative(),
+  closedNotPlanned: z10.number().int().nonnegative(),
+  closedUnknown: z10.number().int().nonnegative(),
+  created: z10.number().int().nonnegative(),
+  date: z10.string().date()
+}).strict();
 var issueRepositoryStatsSchema = z10.object({
   closedCompleted: z10.number().int().nonnegative(),
   closedDuplicate: z10.number().int().nonnegative(),
@@ -1778,6 +1792,55 @@ async function aggregatePullRequestWindows(args) {
   `);
   return z10.array(pullRequestStatsSchema).parse(queryRows(result));
 }
+async function aggregatePullRequestDays(args) {
+  const end = new Date(args.nowMs);
+  const start = startOfUtcDay(args.nowMs - (WINDOWS.at(-1) - 1) * DAY_MS);
+  const table = juniorGitHubPullRequests;
+  const result = await args.db.execute(sql3`
+    WITH days AS (
+      SELECT generate_series(
+        date_trunc('day', ${start}::timestamptz AT TIME ZONE 'UTC'),
+        date_trunc('day', ${end}::timestamptz AT TIME ZONE 'UTC'),
+        interval '1 day'
+      ) AS day
+    ), events AS (
+      SELECT
+        date_trunc('day', ${table.openedAt} AT TIME ZONE 'UTC') AS day,
+        'created' AS kind
+      FROM ${table}
+      WHERE ${table.openedAt} >= ${start}
+      UNION ALL
+      SELECT
+        date_trunc('day', ${table.mergedAt} AT TIME ZONE 'UTC') AS day,
+        'merged' AS kind
+      FROM ${table}
+      WHERE ${table.state} = 'merged' AND ${table.mergedAt} >= ${start}
+      UNION ALL
+      SELECT
+        date_trunc('day', ${table.closedAt} AT TIME ZONE 'UTC') AS day,
+        'closed' AS kind
+      FROM ${table}
+      WHERE ${table.state} = 'closed_unmerged' AND ${table.closedAt} >= ${start}
+    ), daily AS (
+      SELECT
+        events.day,
+        count(*) FILTER (WHERE events.kind = 'created')::integer AS created,
+        count(*) FILTER (WHERE events.kind = 'merged')::integer AS merged,
+        count(*) FILTER (WHERE events.kind = 'closed')::integer AS closed
+      FROM events
+      GROUP BY events.day
+    )
+    SELECT
+      to_char(days.day, 'YYYY-MM-DD') AS "date",
+      coalesce(daily.created, 0)::integer AS "created",
+      coalesce(daily.merged, 0)::integer AS "merged",
+      coalesce(daily.closed, 0)::integer AS "closed"
+    FROM days
+    LEFT JOIN daily ON daily.day = days.day
+    ORDER BY days.day
+  `);
+  return z10.array(pullRequestDaySchema).parse(queryRows(result));
+}
 async function aggregatePullRequestRepositories(args) {
   const start = new Date(args.nowMs - 30 * DAY_MS);
   const table = juniorGitHubPullRequests;
@@ -1887,6 +1950,57 @@ async function aggregateIssueWindows(args) {
   `);
   return z10.array(issueStatsSchema).parse(queryRows(result));
 }
+async function aggregateIssueDays(args) {
+  const end = new Date(args.nowMs);
+  const start = startOfUtcDay(args.nowMs - (WINDOWS.at(-1) - 1) * DAY_MS);
+  const table = juniorGitHubIssues;
+  const result = await args.db.execute(sql3`
+    WITH days AS (
+      SELECT generate_series(
+        date_trunc('day', ${start}::timestamptz AT TIME ZONE 'UTC'),
+        date_trunc('day', ${end}::timestamptz AT TIME ZONE 'UTC'),
+        interval '1 day'
+      ) AS day
+    ), events AS (
+      SELECT
+        date_trunc('day', ${table.openedAt} AT TIME ZONE 'UTC') AS day,
+        'created' AS kind
+      FROM ${table}
+      WHERE ${table.openedAt} >= ${start}
+      UNION ALL
+      SELECT
+        date_trunc('day', ${table.closedAt} AT TIME ZONE 'UTC') AS day,
+        coalesce(${table.stateReason}, 'unknown') AS kind
+      FROM ${table}
+      WHERE ${table.state} = 'closed' AND ${table.closedAt} >= ${start}
+    ), daily AS (
+      SELECT
+        events.day,
+        count(*) FILTER (WHERE events.kind = 'created')::integer AS created,
+        count(*) FILTER (WHERE events.kind = 'completed')::integer
+          AS closed_completed,
+        count(*) FILTER (WHERE events.kind = 'duplicate')::integer
+          AS closed_duplicate,
+        count(*) FILTER (WHERE events.kind = 'not_planned')::integer
+          AS closed_not_planned,
+        count(*) FILTER (WHERE events.kind = 'unknown')::integer
+          AS closed_unknown
+      FROM events
+      GROUP BY events.day
+    )
+    SELECT
+      to_char(days.day, 'YYYY-MM-DD') AS "date",
+      coalesce(daily.created, 0)::integer AS "created",
+      coalesce(daily.closed_completed, 0)::integer AS "closedCompleted",
+      coalesce(daily.closed_duplicate, 0)::integer AS "closedDuplicate",
+      coalesce(daily.closed_not_planned, 0)::integer AS "closedNotPlanned",
+      coalesce(daily.closed_unknown, 0)::integer AS "closedUnknown"
+    FROM days
+    LEFT JOIN daily ON daily.day = days.day
+    ORDER BY days.day
+  `);
+  return z10.array(issueDaySchema).parse(queryRows(result));
+}
 async function aggregateIssueRepositories(args) {
   const start = new Date(args.nowMs - 30 * DAY_MS);
   const table = juniorGitHubIssues;
@@ -1937,11 +2051,25 @@ function formatDuration(value) {
 function formatCommitComposition(stats) {
   return `${stats.juniorOnly} Junior-only \xB7 ${stats.mixed} mixed \xB7 ${stats.compositionUnknown} unknown`;
 }
+function startOfUtcDay(timestampMs) {
+  const date = new Date(timestampMs);
+  date.setUTCHours(0, 0, 0, 0);
+  return date;
+}
 async function buildGitHubOutcomeReport(args) {
-  const [windows, repositories, issueWindows, issueRepositories] = await Promise.all([
+  const [
+    windows,
+    pullRequestDays,
+    repositories,
+    issueWindows,
+    issueDays,
+    issueRepositories
+  ] = await Promise.all([
     aggregatePullRequestWindows(args),
+    aggregatePullRequestDays(args),
     aggregatePullRequestRepositories(args),
     aggregateIssueWindows(args),
+    aggregateIssueDays(args),
     aggregateIssueRepositories(args)
   ]);
   const thirtyDays = windows.find((window) => window.days === 30);
@@ -1950,20 +2078,10 @@ async function buildGitHubOutcomeReport(args) {
     generatedAt: new Date(args.nowMs).toISOString(),
     title: "GitHub work delivered",
     metrics: [
-      { label: "PRs created \xB7 30d", value: String(thirtyDays.created) },
-      {
-        label: "PRs merged \xB7 30d",
-        tone: thirtyDays.merged > 0 ? "good" : "neutral",
-        value: String(thirtyDays.merged)
-      },
       {
         label: "Junior-only merge rate \xB7 30d",
         value: formatPercent(thirtyDays.juniorOnlyRate)
       },
-      {
-        label: "PRs closed unmerged \xB7 30d",
-        value: String(thirtyDays.closed)
-      },
       {
         label: "PR merge rate \xB7 30d",
         value: formatPercent(thirtyDays.mergeRate)
@@ -1972,46 +2090,60 @@ async function buildGitHubOutcomeReport(args) {
         label: "median PR merge time \xB7 30d",
         value: formatDuration(thirtyDays.medianMergeTimeMs)
       },
-      { label: "issues created \xB7 30d", value: String(issueThirtyDays.created) },
-      {
-        label: "issues completed \xB7 30d",
-        tone: issueThirtyDays.closedCompleted > 0 ? "good" : "neutral",
-        value: String(issueThirtyDays.closedCompleted)
-      },
-      {
-        label: "issues closed as duplicate \xB7 30d",
-        value: String(issueThirtyDays.closedDuplicate)
-      },
       {
-        label: "issues closed as not planned \xB7 30d",
-        value: String(issueThirtyDays.closedNotPlanned)
+        label: "median issue close time \xB7 30d",
+        value: formatDuration(issueThirtyDays.medianCloseTimeMs)
       }
     ],
-    recordSets: [
+    widgets: [
       {
-        title: "Pull request outcome windows",
-        fields: [
-          { key: "window", label: "Window" },
+        id: "pull-request-outcomes",
+        type: "bar_chart",
+        title: "Pull request outcomes",
+        description: "Daily outcomes",
+        timeRangeDays: [...WINDOWS],
+        series: [
           { key: "created", label: "Created" },
-          { key: "merged", label: "Merged" },
-          { key: "closed", label: "Closed unmerged" },
-          { key: "commitComposition", label: "Merged commit composition" },
-          { key: "mergeRate", label: "Merge rate" },
-          { key: "mergeTime", label: "Median merge time" }
+          { key: "merged", label: "Merged", tone: "good" },
+          { key: "closed", label: "Closed unmerged", tone: "danger" }
         ],
-        records: windows.map((stats) => ({
-          id: `${stats.days}d`,
+        categories: pullRequestDays.map((stats) => ({
+          id: stats.date,
+          label: stats.date,
           values: {
-            window: `${stats.days} days`,
-            created: String(stats.created),
-            merged: String(stats.merged),
-            closed: String(stats.closed),
-            commitComposition: formatCommitComposition(stats),
-            mergeRate: formatPercent(stats.mergeRate),
-            mergeTime: formatDuration(stats.medianMergeTimeMs)
+            created: stats.created,
+            merged: stats.merged,
+            closed: stats.closed
           }
         }))
       },
+      {
+        id: "issue-outcomes",
+        type: "bar_chart",
+        title: "Issue outcomes",
+        description: "Daily outcomes",
+        timeRangeDays: [...WINDOWS],
+        series: [
+          { key: "created", label: "Created" },
+          { key: "completed", label: "Completed", tone: "good" },
+          { key: "duplicate", label: "Duplicate", tone: "warning" },
+          { key: "notPlanned", label: "Not planned", tone: "danger" },
+          { key: "unknown", label: "Unknown" }
+        ],
+        categories: issueDays.map((stats) => ({
+          id: stats.date,
+          label: stats.date,
+          values: {
+            created: stats.created,
+            completed: stats.closedCompleted,
+            duplicate: stats.closedDuplicate,
+            notPlanned: stats.closedNotPlanned,
+            unknown: stats.closedUnknown
+          }
+        }))
+      }
+    ],
+    recordSets: [
       {
         title: "Pull request repositories \xB7 30d",
         emptyText: "No Junior-owned pull request activity yet.",
@@ -2035,30 +2167,6 @@ async function buildGitHubOutcomeReport(args) {
           }
         }))
       },
-      {
-        title: "Issue outcome windows",
-        fields: [
-          { key: "window", label: "Window" },
-          { key: "created", label: "Created" },
-          { key: "completed", label: "Completed" },
-          { key: "duplicate", label: "Duplicate" },
-          { key: "notPlanned", label: "Not planned" },
-          { key: "unknown", label: "Unknown reason" },
-          { key: "closeTime", label: "Median close time" }
-        ],
-        records: issueWindows.map((stats) => ({
-          id: `${stats.days}d`,
-          values: {
-            window: `${stats.days} days`,
-            created: String(stats.created),
-            completed: String(stats.closedCompleted),
-            duplicate: String(stats.closedDuplicate),
-            notPlanned: String(stats.closedNotPlanned),
-            unknown: String(stats.closedUnknown),
-            closeTime: formatDuration(stats.medianCloseTimeMs)
-          }
-        }))
-      },
       {
         title: "Issue repositories \xB7 30d",
         emptyText: "No Junior-owned issue activity yet.",
@@ -2317,6 +2425,52 @@ if [ -n "\${JUNIOR_GIT_ACTOR_COAUTHOR_TRAILERS:-}" ]; then
   done <<< "$JUNIOR_GIT_ACTOR_COAUTHOR_TRAILERS"
 fi
 
+# The hook owns co-author attribution. Remove every model-supplied co-author
+# from the final Git trailer block before appending the host-derived actors.
+tmp_file=$(mktemp)
+trap 'rm -f "$tmp_file"' EXIT
+awk '
+  { lines[NR] = $0 }
+  END {
+    line = NR
+    while (line > 0 && lines[line] == "") {
+      line--
+    }
+    start = line
+    while (start > 0 && lines[start] != "") {
+      start--
+    }
+    valid = line > 0
+    for (i = start + 1; valid && i <= line; i++) {
+      if (lines[i] !~ /^[[:alnum:]-]+: .+/) {
+        valid = 0
+      }
+    }
+    if (!valid) {
+      for (i = 1; i <= NR; i++) {
+        print lines[i]
+      }
+      exit 0
+    }
+    kept = 0
+    for (i = start + 1; i <= line; i++) {
+      if (tolower(lines[i]) !~ /^co-authored-by: /) {
+        kept++
+      }
+    }
+    before = kept > 0 ? start : start - 1
+    for (i = 1; i <= before; i++) {
+      print lines[i]
+    }
+    for (i = start + 1; i <= line; i++) {
+      if (tolower(lines[i]) !~ /^co-authored-by: /) {
+        print lines[i]
+      }
+    }
+  }
+' "$message_file" > "$tmp_file"
+cat "$tmp_file" > "$message_file"
+
 final_trailer_block=$(awk '
   { lines[NR] = $0 }
   END {
@@ -2342,57 +2496,6 @@ final_trailer_block=$(awk '
   }
 ' "$message_file")
 
-duplicate_desired_trailer=false
-while IFS= read -r desired_trailer; do
-  if [ -n "$desired_trailer" ] && [ "$(printf '%s\\n' "$final_trailer_block" | grep -Fxc -- "$desired_trailer")" -gt 1 ]; then
-    duplicate_desired_trailer=true
-    break
-  fi
-done <<< "$desired_trailers"
-
-if [ "$duplicate_desired_trailer" = true ]; then
-  tmp_file=$(mktemp)
-  desired_file=$(mktemp)
-  trap 'rm -f "$tmp_file" "$desired_file"' EXIT
-  printf '%s' "$desired_trailers" > "$desired_file"
-  awk -v desired_file="$desired_file" '
-    BEGIN {
-      while ((getline value < desired_file) > 0) {
-        if (value != "") {
-          wanted[value] = 1
-        }
-      }
-      close(desired_file)
-    }
-    { lines[NR] = $0 }
-    END {
-      line = NR
-      while (line > 0 && lines[line] == "") {
-        line--
-      }
-      start = line
-      while (start > 0 && lines[start] != "") {
-        start--
-      }
-      valid = line > 0
-      for (i = start + 1; valid && i <= line; i++) {
-        if (lines[i] !~ /^[[:alnum:]-]+: .+/) {
-          valid = 0
-        }
-      }
-      for (i = 1; i <= NR; i++) {
-        if (valid && i > start && i <= line && wanted[lines[i]]) {
-          if (seen[lines[i]]++) {
-            continue
-          }
-        }
-        print lines[i]
-      }
-    }
-  ' "$message_file" > "$tmp_file"
-  cat "$tmp_file" > "$message_file"
-fi
-
 missing_trailers=""
 collect_missing_trailer() {
   if ! printf '%s\\n' "$final_trailer_block" | grep -Fqx -- "$1"; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-github",
-  "version": "0.109.0",
+  "version": "0.111.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.109.0"
+    "@sentry/junior-plugin-api": "0.111.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",