bugpatrol 0.4.4 → 0.4.5

package/dist/bin.js

@@ -24382,6 +24382,7 @@ SKIP WHAT IS ALREADY ON GITHUB
 list_items also shows the Bugpatrol PRs and issues on GitHub. Other machines and earlier runs filed some of them.
 - If one of them already covers an item (the same problem, or a PR that changes the same code for it), skip the
   item. Reason: "Duplicate of #<number>".
+- A PR item's own issue, which list_items names, never counts: the PR closes it, so publish the item.
 - If a closed PR made the same change, skip the item. Reason: "Repeats the rejected PR #<number>".
 Write a plain, short summary of 2\u20135 sentences: what is wrong, for whom, and for a PR what changed and how Bugpatrol checked it.
 Do not repeat the full report. Bugpatrol adds screenshots, steps, the fix, and verification. Call finish when done.
@@ -40542,6 +40543,10 @@ var rank2 = { cosmetic: 0, minor: 1, major: 2, critical: 3 };
 function publishable(fix) {
   return fix.status === "verified" || fix.status === "proposed" && !judgedRetests(fix.retests).length;
 }
+var ownIssue = (item) => item.kind === "pr" ? item.issue.github?.number : void 0;
+var ownIssueNote = (item) => ownIssue(item) ? `This item's own GitHub issue is #${ownIssue(item)}. It is not a duplicate; this PR closes it.` : "";
+var citesOwnIssue = (item, text3) => ownIssue(item) !== void 0 && new RegExp(`#${ownIssue(item)}\\b`).test(text3);
+var skipHolds = (item, skip) => skip !== void 0 && !citesOwnIssue(item, skip.reason);
 var result2 = (text3, isError = false) => ({ content: [{ type: "text", text: text3 }], isError });
 var schema4 = (properties = {}, required = []) => ({
   type: "object",
@@ -40604,6 +40609,27 @@ async function reuseFiled(gh, repo, workspace, issues, outcomes, onLog) {
   }
   return handled;
 }
+async function recheckFalseSkips(gh, repo, items, onLog) {
+  const kept = [];
+  for (const item of items) {
+    const own = ownIssue(item);
+    if (!item.issue.publishSkipped || own === void 0) {
+      kept.push(item);
+      continue;
+    }
+    try {
+      const { state: state2, closedByPullRequestsReferences: prs = [] } = JSON.parse(await gh(["issue", "view", String(own), "--repo", repo, "--json", "state,closedByPullRequestsReferences"]));
+      if (state2 === "CLOSED" || prs.length) {
+        onLog?.(`${item.issue.id} stays skipped: #${own} is ${prs.length ? `closed by PR #${prs[0].number}` : "closed"}.`);
+        continue;
+      }
+      kept.push(item);
+    } catch (error) {
+      onLog?.(`GitHub lookup of #${own} failed, so ${item.issue.id} waits for the next run: ${String(error)}`);
+    }
+  }
+  return kept;
+}
 async function runPublisher(root2, config, deps = {}) {
   if (!config.agents.github.enabled && !deps.dryRun)
     return [];
@@ -40612,14 +40638,18 @@ async function runPublisher(root2, config, deps = {}) {
   const fixes = new Map((await workspace.listFixes()).map((fix) => [fix.issueId, fix]));
   const issues = (await workspace.listIssues()).filter((issue) => !deps.issueIds || deps.issueIds.includes(issue.id));
   let items = issues.flatMap((issue) => {
-    if (issue.status === "dismissed" || issue.publishSkipped || issue.fixRejected)
+    if (issue.status === "dismissed" || issue.fixRejected)
       return [];
     const found = fixes.get(issue.id);
     const fix = found?.external ? void 0 : found;
     if (fix?.status === "rejected")
       return [];
-    if (fix && !fix.pr && publishable(fix))
-      return [{ kind: "pr", issue, fix }];
+    if (fix && !fix.pr && publishable(fix)) {
+      const item = { kind: "pr", issue, fix };
+      return skipHolds(item, issue.publishSkipped) ? [] : [item];
+    }
+    if (issue.publishSkipped)
+      return [];
     if (!issue.github && !["fixed", "dismissed"].includes(issue.status) && rank2[issue.severity] >= rank2[config.agents.github.issueMinSeverity] && (!fix || ["declined", "failed"].includes(fix.status)))
       return [{ kind: "issue", issue, fix }];
     return [];
@@ -40639,7 +40669,7 @@ async function runPublisher(root2, config, deps = {}) {
     }
     resolved = { repo: ready.repo, defaultBranch: ready.defaultBranch };
     const handled = await reuseFiled(gh, resolved.repo, workspace, [...regressions, ...items.filter((item) => item.kind === "issue").map((item) => item.issue)], outcomes, deps.onLog);
-    items = items.filter((item) => item.kind === "pr" || !handled.has(item.issue.id));
+    items = await recheckFalseSkips(gh, resolved.repo, items.filter((item) => item.kind === "pr" || !handled.has(item.issue.id)), deps.onLog);
     if (!items.length)
       return outcomes;
   }
@@ -40652,6 +40682,8 @@ async function runPublisher(root2, config, deps = {}) {
   let steps = 0;
   let costUsd = 0;
   let status = "finished";
+  let ending = "finished without publishing or skipping it";
+  const publishErrors = /* @__PURE__ */ new Map();
   let assetsReady = false;
   let labelsReady = false;
   const get = (id2) => items.find((item) => item.issue.id === id2 && !done.has(id2));
@@ -40699,7 +40731,7 @@ async function runPublisher(root2, config, deps = {}) {
         description: "List issues ready to publish.",
         inputSchema: schema4(),
         async run() {
-          const list3 = items.filter((item) => !done.has(item.issue.id)).map((item) => `${item.issue.id} [${item.kind}, ${item.issue.severity}, fix: ${item.fix?.status ?? "none"}, retest: ${item.fix?.retests?.at(-1)?.outcome ?? "none"}]: ${item.issue.title}`).join("\n");
+          const list3 = items.filter((item) => !done.has(item.issue.id)).map((item) => `${item.issue.id} [${item.kind}, ${item.issue.severity}, fix: ${item.fix?.status ?? "none"}, retest: ${item.fix?.retests?.at(-1)?.outcome ?? "none"}]: ${item.issue.title} ${ownIssueNote(item)}`.trimEnd()).join("\n");
           const style = recentTitles.length ? `
 
 RECENT MERGED PR TITLES IN THIS REPO (use the same types and scopes)
@@ -40728,7 +40760,8 @@ ${item.issue.body}
 Judgement: ${item.issue.judgement.reason}
 Fix: ${item.fix?.summary ?? "(none)"}
 Diff: ${item.fix?.diffStat ?? "(none)"}
-Retest: ${last?.outcome ?? "none"} \u2014 ${last?.reason ?? ""}`;
+Retest: ${last?.outcome ?? "none"} \u2014 ${last?.reason ?? ""}
+${ownIssueNote(item)}`;
           const before = [...pathsFor({ ...item, fix: void 0 }, candidates)].slice(0, 4);
           const after = (last?.captures?.length ? last.captures.map((shot) => shot.after) : [last?.after]).filter((path) => Boolean(path)).slice(0, 4);
           const content = [
@@ -40783,7 +40816,7 @@ Retest: ${last?.outcome ?? "none"} \u2014 ${last?.reason ?? ""}`;
           try {
             const latestIssue = await workspace.readIssue(item.issue.id);
             const latestFix = item.fix && await workspace.readFix(item.fix.id);
-            if (!latestIssue || latestIssue.status === "dismissed" || latestIssue.publishSkipped || latestIssue.fixRejected || latestFix?.status === "rejected" || item.kind === "issue" && latestIssue.github || item.kind === "pr" && (!latestFix || latestFix.pr))
+            if (!latestIssue || latestIssue.status === "dismissed" || skipHolds(item, latestIssue.publishSkipped) || latestIssue.fixRejected || latestFix?.status === "rejected" || item.kind === "issue" && latestIssue.github || item.kind === "pr" && (!latestFix || latestFix.pr))
               return result2("This item was dismissed or already handled.", true);
             Object.assign(item.issue, latestIssue);
             if (item.fix && latestFix)
@@ -40842,6 +40875,10 @@ Retest: ${last?.outcome ?? "none"} \u2014 ${last?.reason ?? ""}`;
                 at: (/* @__PURE__ */ new Date()).toISOString()
               };
               await workspace.saveFix(item.fix);
+              if (item.issue.publishSkipped) {
+                item.issue.publishSkipped = void 0;
+                await workspace.saveIssue(item.issue);
+              }
             } else {
               const opened = await createIssue(gh, {
                 repo: resolved.repo,
@@ -40866,6 +40903,7 @@ Retest: ${last?.outcome ?? "none"} \u2014 ${last?.reason ?? ""}`;
           } catch (error) {
             if (item.fix?.commit)
               await workspace.saveFix(item.fix);
+            publishErrors.set(item.issue.id, String(error));
             return result2(String(error), true);
           }
         }
@@ -40881,8 +40919,10 @@ Retest: ${last?.outcome ?? "none"} \u2014 ${last?.reason ?? ""}`;
           const reason2 = String(input.reason ?? "").trim();
           if (!reason2)
             return result2("A reason is required.", true);
+          if (citesOwnIssue(item, reason2))
+            return result2(`${ownIssueNote(item)} Publish it instead of skipping.`, true);
           const latest = await workspace.readIssue(item.issue.id);
-          if (!latest || latest.status === "dismissed" || latest.publishSkipped)
+          if (!latest || latest.status === "dismissed" || skipHolds(item, latest.publishSkipped))
             return result2("This item was dismissed or already handled.", true);
           Object.assign(item.issue, latest);
           item.issue.publishSkipped = { reason: vars.redact(reason2), at: (/* @__PURE__ */ new Date()).toISOString() };
@@ -40922,15 +40962,29 @@ ${items.map((item) => `${item.issue.id}: ${item.issue.title}`).join("\n")}`),
     }, session.emit);
     steps = outcome2.steps;
     costUsd = outcome2.costUsd;
+    if (outcome2.stop !== "done")
+      ending = `stopped early (${outcome2.stop})`;
   } catch (error) {
     status = "failed";
+    ending = `failed: ${String(error)}`;
     session.emit({ kind: "error", summary: `GitHub publishing failed: ${String(error)}` });
     deps.onLog?.(`GitHub publishing failed: ${String(error)}`);
   } finally {
+    const left = session.cancelled ? [] : items.filter((item) => !done.has(item.issue.id));
+    for (const { issue } of left) {
+      const error = publishErrors.get(issue.id);
+      outcomes.push({
+        issueId: issue.id,
+        kind: "unpublished",
+        reason: vars.redact(`The publisher ${ending}.${error ? ` Its publish failed: ${error}` : ""}`)
+      });
+    }
+    if (left.length)
+      status = "failed";
     const prs = outcomes.filter((item) => item.kind === "pr").length;
     const issues2 = outcomes.filter((item) => item.kind === "issue").length;
     const skipped = outcomes.filter((item) => item.kind === "skipped").length;
-    const summary = `${deps.dryRun ? "Drafted" : "Published"} ${prs} PR(s) and ${issues2} issue(s); skipped ${skipped}`;
+    const summary = `${deps.dryRun ? "Drafted" : "Published"} ${prs} PR(s) and ${issues2} issue(s); skipped ${skipped}${left.length ? `; ${left.length} left unpublished` : ""}`;
     await workspace.endSession(record.id, { summary, status, steps, costUsd });
     session.emit({ kind: "session-end", summary });
     await session.idle(costUsd);
@@ -42223,14 +42277,19 @@ async function runPatrol(options) {
           problems.push(`Cycle ${cycle}: the retest of ${fix.issueId} failed: ${last.reason}`);
       }
       const cycleFailed = problems.length > before;
-      if (!interrupted && config.agents.github.enabled)
-        await runPublisher(root2, config, {
+      if (!interrupted && config.agents.github.enabled) {
+        const outcomes = await runPublisher(root2, config, {
           createRuntime: options.createRuntime,
           onLog: options.onLog,
           onSession: (session) => {
             activeSession = session;
           }
         });
+        for (const item of outcomes.filter((outcome2) => outcome2.kind === "unpublished")) {
+          problems.push(`Cycle ${cycle}: ${item.issueId} was not published: ${item.reason}`);
+          options.onLog?.(problems.at(-1));
+        }
+      }
       if (!interrupted && config.agents.github.enabled) {
         const ci = await watchCi(root2, config, {
           createRuntime: options.createRuntime,
@@ -47350,11 +47409,15 @@ ${problems.map((problem) => `- ${problem.split("\n")[0]}`).join("\n")}`);
       return;
     }
     for (const item of outcomes) {
-      const kind = item.kind === "pr" ? flags.dryRun ? "PR draft" : "PR" : item.kind === "issue" ? flags.dryRun ? "issue draft" : "issue" : "skipped";
+      const kind = item.kind === "pr" ? flags.dryRun ? "PR draft" : "PR" : item.kind === "issue" ? flags.dryRun ? "issue draft" : "issue" : item.kind;
       log(`  ${kind.padEnd(11)} ${item.issueId}  ${item.url ?? item.reason ?? ""}`);
     }
     const count = (kind) => outcomes.filter((item) => item.kind === kind).length;
     log(`${flags.dryRun ? "Wrote" : "Opened"} ${count("pr")} PR(s) and ${count("issue")} issue(s); skipped ${count("skipped")}.`);
+    if (count("unpublished")) {
+      log(`${count("unpublished")} item(s) were not published. Run \`bugpatrol publish\` again after you fix the cause.`);
+      process.exitCode = 1;
+    }
     return;
   }
   if (command === "review") {
@@ -49330,7 +49393,7 @@ legacyEnv(process.env);
 var root = findProjectRoot(process.cwd());
 function version() {
   if (true)
-    return "0.4.4";
+    return "0.4.5";
   try {
     return JSON.parse(readFileSync12(new URL("../package.json", import.meta.url), "utf8")).version;
   } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bugpatrol",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "AI agents that explore your app, find bugs, and fix them.",
   "license": "Apache-2.0",
   "type": "module",