devlyn-cli 4.3.15 → 4.3.17

package/bin/skill-history.json

@@ -106,6 +106,7 @@
       "865e26f38b04dbaae6b0b91616110d6bd748909b7dec68f20cd7c2a240d2fa5a",
       "8ab08b8f3d19e7fffc36fbc4d8c4dad83df02bcb83a9aabcb8db8b82fe12b384",
       "8b34167328e88c73538b5ae2a30e452b544a44bc03f70a2c4f0278b33953afc4",
+      "8b87eadbb611342029cb9c153b32e2a483bb272dee70b49f0cae251b76a72ecf",
       "8c80926ab03b2477e52264495b35c2116f65fc51b02e8c56e441b5705872392a",
       "8fb73c0d2472b3643ac6e3f0ad87d818694afebaf68fcad596496e703893c43d",
       "9162fc2fed6f4a611d299485be3a397080beb3304865ce59b95576ba7d00650e",
@@ -160,6 +161,7 @@
       "de4f504265e960cb8d81752e9ae922f664790ee026b4454f1b07252d1a6282a4",
       "e0a305cf3bf47c8bc357195d4d50b0f6177069e870c33040c258c93edae68646",
       "e115205a744fef918a59d1b3a601df09a8b6df1d3e60613b9e8b87240929f8d8",
+      "e19204055bb16fff4263f95fac092ee8f971ee9055b7a969497e5714782a454c",
       "e41013abf5e17445ef83a86974ac1de77beaa61e484e1916577ecc64bb34c220",
       "e725ec4eca42f737ee4bdaceb10c11db289414a1d4bb8be8fe103f89c89f07d5",
       "e812d02ebdbdb8d82eb85842d676e21bedddb0d00154eed99b9d29b43cb8fc02",
@@ -361,6 +363,7 @@
       "aba66b674683935e4c28c93333896dc116ffe67e7a35fe30b3599a8be507e94e",
       "b2e4437fa981317362d03ee032e1cfd8b686316e966c6ba12ecd619a009c80a6",
       "bdd0751eea04532c050334fda3bc5c61c6b429e485d97e0b8ebb4fae154da2c7",
+      "bf302e48c189813849849563a117b412cecb627323e8af7c12dc729ea3e6e4cd",
       "c1b8e3ebf38e2be8972aa003e9614a782cb4f195c69d20b95a475ebf9aaaab9e",
       "c8e375aab574148542f392b093cbbf3f2e8dc623826b45e35df0a1a2c3862226",
       "ce282a55328c2d071cacc377670fbebea4da4b9a7fee81b25293fb26763f17c9",
@@ -772,6 +775,8 @@
     "4.3.13",
     "4.3.14",
     "4.3.15",
+    "4.3.16",
+    "4.3.17",
     "4.3.2",
     "4.3.3",
     "4.3.4",

package/config/skills/_shared/task-complete.py

@@ -8,6 +8,7 @@ from __future__ import annotations
 
 import argparse
 import contextlib
+import ctypes
 import errno
 import functools
 import hashlib
@@ -628,6 +629,18 @@ def linux_process_status(process):
         raise WritersUnobservable("unknown process status; retain tree until writer cessation can be established") from exc
 
 
+def darwin_executable(pid):
+    # The real executable (ps prints argv[0]); only names a retention reason.
+    with contextlib.suppress(OSError):
+        proc_pidpath = ctypes.CDLL("/usr/lib/libproc.dylib").proc_pidpath
+        proc_pidpath.argtypes = [ctypes.c_int, ctypes.c_void_p, ctypes.c_uint32]
+        proc_pidpath.restype = ctypes.c_int
+        buffer = ctypes.create_string_buffer(4096)  # PROC_PIDPATHINFO_MAXSIZE
+        if proc_pidpath(pid, buffer, ctypes.sizeof(buffer)) > 0:
+            return os.fsdecode(buffer.value)
+    return None
+
+
 def stopped_writers(work):
     outside(work)
     # The owner assertion covers its actual children; an OS observation catches
@@ -637,10 +650,18 @@ def stopped_writers(work):
         if result.returncode not in {0, 1} or result.stderr.strip():
             raise WritersUnobservable("writer observation unavailable; retain tree and inspect writers")
         pid = None
-        for line in result.stdout.splitlines():
+        for line in result.stdout.split("\n"):
             if line.startswith("p"):
                 pid = int(line[1:])
             elif line.startswith("n") and pid != os.getpid():
+                executable = darwin_executable(pid)
+                if (executable is not None
+                        and executable.startswith("/System/Library/Frameworks/Virtualization.framework/")
+                        and executable.endswith("/com.apple.Virtualization.VirtualMachine")):
+                    raise WriterActive(
+                        f"active process {pid} is a virtual machine (Docker Desktop or another Virtualization.framework VM) "
+                        "and holds task files, as it can after a bind mount until restarted; "
+                        "stop containers using them and restart the VM's app before resume")
                 raise WriterActive(f"active process {pid} uses task files; stop/yield actual writers before resume")
     elif sys.platform.startswith("linux"):
         for process in Path("/proc").iterdir():
@@ -756,7 +777,8 @@ def clean_scratch_command(args):
 
 def cleanup(receipt, path, pr, *, warnings=None):
     warnings = [] if warnings is None else warnings
-    require(pr["state"] == "MERGED" and pr.get("mergedAt") and pr.get("mergeCommit", {}).get("oid"), "actual matching merge evidence is required")
+    if pr is not None:
+        require(pr["state"] == "MERGED" and pr.get("mergedAt") and pr.get("mergeCommit", {}).get("oid"), "actual matching merge evidence is required")
     sha = receipt["publish_sha"]
     branch_ref = "refs/heads/" + receipt["branch"]
     # The recovery ref keeps the accepted commit reachable, so squash and
@@ -764,7 +786,7 @@ def cleanup(receipt, path, pr, *, warnings=None):
     require(ref_sha(receipt, receipt["recovery_ref"]) == sha, "recovery reachability changed; retain resources")
     verify_files(path.parent / "custody", receipt["files"])
     require(read_json(path.parent / "manifest.json") == receipt["files"], "custody manifest changed")
-    gref(receipt, "merge-base", "--is-ancestor", pr["mergeCommit"]["oid"], remote_base(receipt))
+    gref(receipt, "merge-base", "--is-ancestor", pr["mergeCommit"]["oid"] if pr else sha, remote_base(receipt))
     gref(receipt, "merge-base", "--is-ancestor", receipt["source_sha"], sha)
     work = Path(receipt["worktree"])
     local = ref_sha(receipt, branch_ref)
@@ -866,26 +888,29 @@ def reconcile(common, allocated, anchor, *, exclude_receipts=(), warnings=None):
             continue
         try:
             receipt = read_json(path)
-            if receipt.get("allocation") != "owned" or not receipt.get("acceptance") or not receipt.get("pr_number") or receipt.get("local_only"):
+            if receipt.get("allocation") != "owned" or not receipt.get("acceptance") or receipt.get("local_only") or not (receipt.get("pr_number") or receipt.get("delivery") == "COMPLETE"):
                 continue
             if receipt.get("status") == "COMPLETE" and (not receipt.get("writers_released") or "scratch_identity" not in receipt or receipt.get("scratch_cleanup", {}).get("status") == "CLEAN"):
                 continue
             with locked_receipt(path, blocking=False) as receipt:
+                if not receipt.get("acceptance") or receipt.get("local_only") or not (receipt.get("pr_number") or receipt.get("delivery") == "COMPLETE"):
+                    continue
                 if receipt.get("status") == "COMPLETE":
                     if receipt.get("writers_released") and "scratch_identity" in receipt and receipt.get("scratch_cleanup", {}).get("status") != "CLEAN":
                         results.append(completion_result(receipt, path, "COMPLETE"))
                     continue
-                if not receipt.get("acceptance") or not receipt.get("pr_number") or receipt.get("local_only"):
-                    continue
-                pr = json.loads(gh(receipt, "pr", "view", str(receipt["pr_number"]), "--json", PR_FIELDS))
-                if pr["state"] != "MERGED":
-                    continue
-                validate_pr(receipt, pr)
+                pr = None
+                if receipt.get("pr_number"):
+                    pr = json.loads(gh(receipt, "pr", "view", str(receipt["pr_number"]), "--json", PR_FIELDS))
+                    if pr["state"] != "MERGED":
+                        continue
+                    validate_pr(receipt, pr)
                 require(not receipt["linked"] or Path(receipt["worktree"]) != anchor, "cannot clean the current allocation's anchor checkout: " + str(anchor))
                 require(remote_url(receipt) == receipt["remote_url"], "remote URL changed since allocation")
                 repo_policy(receipt)
-                receipt["merge"] = pr
-                atomic_json(path, receipt)
+                if pr:
+                    receipt["merge"] = pr
+                    atomic_json(path, receipt)
                 cleanup(receipt, path, pr, warnings=warnings)
                 results.append(completion_result(receipt, path, "COMPLETE", warnings=warnings))
         except (Exception, SystemExit) as error:
@@ -910,6 +935,9 @@ def complete(args, *, warnings=None):
         if (receipt.get("acceptance") or {}).get("verdict") == "FAILED":
             return result("FAILED")
         if args.local_only or receipt.get("local_only"):
+            require(receipt.get("delivery") != "COMPLETE" and receipt.get("status") != "COMPLETE" and "workspace_cleanup" not in receipt,
+                    f"{receipt['task']} delivery is already COMPLETE; "
+                    "--local-only cannot rewrite its delivery, resume it without --local-only")
             require(not receipt.get("pushed"), f"{receipt['task']} already has a pushed PR {receipt.get('pr_url') or receipt['branch']}; "
                     "--local-only cannot rewrite its delivery, resume it without --local-only")
             receipt["local_only"] = True
@@ -948,8 +976,17 @@ def complete(args, *, warnings=None):
             pr = prs[0] if prs else None
         if pr:
             validate_pr(receipt, pr)
-        actual = remote_head(receipt, receipt["branch"])
-        if not pr or pr["state"] != "MERGED":
+        on_base = pr is None and receipt.get("delivery") == "COMPLETE"
+        if pr is None and not on_base:
+            ancestry = subprocess.run(["git", "--git-dir", receipt["common_gitdir"], "merge-base", "--is-ancestor",
+                                       receipt["publish_sha"], remote_base(receipt)], capture_output=True, text=True, encoding="utf-8")
+            require(ancestry.returncode in {0, 1}, "cannot check accepted commit on base: " + ancestry.stderr.strip())
+            on_base = ancestry.returncode == 0
+            if on_base:
+                require(remote_head(receipt, receipt["branch"]) in {None, receipt["publish_sha"]},
+                        "remote task head changed; refusing to overwrite or merge")
+        if not on_base and (not pr or pr["state"] != "MERGED"):
+            actual = remote_head(receipt, receipt["branch"])
             inspect_workspace(receipt)
             verify_files(Path(receipt["worktree"]), receipt["files"])
             require(actual in {None, receipt["publish_sha"]}, "remote task head changed; refusing to overwrite or merge")
@@ -964,9 +1001,10 @@ def complete(args, *, warnings=None):
                 require(len(prs) == 1, "created PR could not be reconciled; resume from receipt")
                 pr = prs[0]
                 validate_pr(receipt, pr)
-        receipt.update(pr_number=pr["number"], pr_url=pr["url"])
-        atomic_json(path, receipt)
-        if mode == "pr" and pr["state"] == "OPEN":
+        if pr:
+            receipt.update(pr_number=pr["number"], pr_url=pr["url"])
+            atomic_json(path, receipt)
+        if pr and mode == "pr" and pr["state"] == "OPEN":
             if pr.get("autoMergeRequest"):
                 gh(receipt, "pr", "merge", str(pr["number"]), "--disable-auto")
                 pr = json.loads(gh(receipt, "pr", "view", str(pr["number"]), "--json", PR_FIELDS))
@@ -974,7 +1012,7 @@ def complete(args, *, warnings=None):
                 require(not pr.get("autoMergeRequest"), "auto-merge request remains on owned PR; retain and inspect")
             if pr["state"] == "OPEN":
                 return result("PR")
-        if pr["state"] != "MERGED":
+        if pr and pr["state"] != "MERGED":
             inspect_workspace(receipt)
             verify_files(Path(receipt["worktree"]), receipt["files"])
             require(remote_head(receipt, receipt["branch"]) == receipt["publish_sha"], "remote head race before merge")
@@ -1014,12 +1052,13 @@ def complete(args, *, warnings=None):
             if pr["state"] != "MERGED":
                 # Merge only when the repository allows it; a refused request leaves the PR for a person.
                 return dict(result("PR"), merge_refused=refused) if refused and not pr.get("autoMergeRequest") else result("PENDING")
-        receipt["merge"] = pr
-        atomic_json(path, receipt)
+        if pr:
+            receipt["merge"] = pr
+            atomic_json(path, receipt)
         try:
             cleanup(receipt, path, pr, warnings=warnings)
         except (WritersUnobservable, WriterActive) as error:
-            # Conservative retention: the merge settles delivery; workspace, task refs and custody stay, reported.
+            # Conservative retention: base containment settles delivery; workspace, task refs and custody stay, reported.
             receipt["workspace_cleanup"] = {"status": "RETAINED", "reason": str(error), "resume": shlex.join([
                 sys.executable, str(Path(__file__).resolve()), "complete", "--receipt", str(path)])}
             atomic_json(path, receipt)
@@ -1835,6 +1874,86 @@ class CompletionTests(unittest.TestCase):
             child.wait(timeout=5)
         self.cli("clean-scratch", "--receipt", self.receipt, "--writers-stopped")
 
+    def test_darwin_writer_scan_retains_all_holders_and_names_virtual_machines(self):
+        from unittest.mock import Mock, call, patch
+        pid = os.getpid() + 1
+        vm = "/System/Library/Frameworks/Virtualization.framework/Versions/A/XPCServices/com.apple.Virtualization.VirtualMachine.xpc/Contents/MacOS/com.apple.Virtualization.VirtualMachine"
+        ordinary = f"active process {pid} uses task files; stop/yield actual writers before resume"
+        vm_reason = (f"active process {pid} is a virtual machine (Docker Desktop or another Virtualization.framework VM) "
+                     "and holds task files, as it can after a bind mount until restarted; "
+                     "stop containers using them and restart the VM's app before resume")
+        own = f"p{os.getpid()}\nn{self.work}\nn{self.work / 'product'}\n"
+        lsof = call(["lsof", "-Fpn", "+D", str(self.work)], capture_output=True, text=True, encoding="utf-8")
+        executable = Mock()
+        with patch.object(sys, "platform", "darwin"), patch.object(subprocess, "run") as run, patch.dict(globals(), darwin_executable=executable):
+            for path, reason in ((vm, vm_reason), (vm.replace("VirtualMachine", "EventTap"), ordinary),
+                                 ("/bin/bash", ordinary), (None, ordinary)):
+                for name in ("product", "product\u2028p", "product\u2029p"):
+                    with self.subTest(executable=path, name=name):
+                        run.reset_mock()
+                        executable.reset_mock()
+                        executable.return_value = path
+                        records = (f"p{os.getpid()}\nn{self.work / name}\np{pid}\n"
+                                   f"n{self.work / ('product' if name == 'product' else 'held')}\n")
+                        run.return_value = subprocess.CompletedProcess([], 0, records, "")
+                        with self.assertRaises(WriterActive) as raised:
+                            stopped_writers(self.work)
+                        self.assertEqual(str(raised.exception), reason)
+                        self.assertEqual(run.call_args_list, [lsof])
+                        executable.assert_called_once_with(pid)
+            run.reset_mock()
+            executable.reset_mock()
+            run.return_value = subprocess.CompletedProcess([], 0, own, "")
+            stopped_writers(self.work)
+            self.assertEqual(run.call_args_list, [lsof])
+            executable.assert_not_called()
+            for code, stderr in ((0, "warning"), (1, "warning"), (2, ""), (-1, "")):
+                with self.subTest(code=code, stderr=stderr):
+                    run.return_value = subprocess.CompletedProcess([], code, f"p{pid}\nn{self.work}\n", stderr)
+                    with self.assertRaises(WritersUnobservable):
+                        stopped_writers(self.work)
+                    executable.assert_not_called()
+            run.return_value = subprocess.CompletedProcess([], 1, "", "")
+            stopped_writers(self.work)
+            executable.assert_not_called()
+
+    @unittest.skipUnless(sys.platform == "darwin", "requires macOS proc_pidpath")
+    def test_darwin_executable(self):
+        from unittest.mock import patch
+        with self.subTest(process="self"):
+            executable = darwin_executable(os.getpid())
+            self.assertEqual(executable, os.path.realpath(executable))
+            self.assertTrue(os.path.isfile(executable))
+            self.assertTrue(os.access(executable, os.X_OK))
+        with self.subTest(process="reaped"):
+            with subprocess.Popen([sys.executable, "-c", "pass"]) as child:
+                child.wait(timeout=5)
+            self.assertIsNone(darwin_executable(child.pid))
+        with self.subTest(error="lookup failed"), patch.object(ctypes, "CDLL") as library:
+            library.return_value.proc_pidpath.return_value = 0
+            self.assertIsNone(darwin_executable(os.getpid()))
+        with self.subTest(error="library unavailable"), patch.object(ctypes, "CDLL", side_effect=OSError("libproc unavailable")):
+            self.assertIsNone(darwin_executable(os.getpid()))
+
+    @unittest.skipUnless(sys.platform == "darwin", "requires macOS lsof descriptor access")
+    def test_darwin_real_read_only_descriptors_and_scripts_block(self):
+        script = self.work / "loop.sh"
+        script.write_text("printf 'ready\\n'\nwhile :; do sleep 1; done\n", encoding="utf-8")
+        for command in ([sys.executable, "-c",
+                         "import os, sys, time; f = open(sys.argv[1], 'rb'); "
+                         "d = os.open(sys.argv[2], os.O_RDONLY); print('ready', flush=True); time.sleep(30)",
+                         str(self.work / "product"), str(self.work)], ["/bin/bash", str(script)]):
+            with self.subTest(command=command[0]):
+                child = subprocess.Popen(command, cwd=self.root, stdout=subprocess.PIPE, text=True)
+                try:
+                    self.assertEqual(child.stdout.readline(), "ready\n")
+                    with self.assertRaisesRegex(WriterActive, f"active process {child.pid} uses task files"):
+                        stopped_writers(self.work)
+                finally:
+                    child.kill()
+                    child.wait(timeout=5)
+                    child.stdout.close()
+
     def test_linux_writer_scan_continues_after_vanished_fd(self):
         from unittest.mock import patch
         process = Path("/proc") / str(os.getpid() + 1)
@@ -2068,17 +2187,18 @@ ctypes.CDLL(None).pthread_exit(None)
             with self.assertRaisesRegex(CompletionError, "cannot parse mount table"):
                 scratch_mounts()
 
-    def accept(self):
-        (self.task / "product").write_text("accepted\n", encoding="utf-8")
-        self.g("add", "product", work=self.task)
-        self.g("commit", "-m", "scoped task", work=self.task)
+    def accept(self, *, unchanged=False):
+        if not unchanged:
+            (self.task / "product").write_text("accepted\n", encoding="utf-8")
+            self.g("add", "product", work=self.task)
+            self.g("commit", "-m", "scoped task", work=self.task)
         self.sha = self.g("rev-parse", "HEAD", work=self.task)
         evidence = self.task / ".devlyn"
         evidence.mkdir(exist_ok=True)
         (evidence / "checks.txt").write_text("actual fixture check: accepted bytes\n", encoding="utf-8")
         a = {"kind": "direct", "task": "fixture", "source_sha": self.sha,
              "checks": [{"command": "fixture byte assertion", "evidence": ".devlyn/checks.txt"}]}
-        self.assertEqual((self.task / "product").read_text(encoding="utf-8"), "accepted\n")
+        self.assertEqual((self.task / "product").read_text(encoding="utf-8"), "baseline\n" if unchanged else "accepted\n")
         self.acceptance = evidence / "acceptance.json"
         self.acceptance.write_text(json.dumps(a), encoding="utf-8")
 
@@ -2088,6 +2208,202 @@ ctypes.CDLL(None).pthread_exit(None)
             command_args += ["--acceptance", self.acceptance]
         return self.cli(*command_args, *args, success=success, cwd=cwd)
 
+    def test_unchanged_at_base_cleans_without_publication(self):
+        # Prediction: equality with base settles without push/PR, preserving custody and removing the tree, ref and scratch output.
+        self.allocate(); self.accept(unchanged=True)
+        records = records_manifest(self.task)
+        scratch = self.receipt.parent / "scratch"
+        (scratch / "build").write_bytes(b"temporary output")
+        result, _ = self.complete("--writers-stopped")
+        self.assertEqual((result["status"], result["pr"]), ("COMPLETE", None))
+        self.assertFalse(self.task.exists())
+        self.assertEqual(self.g("branch", "--list", "task/fixture"), "")
+        self.assertEqual(self.g("ls-remote", "origin", "refs/heads/task/fixture"), "")
+        self.assertEqual((result["scratch_cleanup"]["status"], list(scratch.iterdir())), ("CLEAN", []))
+        self.assertEqual(records_manifest(self.receipt.parent / "records"), records)
+        receipt = read_json(self.receipt)
+        verify_files(self.receipt.parent / "custody", receipt["files"])
+        self.assertEqual(self.g("rev-parse", receipt["recovery_ref"]), self.sha)
+        d = read_json(self.data)
+        self.assertEqual((d["pushs"], d.get("creates", 0), d.get("deletes", 0)), (0, 0, 0))
+
+    def test_unchanged_ancestor_cleans_in_pr_mode(self):
+        # Prediction: only the freshly fetched base contains the accepted ancestor; PR mode cleans without publication.
+        self.allocate(); self.accept()
+        stale = self.g("rev-parse", "refs/remotes/origin/main")
+        advanced = self.g("commit-tree", self.sha + "^{tree}", "-p", self.sha, "-m", "advance remote base")
+        self.g("push", "origin", advanced + ":refs/heads/main")
+        self.configure(pushs=0)
+        self.g("update-ref", "refs/remotes/origin/main", stale)
+        for ref in ("main", "refs/remotes/origin/main"):
+            self.assertEqual(self.run_cmd(["git", "-C", str(self.work), "merge-base", "--is-ancestor",
+                                          self.sha, ref], success=False).returncode, 1)
+        result, _ = self.complete("--mode", "pr", "--writers-stopped")
+        self.assertEqual((result["status"], result["pr"]), ("COMPLETE", None))
+        self.assertEqual(self.g("rev-parse", "refs/remotes/origin/main"), advanced)
+        self.assertEqual(self.g("rev-parse", "main"), stale)
+        self.assertFalse(self.task.exists())
+        self.assertEqual(self.g("branch", "--list", "task/fixture"), "")
+        d = read_json(self.data)
+        self.assertEqual((d["pushs"], d.get("creates", 0)), (0, 0))
+
+    def test_unchanged_old_pushed_receipt_resumes_with_exact_delete(self):
+        # Prediction: a pushed receipt without a PR resumes with only the exact-lease deletion and settles COMPLETE.
+        from unittest.mock import Mock, patch
+        self.allocate(); self.accept(unchanged=True)
+        self.cli("accept", "--receipt", self.receipt, "--acceptance", self.acceptance)
+        self.g("push", "origin", self.sha + ":refs/heads/task/fixture")
+        receipt = read_json(self.receipt)
+        receipt["pushed"] = True
+        atomic_json(self.receipt, receipt)
+        args = argparse.Namespace(receipt=str(self.receipt), acceptance=None, mode=None, local_only=False, writers_stopped=True)
+        run = Mock(wraps=gref)
+        with patch.dict(os.environ, self.env), patch.dict(complete.__globals__, gref=run):
+            result = complete(args)
+        pushes = [call.args[1:] for call in run.call_args_list if call.args[1] == "push"]
+        self.assertEqual(pushes, [("push", "--force-with-lease=refs/heads/task/fixture:" + self.sha, "origin", ":refs/heads/task/fixture")])
+        self.assertEqual((result["status"], result["pr"]), ("COMPLETE", None))
+        self.assertFalse(self.task.exists())
+        self.assertEqual(self.g("branch", "--list", "task/fixture"), "")
+        self.assertEqual(self.g("ls-remote", "origin", "refs/heads/task/fixture"), "")
+        d = read_json(self.data)
+        self.assertEqual((d["pushs"], d.get("creates", 0), d["deletes"]), (1, 0, 1))
+
+    def test_unchanged_writer_retention_resumes_to_complete(self):
+        # Prediction: either writer refusal settles delivery but retains the tree/ref; resume cleans without push/PR.
+        from unittest.mock import Mock, patch
+        self.allocate(); self.accept(unchanged=True)
+        args = argparse.Namespace(receipt=str(self.receipt), acceptance=str(self.acceptance), mode=None, local_only=False, writers_stopped=True)
+        for error in (WriterActive, WritersUnobservable):
+            with self.subTest(error=error.__name__), patch.dict(os.environ, self.env), \
+                    patch.dict(complete.__globals__, stopped_writers=Mock(side_effect=error("fixture writer retention"))):
+                result = complete(args)
+            self.assertEqual((result["status"], result["delivery_status"], result["pr"]), ("CLEANUP_PENDING", "COMPLETE", None))
+            self.assertEqual(result["workspace_cleanup"]["status"], "RETAINED")
+            self.assertIn(str(self.receipt), result["workspace_cleanup"]["resume"])
+            self.assertTrue(self.task.exists())
+            self.assertNotEqual(self.g("branch", "--list", "task/fixture"), "")
+        result, _ = self.complete(acceptance=False)
+        self.assertEqual((result["status"], result["pr"], result["workspace_cleanup"]), ("COMPLETE", None, None))
+        self.assertFalse(self.task.exists())
+        self.assertEqual(self.g("branch", "--list", "task/fixture"), "")
+        d = read_json(self.data)
+        self.assertEqual((d["pushs"], d.get("creates", 0)), (0, 0))
+
+    def test_unchanged_writer_retention_reconciles_on_allocate(self):
+        # Prediction: the next allocation retries on-base delivery once writer observation succeeds.
+        from unittest.mock import Mock, patch
+        self.allocate(); self.accept(unchanged=True)
+        args = argparse.Namespace(receipt=str(self.receipt), acceptance=str(self.acceptance), mode=None, local_only=False, writers_stopped=True)
+        with patch.dict(os.environ, self.env), \
+                patch.dict(complete.__globals__, stopped_writers=Mock(side_effect=WriterActive("fixture writer retention"))):
+            result = complete(args)
+        self.assertEqual((result["status"], result["delivery_status"], result["pr"]), ("CLEANUP_PENDING", "COMPLETE", None))
+        self.assertEqual(result["workspace_cleanup"]["status"], "RETAINED")
+        receipt, task = self.receipt, self.task
+        result = self.allocate("next")
+        self.assertEqual([(row["receipt"], row["status"]) for row in result["reconciled"]], [(str(receipt), "COMPLETE")])
+        self.assertFalse(task.exists())
+        self.assertEqual(self.g("branch", "--list", "task/fixture"), "")
+
+    def test_unchanged_settled_resume_blocks_after_base_rewind(self):
+        # Prediction: settled delivery never republishes after base rewind; cleanup blocks with the tree and refs kept.
+        from unittest.mock import Mock, patch
+        self.allocate(); self.accept()
+        base = self.g("rev-parse", "main")
+        self.g("push", "origin", self.sha + ":refs/heads/main")
+        args = argparse.Namespace(receipt=str(self.receipt), acceptance=str(self.acceptance), mode=None, local_only=False, writers_stopped=True)
+        with patch.dict(os.environ, self.env), \
+                patch.dict(complete.__globals__, stopped_writers=Mock(side_effect=WriterActive("fixture writer retention"))):
+            result = complete(args)
+        self.assertEqual((result["status"], result["delivery_status"], result["pr"]), ("CLEANUP_PENDING", "COMPLETE", None))
+        self.assertIsNone(read_json(self.receipt).get("status"))
+        self.g("push", "origin", "+" + base + ":refs/heads/main")
+        self.configure(pushs=0)
+        for mode in ("auto", "pr"):
+            with self.subTest(mode=mode):
+                result, _ = self.complete("--mode", mode, acceptance=False, success=False)
+                self.assertEqual(result["status"], "BLOCKED")
+                self.assertIn("merge-base:", result["reason"])
+                self.assertTrue(self.task.exists())
+                receipt = read_json(self.receipt)
+                self.assertEqual(receipt["delivery"], "COMPLETE")
+                self.assertEqual(self.g("rev-parse", "task/fixture"), self.sha)
+                self.assertEqual(self.g("rev-parse", receipt["recovery_ref"]), self.sha)
+                self.assertEqual(self.g("ls-remote", "origin", "refs/heads/task/fixture"), "")
+                d = read_json(self.data)
+                self.assertEqual((d["pushs"], d.get("creates", 0), d.get("merges", 0)), (0, 0, 0))
+
+    def test_unchanged_interrupted_cleanup_refuses_local_only(self):
+        # Prediction: both cleanup checkpoints prevent local-only relabeling before delivery is persisted.
+        from unittest.mock import Mock, patch
+        self.allocate(); self.accept(unchanged=True)
+        args = argparse.Namespace(receipt=str(self.receipt), acceptance=str(self.acceptance), mode=None, local_only=False, writers_stopped=True)
+        for retained in (True, False):
+            with self.subTest(retained=retained), patch.dict(os.environ, self.env), \
+                    patch.dict(complete.__globals__,
+                               stopped_writers=Mock(side_effect=WriterActive("fixture writer retention") if retained else None),
+                               completion_result=Mock(side_effect=RuntimeError("fixture interruption"))):
+                with self.assertRaisesRegex(RuntimeError, "fixture interruption"):
+                    complete(args)
+                receipt = read_json(self.receipt)
+                self.assertIsNone(receipt.get("delivery"))
+                self.assertFalse(receipt.get("pushed"))
+                self.assertEqual("workspace_cleanup" in receipt, retained)
+                self.assertEqual(receipt.get("status"), None if retained else "COMPLETE")
+                result, _ = self.complete("--local-only", acceptance=False, success=False)
+                self.assertEqual(result["status"], "BLOCKED")
+                self.assertIn("already COMPLETE", result["reason"])
+                self.assertFalse(read_json(self.receipt).get("local_only"))
+        self.assertEqual(self.complete(acceptance=False)[0]["status"], "COMPLETE")
+
+    def test_merged_foreign_remote_head_records_merge_and_retains_ref(self):
+        # Prediction: merged PRs record merge evidence and reach cleanup's remote-ref retention guard.
+        self.allocate(); self.accept()
+        self.complete("--mode", "pr")
+        self.run_cmd(["gh", "pr", "merge", "1", "--merge", "--match-head-commit", self.sha,
+                      "--repo", "github.com/test/project"])
+        self.g("commit", "--allow-empty", "-m", "foreign commit")
+        foreign = self.g("rev-parse", "HEAD")
+        self.g("push", "origin", "+" + foreign + ":refs/heads/task/fixture")
+        result, _ = self.complete("--writers-stopped", success=False)
+        self.assertEqual(result["status"], "BLOCKED")
+        self.assertIn("remote branch changed after merge; retain ref", result["reason"])
+        self.assertEqual(read_json(self.receipt)["merge"], read_json(self.data)["prs"][0])
+        self.assertEqual(self.g("ls-remote", "origin", "refs/heads/task/fixture").split()[0], foreign)
+
+    def test_unchanged_foreign_remote_head_retains_worktree(self):
+        # Prediction: a foreign remote task head refuses completion before worktree removal.
+        self.allocate(); self.accept(unchanged=True)
+        self.g("commit", "--allow-empty", "-m", "foreign commit")
+        self.g("push", "origin", "HEAD:refs/heads/task/fixture")
+        result, _ = self.complete("--writers-stopped", success=False)
+        self.assertEqual(result["status"], "BLOCKED")
+        self.assertIn("remote task head changed", result["reason"])
+        self.assertTrue(self.task.exists())
+
+    def test_unchanged_scratch_retention_reconciles_on_allocate(self):
+        # Prediction: status COMPLETE without a PR still retries retained scratch on the next allocation.
+        scratch = Path(self.allocate()["scratch"])
+        self.accept(unchanged=True)
+        (scratch / ".git").mkdir()
+        result, _ = self.complete("--writers-stopped")
+        self.assertEqual((result["status"], result["scratch_cleanup"]["status"]), ("CLEANUP_PENDING", "RETAINED"))
+        receipt = self.receipt
+        self.assertEqual(read_json(receipt)["status"], "COMPLETE")
+        (scratch / ".git").rmdir()
+        result = self.allocate("next")
+        self.assertEqual([(row["receipt"], row["status"]) for row in result["reconciled"]], [(str(receipt), "COMPLETE")])
+        self.assertFalse(any(scratch.iterdir()))
+
+    def test_unchanged_complete_refuses_local_only(self):
+        # Prediction: a delivered on-base receipt cannot be rewritten as local-only.
+        self.allocate(); self.accept(unchanged=True)
+        self.assertEqual(self.complete("--writers-stopped")[0]["status"], "COMPLETE")
+        result, _ = self.complete("--local-only", acceptance=False, success=False)
+        self.assertIn("already COMPLETE", result["reason"])
+        self.assertEqual(read_json(self.receipt)["delivery"], "COMPLETE")
+
     def test_reject_repository_rewrite_before_allocation(self):
         intended = "https://github.com/test/project.git"
         destination = "https://github.com/test/other.git"

package/config/skills/_shared/task-completion.md

@@ -200,7 +200,10 @@ python3 "$DEVLYN_SHARED_DIR/task-complete.py" complete \
 Project policy is `git config --local devlyn.completionMode auto|pr`; absent means
 `auto`. Invalid local values fail before external effects, even with an override.
 Use `complete --mode auto|pr` for one task, or `--local-only`/`--no-push` to honor
-the user's delivery restriction. These per-task choices persist in the receipt; `--local-only` is refused once the task ref is pushed.
+the user's delivery restriction. These per-task choices persist in the receipt; `--local-only` is refused once the task ref is pushed or delivery is `COMPLETE`.
+
+With no matching PR and the accepted commit already on the fetched base, either
+publication mode pushes no task commit and opens no PR. Delivery is `COMPLETE` with no `pr`; cleanup and retention work as for a merged delivery.
 
 `pr` pushes the exact accepted task ref and creates/reuses its exact repository,
 head and base PR. While OPEN, it cancels owned auto-merge, reports `PR` with its URL
@@ -230,18 +233,21 @@ must never be reported as accepted.
 
 ## Yield and retain recoverability
 
-Cleanup requires actual matching MERGED evidence; linked-tree removal also
+Cleanup requires actual matching MERGED evidence or, with no PR, the accepted commit on the fetched base; linked-tree removal also
 requires the owner's recorded release. OS observation supplements it; neither the receipt
 nor a scan guarantees exclusion of future writers. Processes with cwd or open
 files inside the tree, inaccessible process state (on Linux, other users'
 processes unless run as root), caller cwd inside the tree, dirty/untracked files,
 a nested repository or worktree, or changed refs/Gitdir/registration retain
 affected resources. Use `git worktree lock` to keep a tree.
-On native Windows, locking and file durability are supported, but the helper cannot prove writer cessation and reports `writer observation unsupported on this platform; retain workspace`. Even `--writers-stopped` cannot authorize deletion without that observation: retain the workspace, its task refs and external receipt/custody, report delivery separately, and preserve the receipt-based resume command. A merged delivery therefore reports `CLEANUP_PENDING` (delivery `COMPLETE`) with `workspace_cleanup` naming the reason and resume. Do not kill unknown processes or force worktree removal to make completion pass.
+A VM that shared the tree (Docker Desktop after a bind mount) can keep files open
+until it restarts; the helper names it when identifiable and retries cleanup on
+the next allocation or resume after the restart.
+On native Windows, locking and file durability are supported, but the helper cannot prove writer cessation and reports `writer observation unsupported on this platform; retain workspace`. Even `--writers-stopped` cannot authorize deletion without that observation: retain the workspace, its task refs and external receipt/custody, report delivery separately, and preserve the receipt-based resume command. A merged or on-base delivery therefore reports `CLEANUP_PENDING` (delivery `COMPLETE`) with `workspace_cleanup` naming the reason and resume. Do not kill unknown processes or force worktree removal to make completion pass.
 
 The receipt directory holds byte-verified `custody/`, `manifest.json` and a guarded
 `refs/devlyn/completed/<id>` recovery ref. Check evidence is copied there
-before publication; removal rechecks it, the recovery ref and the merge commit on base.
+before publication; removal rechecks it, the recovery ref and the merge or accepted commit on base.
 Ignored build output and other ignored files are disposable under native
 non-force worktree removal. The tree's `.devlyn/` files are byte/mode-verified
 and preserved as `<receipt dir>/records/.devlyn`; changes after an earlier copy

package/config/skills/devlyn-ideate/scripts/queue.py

@@ -1034,15 +1034,19 @@ def input_files(v, row, receipt, local):
 
 
 def require_merged(v, row, base, *, allocated=False):
-    """auto/pr: every prerequisite's merge commit must be in the base, before allocation and before every execution."""
+    """auto/pr: every prerequisite's delivered commit must be in the base, before allocation and before every execution."""
     for dep in v["packages"][row["loop"]]["tasks"][row["task"]]["depends_on"]:
         receipt = v["states"][f"{row['loop']}.{dep}"]["receipt"] or {}
         merge = ((receipt.get("merge") or {}).get("mergeCommit") or {}).get("oid")
+        kind = "merge"
+        if not receipt.get("merge") and receipt.get("delivery") == "COMPLETE":
+            merge = receipt.get("publish_sha")
+            kind = "commit"
         remedy = ("retain this allocation and plan the continuation as a new loop, or perform verified recovery of a never-executed allocation"
-                  if allocated else f"restore that merge on origin/{manifest_of(v, row['loop'])['base_ref']}, then drain again")
+                  if allocated else f"restore that {kind} on origin/{manifest_of(v, row['loop'])['base_ref']}, then drain again")
         require(merge and ancestor(v["anchor"], merge, base),
                 f"{row['identity']}: {'allocated baseline' if allocated else 'base'} {base} lacks prerequisite {row['loop']}.{dep}'s "
-                f"delivered merge {merge}; {remedy}")
+                f"delivered {kind} {merge}; {remedy}")
 
 
 def package_drift(v, loop, start, where):

package/native/claude/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "devlyn",
-  "version": "4.3.15",
+  "version": "4.3.17",
   "description": "Devlyn harness skills",
   "skills": "./skills/"
 }