@seanyao/roll 4.719.1 → 4.719.2

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v4.719.2 — 2026-07-19
+
+### 稳定性
+- 修复致命回归:`roll worktree cleanup` 会把"历史 PR 被 squash 合并、但分支 tip 上还有未交付独立提交"的 `loop/cycle-*` 分支当成可删(仅凭已合并 PR 授权),导致丢失独立工作;现在删分支必须有 git 层面证据证明每个提交都已交付(是主干祖先,或 `git cherry` 显示每个提交都有等价补丁),只要有一个 `+` 未交付补丁就整条保留;已合并 PR 本身不再作为删除授权 (FIX-1458)
+
 ## v4.719.1 — 2026-07-19
 
 ### 稳定性

package/dist/roll.mjs

@@ -288769,7 +288769,7 @@ import { execFileSync as execFileSync32 } from "node:child_process";
 import { homedir as homedir34 } from "node:os";
 import { appendFileSync as appendFileSync20, mkdirSync as mkdirSync73 } from "node:fs";
 import { dirname as dirname73, join as join157, relative as relative14, resolve as resolve14 } from "node:path";
-var MERGED_KINDS = /* @__PURE__ */ new Set(["ancestor", "pr_merged", "patch_equivalent"]);
+var MERGED_KINDS = /* @__PURE__ */ new Set(["ancestor", "patch_equivalent"]);
 function isSafelyDisposable(rec) {
   return rec.owner === "loop" && rec.active === false && rec.dirtyTracked === false && rec.disposition === "disposable_candidate" && MERGED_KINDS.has(rec.mergeEvidence.kind) && typeof rec.head === "string" && rec.head.length > 0;
 }
@@ -289112,6 +289112,21 @@ function resolveThreshold() {
 function gitCap(repoRoot3, args) {
   return execFileSync32("git", ["-C", repoRoot3, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
 }
+function classifyBranchMerge(branch, integrationBranch, git5) {
+  if (git5(["merge-base", "--is-ancestor", branch, integrationBranch]).ok)
+    return "ancestor";
+  const cherry = git5(["cherry", integrationBranch, branch]);
+  if (!cherry.ok)
+    return null;
+  const lines3 = cherry.stdout.split("\n").map((l) => l.trim()).filter((l) => l !== "");
+  if (lines3.length === 0)
+    return null;
+  if (lines3.some((l) => l.startsWith("+")))
+    return null;
+  if (lines3.every((l) => l.startsWith("-")))
+    return "patch_equivalent";
+  return null;
+}
 function buildStandaloneBranchDeps(repoRoot3, audit, integrationBranch) {
   const attachedBranches = new Set(audit.records.filter((r) => r.owner === "loop" && typeof r.branch === "string" && r.branch !== "").map((r) => r.branch.replace(/^refs\/heads\//, "")));
   let currentBranch2 = null;
@@ -289130,27 +289145,19 @@ function buildStandaloneBranchDeps(repoRoot3, audit, integrationBranch) {
         return null;
       }
     },
-    branchMerge: (branch) => {
-      try {
-        execFileSync32("git", ["-C", repoRoot3, "merge-base", "--is-ancestor", branch, integrationBranch], { stdio: "ignore" });
-        return "ancestor";
-      } catch {
-      }
+    // FIX-1458 (#1465): delivery is proven ONLY by fresh git patch evidence via
+    // classifyBranchMerge (ancestor OR `git cherry` patch-equivalence). A merged
+    // GitHub PR is deliberately NOT consulted: a squash merge leaves the exact
+    // branch tips undelivered, so authorizing deletion on a merged PR alone
+    // silently discards unique commits (US-ORG-003/007/004 in the report).
+    branchMerge: (branch) => classifyBranchMerge(branch, integrationBranch, (args) => {
       try {
-        for (const line of gitCap(repoRoot3, ["branch", "--merged", integrationBranch]).split("\n")) {
-          if (line.replace(/^[*+]?\s+/, "").trim() === branch)
-            return "pr_merged";
-        }
-      } catch {
-      }
-      try {
-        const n = execFileSync32("gh", ["pr", "list", "--head", branch, "--state", "merged", "--json", "number", "--jq", "length"], { cwd: repoRoot3, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
-        if (parseInt(n, 10) > 0)
-          return "pr_merged";
-      } catch {
+        return { ok: true, stdout: gitCap(repoRoot3, args) };
+      } catch (err16) {
+        const stdout = typeof err16.stdout === "string" ? err16.stdout : "";
+        return { ok: false, stdout };
       }
-      return null;
-    }
+    })
   };
 }
 function resolveIntegrationForCleanup(repoRoot3) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seanyao/roll",
-  "version": "4.719.1",
+  "version": "4.719.2",
   "description": "Roll — Roll out features with AI agents",
   "packageManager": "pnpm@11.1.3",
   "scripts": {