pr-shepherd 0.51.0 → 0.51.1

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "pr-shepherd",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "author": {
     "name": "Jonathan Ong",
     "email": "jonathanrichardong@gmail.com"

package/bin/checks/log-excerpt.d.mts

@@ -0,0 +1 @@
+export declare function buildLogExcerpt(raw: string): string | undefined;

package/bin/checks/log-excerpt.mjs

@@ -0,0 +1,192 @@
+import { loadConfig } from "../config/load.mjs";
+const LOG_EXCERPT_CONTEXT_LINES = 16;
+const LOG_EXCERPT_TAIL_LINES = 28;
+const LOG_EXCERPT_MAX_CHARS = 4_000;
+const TRUNCATED_MARK = "[truncated]";
+const ANSI_SGR_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+const STEP_GROUP_RE = /^##\[group\](?:Run |Post )/;
+const GROUP_RE = /^##\[group\]/;
+const ENDGROUP_RE = /^##\[endgroup\]$/;
+const POST_JOB_RE = /^(?:Post job cleanup\.?|Cleaning up orphan processes)$/;
+export function buildLogExcerpt(raw) {
+    const ignorePatterns = compileIgnoreLogLinePatterns();
+    const prepared = raw
+        .split(/\r?\n/)
+        .map(cleanLogLine)
+        .filter((line) => line.trim() !== "");
+    if (prepared.length === 0)
+        return undefined;
+    const isolated = isolateFailedStep(prepared);
+    const lines = isolated.lines
+        .map(stripGroupMarkers)
+        .filter((line) => line.trim() !== "" && !isNoiseLine(line, ignorePatterns));
+    if (lines.length === 0)
+        return undefined;
+    const aggregateExcerpt = buildAggregateJobResultsExcerpt(lines);
+    if (aggregateExcerpt !== undefined)
+        return aggregateExcerpt;
+    if (isolated.isolated) {
+        const errorIndex = findLogExcerptAnchor(lines);
+        return truncateTail(lines.join("\n"), errorIndex === -1 ? undefined : lines[errorIndex]);
+    }
+    return boundFallbackExcerpt(lines);
+}
+function isolateFailedStep(lines) {
+    const postJob = lines.findIndex((line) => POST_JOB_RE.test(line));
+    const capped = postJob === -1 ? lines : lines.slice(0, postJob);
+    const anchor = findLogExcerptAnchor(capped);
+    const groupStart = findPrecedingStepGroup(capped, anchor === -1 ? capped.length - 1 : anchor);
+    if (groupStart === -1)
+        return { lines: capped, isolated: false };
+    const endgroup = findMatchingEndgroup(capped, groupStart);
+    const after = endgroup === -1 ? groupStart + 1 : endgroup + 1;
+    const next = findNextStepGroup(capped, after);
+    return { lines: capped.slice(after, next === -1 ? capped.length : next), isolated: true };
+}
+function findPrecedingStepGroup(lines, from) {
+    for (let i = Math.min(from, lines.length - 1); i >= 0; i--) {
+        if (STEP_GROUP_RE.test(lines[i] ?? ""))
+            return i;
+    }
+    return -1;
+}
+function findMatchingEndgroup(lines, groupStart) {
+    let depth = 0;
+    for (let i = groupStart; i < lines.length; i++) {
+        const line = lines[i] ?? "";
+        if (GROUP_RE.test(line))
+            depth++;
+        else if (ENDGROUP_RE.test(line) && --depth === 0)
+            return i;
+    }
+    return -1;
+}
+function findNextStepGroup(lines, from) {
+    let depth = 0;
+    for (let i = from; i < lines.length; i++) {
+        const line = lines[i] ?? "";
+        if (GROUP_RE.test(line)) {
+            if (depth === 0 && STEP_GROUP_RE.test(line))
+                return i;
+            depth++;
+        }
+        else if (ENDGROUP_RE.test(line) && depth > 0)
+            depth--;
+    }
+    return -1;
+}
+function boundFallbackExcerpt(lines) {
+    const errorIndex = findLogExcerptAnchor(lines);
+    if (errorIndex === -1) {
+        return truncateLogExcerpt(lines.slice(-LOG_EXCERPT_TAIL_LINES).join("\n"));
+    }
+    const start = Math.max(0, errorIndex - LOG_EXCERPT_CONTEXT_LINES);
+    const excerpt = lines.slice(start, Math.min(lines.length, errorIndex + LOG_EXCERPT_CONTEXT_LINES + 1));
+    return truncateAnchoredExcerpt(excerpt, errorIndex - start);
+}
+function findLogExcerptAnchor(lines) {
+    const explicitError = lines.findIndex((line) => line.includes("##[error]"));
+    if (explicitError !== -1)
+        return explicitError;
+    return lines.findIndex((line) => /\b(error|failed|cancelled)\b/i.test(line));
+}
+function buildAggregateJobResultsExcerpt(lines) {
+    const jobResults = extractJobResults(lines);
+    if (jobResults === undefined)
+        return undefined;
+    const failed = Object.entries(jobResults)
+        .map(([name, value]) => ({ name, result: extractJobResult(value) }))
+        .filter((entry) => entry.result !== undefined && !["success", "skipped"].includes(entry.result));
+    if (failed.length === 0)
+        return undefined;
+    return truncateLogExcerpt([
+        ...lines.filter((line) => /required jobs failed|exit code \d+/i.test(line)),
+        "Job results (non-success):",
+        ...failed.map((entry) => `${entry.name}: ${entry.result}`),
+    ].join("\n"));
+}
+function extractJobResults(lines) {
+    const startIndex = lines.findIndex((line) => line.includes("Job results:"));
+    if (startIndex === -1)
+        return undefined;
+    const block = collectJsonBlock(lines, startIndex);
+    if (block === undefined)
+        return undefined;
+    try {
+        const parsed = JSON.parse(block);
+        return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)
+            ? parsed
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function collectJsonBlock(lines, startIndex) {
+    const startLine = lines[startIndex] ?? "";
+    const objectStart = startLine.indexOf("{");
+    if (objectStart === -1)
+        return undefined;
+    const collected = [startLine.slice(objectStart)];
+    let depth = braceDepth(collected[0]);
+    for (let i = startIndex + 1; i < lines.length && depth > 0; i++) {
+        const line = lines[i] ?? "";
+        collected.push(line);
+        depth += braceDepth(line);
+    }
+    return depth === 0 ? collected.join("\n") : undefined;
+}
+function braceDepth(line) {
+    return [...line].reduce((depth, ch) => {
+        if (ch === "{")
+            return depth + 1;
+        if (ch === "}")
+            return depth - 1;
+        return depth;
+    }, 0);
+}
+function extractJobResult(value) {
+    if (value === null || typeof value !== "object" || Array.isArray(value))
+        return undefined;
+    const result = value.result;
+    return typeof result === "string" ? result : undefined;
+}
+function truncateLogExcerpt(text) {
+    if (text.length <= LOG_EXCERPT_MAX_CHARS)
+        return text;
+    return `${text.slice(0, LOG_EXCERPT_MAX_CHARS - `\n${TRUNCATED_MARK}`.length).trimEnd()}\n${TRUNCATED_MARK}`;
+}
+function truncateAnchoredExcerpt(lines, anchorIndex) {
+    const text = lines.join("\n");
+    if (text.length <= LOG_EXCERPT_MAX_CHARS)
+        return text;
+    return truncateLogExcerpt(`${TRUNCATED_MARK}\n${lines.slice(anchorIndex).join("\n")}`);
+}
+function truncateTail(text, keep) {
+    if (text.length <= LOG_EXCERPT_MAX_CHARS)
+        return text;
+    const head = `${TRUNCATED_MARK}\n`;
+    const slice = text.slice(-(LOG_EXCERPT_MAX_CHARS - head.length));
+    const nl = slice.indexOf("\n");
+    const tail = `${head}${nl === -1 ? slice : slice.slice(nl + 1)}`;
+    if (!keep || tail.includes(keep))
+        return tail;
+    const from = text.lastIndexOf(keep);
+    return from === -1 ? tail : truncateLogExcerpt(`${head}${text.slice(from)}`);
+}
+function compileIgnoreLogLinePatterns() {
+    return loadConfig().checks.ignoreLogLines.map((pattern) => new RegExp(pattern));
+}
+function isNoiseLine(line, patterns) {
+    return patterns.some((re) => re.test(line));
+}
+function cleanLogLine(line) {
+    return line
+        .replace(/^\uFEFF/, "")
+        .replace(ANSI_SGR_RE, "")
+        .replace(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z\s*/, "")
+        .trimEnd();
+}
+function stripGroupMarkers(line) {
+    return line.replace(/##\[(?:group|endgroup)\]/g, "");
+}

package/bin/checks/triage.mjs

@@ -1,13 +1,8 @@
 /* eslint-disable max-lines */
 import { restWithRateLimit, restText } from "../github/http.mjs";
 import { loadDerived, storeDerived } from "../state/rest-cache.mjs";
-import { loadConfig } from "../config/load.mjs";
+import { buildLogExcerpt } from "./log-excerpt.mjs";
 const STARTUP_FAILURE_STATUS = "startup_failure";
-const LOG_EXCERPT_CONTEXT_LINES = 16;
-const LOG_EXCERPT_TAIL_LINES = 28;
-const LOG_EXCERPT_MAX_CHARS = 4_000;
-const TRUNCATED_SUFFIX = "\n[truncated]";
-const ANSI_SGR_RE = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
 export function triageFailingChecks(failingChecks, repo, stateKey) {
     const jobsCache = new Map();
     return Promise.all(failingChecks.map((c) => triageCheck(c, repo, jobsCache, stateKey)));
@@ -163,7 +158,7 @@ function pickJobInfo(jobs, checkName) {
  * never gets frozen into the cache.
  */
 async function fetchJobLogExcerpt(jobId, repo, stateKey, cacheable = false) {
-    const cacheName = `joblog-${jobId}`;
+    const cacheName = `joblog-v2-${jobId}`;
     if (stateKey && cacheable) {
         const cached = await loadDerived(stateKey, cacheName);
         if (cached)
@@ -181,117 +176,3 @@ async function fetchJobLogExcerpt(jobId, repo, stateKey, cacheable = false) {
         return undefined;
     }
 }
-function buildLogExcerpt(raw) {
-    const ignorePatterns = compileIgnoreLogLinePatterns();
-    const lines = raw
-        .split(/\r?\n/)
-        .map(cleanLogLine)
-        .filter((line) => line.trim() !== "" && !isNoiseLine(line, ignorePatterns));
-    if (lines.length === 0)
-        return undefined;
-    const aggregateExcerpt = buildAggregateJobResultsExcerpt(lines);
-    if (aggregateExcerpt !== undefined)
-        return aggregateExcerpt;
-    const errorIndex = findLogExcerptAnchor(lines);
-    if (errorIndex === -1)
-        return truncateLogExcerpt(lines.slice(-LOG_EXCERPT_TAIL_LINES).join("\n"));
-    const start = Math.max(0, errorIndex - LOG_EXCERPT_CONTEXT_LINES);
-    const excerpt = lines.slice(start, Math.min(lines.length, errorIndex + LOG_EXCERPT_CONTEXT_LINES + 1));
-    return truncateAnchoredExcerpt(excerpt, errorIndex - start);
-}
-function findLogExcerptAnchor(lines) {
-    const explicitError = lines.findIndex((line) => line.includes("##[error]"));
-    if (explicitError !== -1)
-        return explicitError;
-    return lines.findIndex((line) => /\b(error|failed|cancelled)\b/i.test(line));
-}
-function buildAggregateJobResultsExcerpt(lines) {
-    const jobResults = extractJobResults(lines);
-    if (jobResults === undefined)
-        return undefined;
-    const failed = Object.entries(jobResults)
-        .map(([name, value]) => ({ name, result: extractJobResult(value) }))
-        .filter((entry) => entry.result !== undefined && !["success", "skipped"].includes(entry.result));
-    if (failed.length === 0)
-        return undefined;
-    const output = [
-        ...lines.filter((line) => /required jobs failed|exit code \d+/i.test(line)),
-        "Job results (non-success):",
-        ...failed.map((entry) => `${entry.name}: ${entry.result}`),
-    ];
-    return truncateLogExcerpt(output.join("\n"));
-}
-function extractJobResults(lines) {
-    const startIndex = lines.findIndex((line) => line.includes("Job results:"));
-    if (startIndex === -1)
-        return undefined;
-    const block = collectJsonBlock(lines, startIndex);
-    if (block === undefined)
-        return undefined;
-    try {
-        const parsed = JSON.parse(block);
-        return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)
-            ? parsed
-            : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
-function collectJsonBlock(lines, startIndex) {
-    const startLine = lines[startIndex] ?? "";
-    const objectStart = startLine.indexOf("{");
-    if (objectStart === -1)
-        return undefined;
-    const collected = [startLine.slice(objectStart)];
-    let depth = braceDepth(collected[0]);
-    for (let i = startIndex + 1; i < lines.length && depth > 0; i++) {
-        const line = lines[i] ?? "";
-        collected.push(line);
-        depth += braceDepth(line);
-    }
-    return depth === 0 ? collected.join("\n") : undefined;
-}
-function braceDepth(line) {
-    return [...line].reduce((depth, ch) => {
-        if (ch === "{")
-            return depth + 1;
-        if (ch === "}")
-            return depth - 1;
-        return depth;
-    }, 0);
-}
-function extractJobResult(value) {
-    if (value === null || typeof value !== "object" || Array.isArray(value))
-        return undefined;
-    const result = value.result;
-    return typeof result === "string" ? result : undefined;
-}
-function truncateLogExcerpt(text) {
-    if (text.length <= LOG_EXCERPT_MAX_CHARS)
-        return text;
-    return `${text.slice(0, LOG_EXCERPT_MAX_CHARS - TRUNCATED_SUFFIX.length).trimEnd()}${TRUNCATED_SUFFIX}`;
-}
-function truncateAnchoredExcerpt(lines, anchorIndex) {
-    const text = lines.join("\n");
-    if (text.length <= LOG_EXCERPT_MAX_CHARS)
-        return text;
-    return truncateLogExcerpt(`${TRUNCATED_SUFFIX.trim()}\n${lines.slice(anchorIndex).join("\n")}`);
-}
-// User-configured via `checks.ignoreLogLines` (regex source strings) — empty by
-// default. What counts as noise varies by CI toolchain, so Shepherd ships no
-// built-in patterns; a project opts in via `.pr-shepherdrc.yml`.
-function compileIgnoreLogLinePatterns() {
-    return loadConfig().checks.ignoreLogLines.map((pattern) => new RegExp(pattern));
-}
-function isNoiseLine(line, patterns) {
-    return patterns.some((re) => re.test(line));
-}
-function cleanLogLine(line) {
-    return line
-        .replace(/^\uFEFF/, "")
-        .replace(ANSI_SGR_RE, "")
-        .replace(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?Z\s*/, "")
-        .replace(/##\[(?:group|endgroup)\]/g, "")
-        .trimEnd();
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "keywords": [
     "automation",
@@ -85,14 +85,14 @@
   "devDependencies": {
     "@types/node": "^26.0.0",
     "@types/picomatch": "^4.0.3",
-    "@vitest/coverage-v8": "^4.1.4",
+    "@vitest/coverage-v8": "^5.0.0",
     "husky": "^9.1.7",
     "knip": "^6.14.1",
     "marked": "^18.0.11",
-    "oxfmt": "^0.65.0",
+    "oxfmt": "^0.66.0",
     "oxlint": "^1.60.0",
     "typescript": "^7.0.2",
-    "vitest": "^4.1.4"
+    "vitest": "^5.0.0"
   },
   "engines": {
     "node": ">=22.18.0"

package/plugins/pr-shepherd/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.51.0",
+  "version": "0.51.1",
   "description": "Autonomous PR CI monitor and review-comment resolver for Codex.",
   "author": {
     "name": "Jonathan Ong",

package/plugins/pr-shepherd/.codex.mcp.json

@@ -2,7 +2,7 @@
   "mcpServers": {
     "pr-shepherd": {
       "command": "npx",
-      "args": ["--yes", "--package", "pr-shepherd@0.51.0", "pr-shepherd-mcp"]
+      "args": ["--yes", "--package", "pr-shepherd@0.51.1", "pr-shepherd-mcp"]
     }
   }
 }

package/plugins/pr-shepherd/.mcp.json

@@ -1,6 +1,6 @@
 {
   "pr-shepherd": {
     "command": "npx",
-    "args": ["--yes", "--package", "pr-shepherd@0.51.0", "pr-shepherd-mcp"]
+    "args": ["--yes", "--package", "pr-shepherd@0.51.1", "pr-shepherd-mcp"]
   }
 }