@bivy/bivy 0.10.1-staging.239 → 0.10.1-staging.240

package/dist/github-tasks.js

@@ -288,6 +288,35 @@ export async function ensureTaskLabels(cfg) {
 export async function commentIssue(cfg, issueNumber, body) {
     await gh(cfg, "POST", `/issues/${issueNumber}/comments`, { body });
 }
+/** A hidden HTML-comment marker (invisible in rendered Markdown) that makes a
+ *  Bivy issue comment idempotent across process restarts and lease reclaims: the
+ *  same logical comment carries the same marker, so a duplicate delivery or a
+ *  reclaim on a fresh node can detect that it was already posted. */
+export function bivyCommentMarker(key) {
+    return `<!-- bivy:comment:${key} -->`;
+}
+/** Whether the issue already carries a Bivy comment with the given key. Scans a
+ *  single bounded page (newest issues have few comments); an API failure returns
+ *  false so we prefer re-posting the signal over silently dropping it. */
+export async function issueHasCommentMarker(cfg, issueNumber, key) {
+    const marker = bivyCommentMarker(key);
+    const res = await gh(cfg, "GET", `/issues/${issueNumber}/comments?per_page=100`);
+    if (!res.ok)
+        return false;
+    const raw = (await res.json().catch(() => []));
+    return Array.isArray(raw) && raw.some((c) => typeof c?.body === "string" && c.body.includes(marker));
+}
+/** Post an issue comment at most once per `(issue, key)`. Returns true when it
+ *  posted, false when an identically-keyed comment already existed. This is the
+ *  external-effect idempotency guard: a retry or reclaim of the same Run does not
+ *  duplicate a pickup or outcome comment. The marker is appended to the body so
+ *  the check above can see it. */
+export async function commentIssueOnce(cfg, issueNumber, body, key) {
+    if (await issueHasCommentMarker(cfg, issueNumber, key))
+        return false;
+    await commentIssue(cfg, issueNumber, `${body}\n\n${bivyCommentMarker(key)}`);
+    return true;
+}
 /**
  * The comment posted on an issue the moment Bivy picks it up — the "visibly
  * signal pickup" half of the on-issue lifecycle (the other half is the label
@@ -318,7 +347,9 @@ export async function announcePickup(cfg, issueNumber, nodeName) {
     if (cfg.label && cfg.label !== cfg.claimLabel) {
         await removeLabel(cfg, issueNumber, cfg.label).catch((error) => warn(`remove routing label "${cfg.label}"`, error));
     }
-    await commentIssue(cfg, issueNumber, pickupMessage(nodeName)).catch((error) => warn("post pickup comment", error));
+    // Idempotent across reclaims: a Machine that reclaims this issue after another
+    // lost its lease must not post a second pickup comment.
+    await commentIssueOnce(cfg, issueNumber, pickupMessage(nodeName), "pickup").catch((error) => warn("post pickup comment", error));
 }
 export async function defaultBranch(cfg) {
     const res = await gh(cfg, "GET", "");

package/dist/server.js

@@ -78,7 +78,7 @@ import { setConfiguredAutoAttachToolImages } from "./harness/tool-image-attachme
 import { injectMcpProxyForSession, injectBivyToolsForSession } from "./harness/mcp-inject.js";
 import { parseRepo, isGitHubSlugPart, inferGitHubRepoFromWorkspace, isSharedCloneRoot, resolveGitHubToken, ghCliInstalled, cloneOrUpdateRepo, resolveDefaultBaseRef, resolveBranchBaseRef, resolveAdoptBaseRef, fetchOrigin } from "./repo-workspace.js";
 import { configureGitAuth, writeGitCredentialEndpoint } from "./git-auth.js";
-import { GitHubTaskPoller, resolveGitHubTaskConfig, buildTaskPrompt, buildResumePrompt, buildInteractiveResumePrompt, DEFAULT_ISSUE_INSTRUCTIONS, parseBivyDirectives, commitAll, pushBranch, mergeBaseIntoBranch, completeMerge, abortMerge, findOpenPullRequestForBranch, findPullRequestsForBranch, findMergedPullRequestForBranch, issueBranchName, getPullRequest, commentIssue, listOpenLabelledIssues, selectActionableIssues, getIssue, getIssueCommentBody, addLabel, removeLabel, announcePickup, } from "./github-tasks.js";
+import { GitHubTaskPoller, resolveGitHubTaskConfig, buildTaskPrompt, buildResumePrompt, buildInteractiveResumePrompt, DEFAULT_ISSUE_INSTRUCTIONS, parseBivyDirectives, commitAll, pushBranch, mergeBaseIntoBranch, completeMerge, abortMerge, findOpenPullRequestForBranch, findPullRequestsForBranch, findMergedPullRequestForBranch, issueBranchName, getPullRequest, commentIssueOnce, listOpenLabelledIssues, selectActionableIssues, getIssue, getIssueCommentBody, addLabel, removeLabel, announcePickup, } from "./github-tasks.js";
 import { buildLinearTaskPrompt, getLinearIssue, linearBranchName } from "./linear-tasks.js";
 import { PairingStore } from "./device-registry.js";
 import { IntegrationManager } from "./integrations/index.js";
@@ -4185,7 +4185,9 @@ async function reportIssueOutcome(cfg, issue, record, emit, opts) {
     await prDetection.maybeDetectPullRequest(record);
     if (record.prUrl) {
         emit(record, "pr_opened", `Pull request ready for issue #${issue.number}.`, { prUrl: record.prUrl });
-        await commentIssue(cfg, issue.number, `🤖 ${record.prUrl}`).catch(() => { });
+        // Keyed by the PR URL so a reclaim/retry that lands on the same PR does not
+        // post a second link, while a genuinely new PR still gets its own comment.
+        await commentIssueOnce(cfg, issue.number, `🤖 ${record.prUrl}`, `pr:${record.prUrl}`).catch(() => { });
         // Clean up the claim label now that the PR itself is the live "in progress"
         // signal on the issue (linked in the timeline + the comment above) — keeping
         // `bivy:in-progress` around after a PR exists is stale and, per the issue's
@@ -4199,7 +4201,9 @@ async function reportIssueOutcome(cfg, issue, record, emit, opts) {
             ? "Bivy handled the follow-up but produced no file changes."
             : "Bivy ran on this issue but produced no file changes.";
         emit(record, "no_changes", message);
-        await commentIssue(cfg, issue.number, message).catch(() => { });
+        // Keyed by the deterministic issue branch so a reclaim doesn't repeat the
+        // no-changes note for the same attempt cycle.
+        await commentIssueOnce(cfg, issue.number, message, `no-changes:${wt.branch}`).catch(() => { });
         // The run is finished with nothing in progress — drop the claim label so it
         // doesn't linger on the issue. A stale `bivy/<node>:in-progress` label was
         // also mis-routing follow-up mentions before pickRoutingLabel was hardened;
@@ -4208,7 +4212,7 @@ async function reportIssueOutcome(cfg, issue, record, emit, opts) {
         return;
     }
     emit(record, "pushed", `Pushed ${wt.branch} for issue #${issue.number}; no pull request yet.`);
-    await commentIssue(cfg, issue.number, `🤖 Pushed \`${wt.branch}\` but didn't open a pull request. Comment \`@bivy\` again to continue, or open one from the session's chat (\`/pr\`).`).catch(() => { });
+    await commentIssueOnce(cfg, issue.number, `🤖 Pushed \`${wt.branch}\` but didn't open a pull request. Comment \`@bivy\` again to continue, or open one from the session's chat (\`/pr\`).`, `pushed:${wt.branch}`).catch(() => { });
 }
 /** The live open session for an issue (by source tag), if we still have one. */
 function findIssueSession(source) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.10.1-staging.239",
+  "version": "0.10.1-staging.240",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",