@ikon85/agent-workflow-kit 0.41.0 → 0.41.1

package/README.md

@@ -469,6 +469,16 @@ the old way. Decision record:
 
 ## Release notes
 
+### 0.41.1
+
+- changed: `README.md`
+- changed: `agent-workflow-kit.package.json`
+- changed: `package.json`
+- changed: `scripts/pr-body-check.py`
+- changed: `scripts/test_pr_body_check.py`
+- changed: `scripts/test_worktree_wrapup_contract.py`
+- changed: `scripts/wrapup-land.py`
+
 ### 0.41.0
 
 - added: `docs/adr/0009-teardown-authority-is-stateless-repository-classification.md`

package/agent-workflow-kit.package.json

@@ -1,5 +1,5 @@
 {
-  "kitVersion": "0.41.0",
+  "kitVersion": "0.41.1",
   "files": [
     {
       "path": ".agents/skills/ask-matt/SKILL.md",
@@ -2627,7 +2627,7 @@
       "path": "scripts/pr-body-check.py",
       "kind": "script",
       "installRole": "consumer",
-      "sha256": "7fa67a672d6f6986b0fba99e78157d51225ab91f61b691a4cc184d316b521882",
+      "sha256": "d18a9f1bf9285506bd7d40a1800dd9b66f631bd4666f0ae801e8db1882d3ad2d",
       "mode": 493,
       "origin": "kit"
     },
@@ -2867,7 +2867,7 @@
       "path": "scripts/wrapup-land.py",
       "kind": "script",
       "installRole": "consumer",
-      "sha256": "476012558bb786070ce47458c6f0734ff110d5d957af72e13b20d49a37a03592",
+      "sha256": "de41f6c7bee1f67f3f25db4c7750a3caca422be5749012c6d5402cfeed91b2f7",
       "mode": 493,
       "origin": "kit"
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikon85/agent-workflow-kit",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "Portable AI-agent workflow skills (plan → execute → land → learn) for Claude Code & Codex — grilling, TDD, diagnosis, two-axis code review, cross-model Codex review, design & domain-modeling, plus a skill router (ask-matt). npx init/update/diff/uninstall.",
   "type": "module",
   "bin": {

package/scripts/pr-body-check.py

@@ -125,6 +125,21 @@ def _close_on(body: str, n: int) -> bool:
     return bool(pat.search(strip_code(body)))
 
 
+def active_close_targets(body: str) -> list:
+    """All issue numbers an ACTIVE close-keyword targets (outside code spans),
+    as sorted, deduplicated strings. Same grammar `_close_on` enforces —
+    plain `closes #n`, the colon form, and the full-URL form. This is the one
+    close grammar; close-verification (wrapup-land Step 5b) must derive its
+    targets from here, never from a branch number."""
+    text = strip_code(body)
+    pat = re.compile(
+        rf"\b(?:{CLOSE_KEYWORDS})(?::\s*|\s+)"
+        rf"(?:#0*(\d+)(?!\d)|https?://\S+/issues/0*(\d+)(?!\d))",
+        re.IGNORECASE)
+    found = {a or b for a, b in pat.findall(text)}
+    return sorted(found, key=int)
+
+
 def _part_of(body: str, n: int) -> bool:
     return bool(re.search(
         rf"\b{PART_OF_RE_SRC}(?::\s*|\s+)#0*{n}(?!\d)", body or "", re.IGNORECASE))

package/scripts/test_pr_body_check.py

@@ -79,6 +79,15 @@ class ExistingBodyRules(unittest.TestCase):
     def test_retro_line_still_required(self):
         self.assertTrue(any("Retro" in item for item in pbc.check_pr_body("closes #149", 149, None)))
 
+    def test_active_close_targets_extracts_all_forms(self):
+        body = ("closes #12\nFixes: #13\n"
+                "resolves https://github.com/iKon85/agent-workflow-kit/issues/14\n"
+                "`closes #99` and Part of #320 and closes #12")
+        self.assertEqual(pbc.active_close_targets(body), ["12", "13", "14"])
+
+    def test_active_close_targets_empty_for_part_of_only(self):
+        self.assertEqual(pbc.active_close_targets("Part of #320\n**Retro:** skipped — x"), [])
+
     def test_program_prd_label_counts_as_anchor(self):
         with mock.patch.object(pbc, "_run",
                                return_value=(0, "type:program\npriority:medium")):

package/scripts/test_worktree_wrapup_contract.py

@@ -251,6 +251,13 @@ def downgrade_landing_attempt_to_v1(core, worktree: Path) -> Path:
 
 
 class WorktreeCleanupContract(unittest.TestCase):
+    def test_declared_close_targets_is_pr_body_authority(self):
+        mod = load_wrapup()
+        self.assertEqual(mod.declared_close_targets("Part of #320"), [])
+        self.assertEqual(mod.declared_close_targets("closes #341\ncloses #12"),
+                         ["12", "341"])
+        self.assertEqual(mod.declared_close_targets("`closes #341`"), [])
+
     def test_profile_scratch_and_generated_evidence_share_safe_removal_contract(self):
         wrapup = load_wrapup()
         with tempfile.TemporaryDirectory() as tmp:

package/scripts/wrapup-land.py

@@ -423,6 +423,18 @@ def issue_from_branch(branch: str) -> str | None:
     return m.group(2) if m else None
 
 
+def declared_close_targets(body: str) -> list:
+    """Close authority for Step 5b: the PR body's ACTIVE close keywords, parsed
+    by pr-body-check's one close grammar. A branch number is context, never
+    closure authority — branch-derived closing once shut a Program-PRD that a
+    PR deliberately referenced only via `Part of`."""
+    spec = importlib.util.spec_from_file_location(
+        "pr_body_check_grammar", Path(__file__).parent / "pr-body-check.py")
+    mod = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
+    return mod.active_close_targets(body)
+
+
 def load_profile() -> dict:
     try:
         from board_config import load_board_config
@@ -1245,16 +1257,26 @@ def cmd_land(args) -> dict:
     elif p.returncode != 0:
         report["warnings"].append(f"branch -d {branch} refused: {(p.stderr or '').strip()[:200]}")
 
-    # Step 5b — verify issue auto-close (backtick-swallowed `closes` misses)
+    # Step 5b — verify declared auto-closes (backtick-swallowed `closes`
+    # misses). Targets come from the merged PR body's close keywords, never
+    # from the branch number.
     issue = issue_from_branch(branch)
-    if issue:
-        p = run(["gh", "issue", "view", issue, "--json", "state"])
-        if p.returncode == 0 and json.loads(p.stdout)["state"] == "OPEN":
-            run(["gh", "issue", "close", issue, "-c",
-                 f"Merged via PR #{pr} — auto-close didn't fire; closed manually."])
-            report["issue_close"] = f"#{issue} closed manually"
-        elif p.returncode == 0:
-            report["issue_close"] = f"#{issue} already closed"
+    p = run(["gh", "pr", "view", pr, "--json", "body"])
+    merged_body = (json.loads(p.stdout).get("body") or "") if p.returncode == 0 else ""
+    targets = declared_close_targets(merged_body)
+    if not targets:
+        report["issue_close"] = "no close targets declared — nothing to verify"
+    else:
+        states = []
+        for t in targets:
+            q = run(["gh", "issue", "view", t, "--json", "state"])
+            if q.returncode == 0 and json.loads(q.stdout)["state"] == "OPEN":
+                run(["gh", "issue", "close", t, "-c",
+                     f"Merged via PR #{pr} — auto-close didn't fire; closed manually."])
+                states.append(f"#{t} closed manually")
+            elif q.returncode == 0:
+                states.append(f"#{t} already closed")
+        report["issue_close"] = " · ".join(states)
 
     # Step 5c — local merged-branch sweep (-d only: unreachable-from-main is refused)
     swept = []