devlyn-cli 4.2.21 → 4.2.23

package/bin/instruction-templates.json

@@ -238,6 +238,7 @@
       "6d55968e33c5b5d6e3a7efd67319584a16cd2ed3121bca9b5337f2abfd583566",
       "6dcd1ec9b76ba8cdb6af964b9eb6bb9e7a1e57b9a050501638d7f99b83ee878a",
       "6e32040ced878f6cd2a2fb3848d1b7ff43020244442b3f84349ccc063c96d191",
+      "6ea40bc01fa865ef84f4d6aa55178a40f815dd8c58c38b62d06b7dccc3200198",
       "6eda1f1ba7cfa0773c7248f51b449014ecc2d954b0dbb8e06d2e0476f41548fc",
       "6ee5b6030d798abf42b9cfc72a181c94215a1f5c219538a502d926996b1f8fef",
       "6f04a962b5ea29922a81fd4ac5402474a6c1320c2f660ce6c80837f0367575e7",
@@ -381,6 +382,7 @@
       "e3ee2da50e961046da3f5b68b0c328570307fb21a93424ae22536b8f216b55a3",
       "e43e4b5b86044fbf7be8d7fd1e3e27cd2089bfc8243e07dc2c3fc034c19794ea",
       "e44015948c7d04e60f3fed7e348c2052538e7784d8fe7ea3edf9f52de07448dd",
+      "e4ffeb63061fdd0c2332d1d793349d6ddeedee73791b46cb3c57b16ed0fe11ae",
       "e54b2aa51360267b8f397fb0d902e13af7ae1e3a9194dc7b83f8011fc1174f9d",
       "e562f976c71f5e66f5a55c3eb0fc18a0aa5e6b443d41478117e6b58d58b7bcd1",
       "e60304667adad561168f4d49a6ace28e6dee00458824a18934a7fbadcc9ffe87",
@@ -681,6 +683,7 @@
       "6d56b772caa15cfa6346d4f22753dbc908fdf15f18a9a5adbdba689330ba3862",
       "6da7471bca36b3cd82bac8d573b0f366c0f79b13aeb567f7b21035cdea665c08",
       "6e65a2349808a10c71f91167d867e1a1bf08637bd9e2be5daadb75342283ce8d",
+      "6ea40bc01fa865ef84f4d6aa55178a40f815dd8c58c38b62d06b7dccc3200198",
       "7076c6738e6d3e2739680f57c9ab3c7522ec0b9ace00b663619bcd7370ce570a",
       "7077c653a094715491e5677609a83b55ead0ad0ad6e123e80fe1ecb85bb41b6b",
       "70d3765d35b64e632cb8eeff7865f840a1a94f973f88f1133fc5fad3b36437f0",
@@ -927,6 +930,7 @@
       "e3b2f7be15a793f07cbe8e51aa2feeac51d4c67077b94e5e20bad2e14be07fc5",
       "e468c242cc38c390f9679fca61f355848f58d51570249dfbb65b4f2e26a9dfb1",
       "e4bafa0f553e899b65f05feabf4cbe86d8246c57cbba745eb79e6aa858f40a6b",
+      "e4ffeb63061fdd0c2332d1d793349d6ddeedee73791b46cb3c57b16ed0fe11ae",
       "e5160f4da789914e7f93694a55b9f80b8d06c3b0a126ff60f7627b0b418ae292",
       "e55a62fa1a993f5df1b44d1c55ef27915938d58a1c357604f3dc150f795672df",
       "e5aac9117f5af3491245b785bbeeae02ff2068727d73fd11fda3db9e4f99c86f",

package/bin/skill-history.json

@@ -8,6 +8,7 @@
       "06ab3a4b9e1c97d9b3dcd238148d775f1165f3fc08898af2f3b76149162b78d3",
       "082124278a538e4ea8b6622d767f996e3d818ec85d6e0d8ddddafe9bb03118b2",
       "08b96c407cb56b0a0242b3918e1618b21eca06caf15b8a1eec00aee6b023e08e",
+      "08c91060cfec04518de582599d1892ad50f6e6cec69aecd8678760c3e0039fa0",
       "0a60dd9b96442be24a571dd5fe6cac426bba7dd7a06ad17f3211f4f9fd9b1741",
       "0b5c3f72d18f8eea538bfef7192b207ff5cbac25c7e0d2ce080cc725bfdaa2e2",
       "0f397a4edd6b1b3063d27f6205dc6b3d069fa616624bccf661539b174535fc7e",
@@ -100,6 +101,7 @@
       "978e4210e49b42827c98cf6e40c868c87dc6e3533a2b779ca2fa05abfc16ad0f",
       "9815b6e6963e068872a6dbeae24068143bf92042bb035f67bafd1a224d65bcb0",
       "998343c148618b937556b58b83749c05d5aa3283280d751c118da6a542fb87f2",
+      "9dd3ec225818efe0ad3726192db94ff129154e995617a9d3c150fc58ad0f9f2c",
       "9f14ca629e41730b1a9fb5d0ad1a39cff558fe34758d6ceccbb9de498f9f384e",
       "a11950a5880346f03257c688fd8bc6f8c29fc0b7c05c90e8f5211d5fb7665774",
       "a405a99b988f6edd2eabb0504b36309bb4cf0c3b97eab26bb7ef257e4515dbf3",

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

@@ -21,6 +21,7 @@ import stat
 import subprocess
 import sys
 import tempfile
+import time
 import unittest
 import uuid
 
@@ -789,11 +790,35 @@ def complete(args):
             require(remote_head(receipt, receipt["branch"]) == receipt["publish_sha"], "remote head race before merge")
             refused = None
             if not pr.get("autoMergeRequest"):
-                try:
-                    require(info["mergeCommitAllowed"], "repository disallows merge commits")
-                    gh(receipt, "pr", "merge", str(pr["number"]), "--auto", "--merge", "--match-head-commit", receipt["publish_sha"])
-                except CompletionError as error:
-                    refused = str(error)
+                if not info["mergeCommitAllowed"]:
+                    refused = "repository disallows merge commits"
+                else:
+                    owner, name = receipt["repository"].split("/")
+                    auto_allowed = json.loads(command([
+                        "gh", "api", "graphql", "--hostname", "github.com", "-f",
+                        "query=query($owner:String!,$name:String!){repository(owner:$owner,name:$name){autoMergeAllowed}}",
+                        "-f", "owner="+owner, "-f", "name="+name,
+                        "--jq", ".data.repository.autoMergeAllowed | tojson",
+                    ]))
+                    require(isinstance(auto_allowed, bool), "repository autoMergeAllowed must be a JSON boolean")
+                    auto = ["--auto"] if auto_allowed else []
+                    if not auto:
+                        # UNKNOWN can reach gh's direct merge mutation; wait for a
+                        # resolved state and permit only gh's immediate-merge set.
+                        for attempt in range(10):
+                            state = json.loads(gh(receipt, "pr", "view", str(pr["number"]), "--json", "mergeStateStatus"))["mergeStateStatus"]
+                            require(isinstance(state, str) and state, "invalid mergeStateStatus")
+                            if state != "UNKNOWN":
+                                break
+                            if attempt < 9:
+                                time.sleep(2)
+                        if state not in {"CLEAN", "HAS_HOOKS", "UNSTABLE"}:
+                            refused = "pull request is not mergeable: " + state
+                    if not refused:
+                        try:
+                            gh(receipt, "pr", "merge", str(pr["number"]), *auto, "--merge", "--match-head-commit", receipt["publish_sha"])
+                        except CompletionError as error:
+                            refused = str(error)
             pr = json.loads(gh(receipt, "pr", "view", str(pr["number"]), "--json", PR_FIELDS))
             validate_pr(receipt, pr)
             if pr["state"] != "MERGED":
@@ -885,6 +910,16 @@ def remote(ref):
 if a[:2] == ['repo', 'view']:
     assert a[2:] == ['github.com/test/project', '--json', 'nameWithOwner,url,defaultBranchRef,mergeCommitAllowed'], 'unsupported gh repo view arguments: '+str(a)
     print(json.dumps({'nameWithOwner':'test/project', 'url':'https://github.com/test/project', 'defaultBranchRef':{'name':d.get('default_branch','main')}, 'mergeCommitAllowed':d.get('merge_allowed',True)}))
+elif a[:1] == ['api']:
+    assert a == ['api', 'graphql', '--hostname', 'github.com', '-f',
+                 'query=query($owner:String!,$name:String!){repository(owner:$owner,name:$name){autoMergeAllowed}}',
+                 '-f', 'owner=test', '-f', 'name=project',
+                 '--jq', '.data.repository.autoMergeAllowed | tojson'], 'unsupported gh api arguments: '+str(a)
+    d['auto_setting_reads'] = d.get('auto_setting_reads',0)+1
+    save()
+    if d.get('auto_setting_error'):
+        print('auto-merge setting read failed',file=sys.stderr); sys.exit(1)
+    print(d.get('auto_setting_output', json.dumps(d.get('auto_allowed',True))))
 elif a[:2] == ['pr', 'list']:
     assert '--repo' in a and a[a.index('--repo')+1] == 'github.com/test/project'
     print(json.dumps([pr for pr in prs if pr['headRefName'] == a[a.index('--head')+1]]))
@@ -898,21 +933,42 @@ elif a[:2] == ['pr', 'create']:
     print(url)
     if d.pop('interrupt_create',False): save(); sys.exit(1)
 elif a[:2] == ['pr', 'view']:
-    print(json.dumps(prs[int(a[2])-1]))
+    pr = prs[int(a[2])-1]
+    fields = a[4]
+    assert a[3:] == ['--json', fields, '--repo', 'github.com/test/project']
+    assert fields in ('mergeStateStatus', 'number,url,headRefName,baseRefName,headRefOid,headRepository,headRepositoryOwner,isCrossRepository,state,mergedAt,mergeCommit,autoMergeRequest')
+    if fields == 'mergeStateStatus':
+        if d.get('merge_state_error'):
+            print('merge state read failed',file=sys.stderr); sys.exit(1)
+        if d.get('merge_states'):
+            d['merge_state'] = d['merge_states'].pop(0)
+        state = d.get('merge_state', 'BLOCKED' if d.get('pending') else 'CLEAN')
+        d.setdefault('merge_state_views', []).append(state)
+        save()
+        print(json.dumps({'mergeStateStatus': state}))
+    else:
+        print(json.dumps(pr))
 elif a[:2] == ['pr', 'merge'] and '--disable-auto' in a:
     d['disables'] = d.get('disables',0)+1
     prs[int(a[2])-1]['autoMergeRequest'] = None
     save()
 elif a[:2] == ['pr', 'merge']:
-    assert '--admin' not in a and '--delete-branch' not in a
-    assert '--auto' in a and '--merge' in a and '--match-head-commit' in a
     pr = prs[int(a[2])-1]
     sha = a[a.index('--match-head-commit')+1]
+    auto = ['--auto'] if '--auto' in a else []
+    assert a[3:] == auto + ['--merge', '--match-head-commit', sha, '--repo', 'github.com/test/project']
     assert sha == remote('refs/heads/'+pr['headRefName'])
     d['merges'] = d.get('merges',0)+1
-    if not d.get('auto_allowed',True) and d.get('pending'):
+    d.setdefault('merge_calls', []).append(a)
+    state = d.get('merge_state', 'BLOCKED' if d.get('pending') else 'CLEAN')
+    immediately_mergeable = state in {'CLEAN', 'HAS_HOOKS', 'UNSTABLE'}
+    if auto and not immediately_mergeable and not d.get('auto_allowed',True):
         save(); print('repository disallows auto merge',file=sys.stderr); sys.exit(1)
-    if d.get('pending'):
+    if d.get('merge_error'):
+        save(); print('merge attempt refused',file=sys.stderr); sys.exit(1)
+    if not auto and not immediately_mergeable and state != 'UNKNOWN':
+        save(); print('pull request is not mergeable: '+state,file=sys.stderr); sys.exit(1)
+    if auto and not immediately_mergeable:
         pr['autoMergeRequest'] = {'enabledAt':'now'}
     else:
         g = [os.environ['REAL_GIT'],'--git-dir',d['bare']]
@@ -1042,7 +1098,7 @@ class CompletionTests(unittest.TestCase):
 
     def merge_pr(self):
         self.configure(pending=False)
-        self.run_cmd(["gh", "pr", "merge", "1", "--auto", "--merge", "--match-head-commit", self.sha])
+        self.run_cmd(["gh", "pr", "merge", "1", "--auto", "--merge", "--match-head-commit", self.sha, "--repo", "github.com/test/project"])
 
     def anchor_state(self, work=None):
         work = work or self.work
@@ -2119,6 +2175,127 @@ ctypes.CDLL(None).pthread_exit(None)
         self.assertEqual(self.g("ls-remote", "origin", "refs/heads/task/fixture").split()[0], race)
         self.assertNotEqual(self.g("branch", "--list", "task/fixture"), "")
 
+    def test_auto_disallowed_unknown_then_clean_merges_directly(self):
+        self.allocate(); self.accept()
+        self.configure(auto_allowed=False, merge_states=["UNKNOWN", "UNKNOWN", "CLEAN"])
+        result, _ = self.complete("--mode", "auto", "--writers-stopped")
+        self.assertEqual(result["status"], "COMPLETE")
+        d = json.loads(self.data.read_text(encoding="utf-8"))
+        self.assertEqual(d["merge_state_views"], ["UNKNOWN", "UNKNOWN", "CLEAN"])
+        self.assertEqual(d["merge_calls"], [["pr", "merge", "1", "--merge", "--match-head-commit", self.sha,
+                                            "--repo", "github.com/test/project"]])
+        self.assertEqual(d["prs"][0]["state"], "MERGED")
+        self.assertIsNone(d["prs"][0]["autoMergeRequest"])
+
+    def test_auto_disallowed_blocked_refuses_without_merge(self):
+        self.allocate(); self.accept()
+        for state in ("BLOCKED", "BEHIND", "DIRTY", "DRAFT", "NEW_STATE"):
+            with self.subTest(state=state):
+                self.configure(auto_allowed=False, merge_state=state)
+                result, _ = self.complete("--mode", "auto")
+                self.assertEqual(result["status"], "PR")
+                self.assertIn("not mergeable: " + state, result["merge_refused"])
+        d = json.loads(self.data.read_text(encoding="utf-8"))
+        self.assertEqual(d["merge_state_views"], ["BLOCKED", "BEHIND", "DIRTY", "DRAFT", "NEW_STATE"])
+        self.assertEqual(d.get("merge_calls", []), [])
+        self.assertEqual(d["prs"][0]["state"], "OPEN")
+        self.assertIsNone(d["prs"][0]["autoMergeRequest"])
+        self.assertTrue(self.task.exists())
+
+    def test_auto_allowed_unknown_keeps_auto_pending(self):
+        self.allocate(); self.accept()
+        self.configure(auto_allowed=True, merge_state="UNKNOWN")
+        result, _ = self.complete("--mode", "auto")
+        self.assertEqual(result["status"], "PENDING")
+        self.assertNotIn("merge_refused", result)
+        d = json.loads(self.data.read_text(encoding="utf-8"))
+        self.assertEqual(d.get("merge_state_views", []), [])
+        self.assertEqual(d["merge_calls"], [["pr", "merge", "1", "--auto", "--merge", "--match-head-commit", self.sha,
+                                            "--repo", "github.com/test/project"]])
+        self.assertEqual(d["prs"][0]["state"], "OPEN")
+        self.assertTrue(d["prs"][0]["autoMergeRequest"])
+        self.assertTrue(self.task.exists())
+        self.configure(auto_setting_error=True)
+        result, _ = self.complete()
+        self.assertEqual(result["status"], "PENDING")
+        self.assertEqual(json.loads(self.data.read_text(encoding="utf-8"))["auto_setting_reads"], 1)
+
+    def test_auto_disallowed_unknown_bound_refuses_without_merge(self):
+        self.allocate(); self.accept()
+        self.configure(auto_allowed=False, merge_state="UNKNOWN")
+        result, _ = self.complete("--mode", "auto")
+        self.assertEqual(result["status"], "PR")
+        self.assertIn("not mergeable: UNKNOWN", result["merge_refused"])
+        d = json.loads(self.data.read_text(encoding="utf-8"))
+        self.assertEqual(d["merge_state_views"], ["UNKNOWN"] * 10)
+        self.assertEqual(d.get("merge_calls", []), [])
+        self.assertEqual(d["prs"][0]["state"], "OPEN")
+        self.assertIsNone(d["prs"][0]["autoMergeRequest"])
+        self.assertTrue(self.task.exists())
+
+    def test_auto_disallowed_other_immediate_states_attempt_direct_merge(self):
+        self.allocate(); self.accept()
+        for state in ("HAS_HOOKS", "UNSTABLE"):
+            with self.subTest(state=state):
+                self.configure(auto_allowed=False, merge_state=state, merge_error=True, merge_calls=[])
+                result, _ = self.complete("--mode", "auto")
+                self.assertEqual(result["status"], "PR")
+                self.assertIn("merge attempt refused", result["merge_refused"])
+                d = json.loads(self.data.read_text(encoding="utf-8"))
+                self.assertEqual(d["merge_calls"], [["pr", "merge", "1", "--merge",
+                                                    "--match-head-commit", self.sha, "--repo", "github.com/test/project"]])
+
+    def test_auto_setting_read_failure_or_invalid_value_blocks_with_resume(self):
+        self.allocate(); self.accept()
+        for values in ({"auto_setting_error": True}, *({"auto_setting_error": False, "auto_setting_output": output}
+                        for output in ('null', '"true"', '"false"', '0', '1', '{}', '[]', '', 'invalid'))):
+            with self.subTest(values=values):
+                self.configure(**values)
+                result, process = self.complete("--mode", "auto", "--writers-stopped", success=False)
+                self.assertNotEqual(process.returncode, 0)
+                self.assertEqual(result["status"], "BLOCKED")
+                if values.get("auto_setting_output") == 'null':
+                    self.assertEqual(result["reason"], "repository autoMergeAllowed must be a JSON boolean")
+                self.assertIn(str(self.receipt), result["resume"])
+                self.assertNotIn("merge_refused", result)
+                d = json.loads(self.data.read_text(encoding="utf-8"))
+                self.assertEqual(d.get("merge_calls", []), [])
+                self.assertEqual(d["prs"][0]["state"], "OPEN")
+        self.configure(auto_setting_output='false')
+        result, _ = self.cli(*shlex.split(result["resume"])[2:])
+        self.assertEqual(result["status"], "COMPLETE")
+
+    def test_auto_disallowed_status_poll_failure_blocks_with_resume(self):
+        self.allocate(); self.accept()
+        self.configure(auto_allowed=False, merge_state_error=True)
+        result, process = self.complete("--mode", "auto", "--writers-stopped", success=False)
+        self.assertNotEqual(process.returncode, 0)
+        self.assertEqual(result["status"], "BLOCKED")
+        self.assertIn("merge state read failed", result["reason"])
+        self.assertIn(str(self.receipt), result["resume"])
+        self.assertNotIn("merge_refused", result)
+        d = json.loads(self.data.read_text(encoding="utf-8"))
+        self.assertEqual(d.get("merge_calls", []), [])
+        self.assertEqual(d["prs"][0]["state"], "OPEN")
+        self.configure(merge_state_error=False)
+        result, _ = self.cli(*shlex.split(result["resume"])[2:])
+        self.assertEqual(result["status"], "COMPLETE")
+
+    def test_merge_attempt_refusal_keeps_pr(self):
+        self.allocate(); self.accept()
+        self.configure(auto_allowed=False, merge_error=True)
+        result, _ = self.complete("--mode", "auto")
+        self.assertEqual(result["status"], "PR")
+        self.assertIn("merge attempt refused", result["merge_refused"])
+        self.assertEqual(json.loads(self.data.read_text(encoding="utf-8"))["merges"], 1)
+
+    def test_pr_mode_does_not_read_auto_setting(self):
+        self.allocate(); self.accept()
+        self.configure(auto_setting_error=True)
+        result, _ = self.complete("--mode", "pr")
+        self.assertEqual(result["status"], "PR")
+        self.assertEqual(json.loads(self.data.read_text(encoding="utf-8")).get("auto_setting_reads", 0), 0)
+
     def test_policy_and_local_only_persist(self):
         self.allocate(); self.accept()
         self.configure(merge_allowed=False)
@@ -2133,7 +2310,7 @@ ctypes.CDLL(None).pthread_exit(None)
         self.configure(merge_allowed=True, auto_allowed=False, pending=True)
         result, _ = self.complete("--mode", "auto")
         self.assertEqual(result["status"], "PR")
-        self.assertIn("disallows auto merge", result["merge_refused"])
+        self.assertIn("not mergeable: BLOCKED", result["merge_refused"])
         self.assertTrue(self.task.exists())
         # Local-only cannot rewrite the delivery of a pushed PR; a local allocation keeps it (test_local_chain_*).
         result, _ = self.complete("--no-push", success=False)

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

@@ -13,7 +13,10 @@ commit request uses `--local-only`, a PR request `--mode pr`, and a merge reques
 `--mode auto`. Local-only/no-push restrictions prevent publication; no-commit or
 just-edit instructions skip delivery. Existing session-wide restrictions remain
 in force until changed. Read-only work, unchanged work and incidental generated
-files do not trigger delivery. An ideate drain delivers every task.
+files do not trigger delivery.
+
+Product file limits cover task edits, not delivery bookkeeping (worktree,
+branch, receipt, uncommitted `.devlyn/` files); delivery restrictions still apply.
 
 When delivery is implicit and no GitHub origin is configured, use the existing
 local-only route and report `LOCAL_ONLY`, the commit and why no PR/merge occurred.
@@ -32,8 +35,7 @@ checkout and ask whether to continue there or isolate. With no one to ask, move
 only your own edits, and only when the task's context can be rebuilt in the
 worktree; otherwise leave the checkout as it is and report the task blocked.
 Isolation changes the work location, not delivery scope. Allocate for the
-resolved delivery policy and reuse that worktree when suitable. Isolation
-without delivery uses `--local-base`. A local receipt remains local; later
+resolved delivery policy and reuse that worktree when suitable. A local receipt remains local; later
 publication requires a fresh publication allocation, candidate and acceptance.
 
 ## Allocate for delivery or isolation
@@ -47,7 +49,7 @@ BLOCKED:shared-dir-unresolved. Never select another installation.
 For direct delivery, run the bound task-complete.py after completing the request's
 edits and checks, before committing the delivery candidate. Allocate before
 editing when concurrency requires isolation; if isolation is unavailable, do
-not write to the shared checkout. Queue drains retain their allocation order.
+not write to the shared checkout.
 
 ```sh
 python3 "$DEVLYN_SHARED_DIR/task-complete.py" allocate --repo . \
@@ -122,7 +124,7 @@ python3 "$DEVLYN_SHARED_DIR/task-complete.py" clean-scratch \
 
 This empties only the prospectively owned scratch, preserves its directory
 identity for interrupted cleanup and later builds, checks live users and reports
-the logical byte count separately from actual free disk space. It does not depend on a product PASS or rewrite that verdict.
+the logical byte count separately from actual free disk space.
 Unknown historical roots, source/recovery data, shared caches and terminal
 history are never adopted or swept. A refused cleanup does not block source
 delivery; it stays visible in the handoff with its receipt and retry command
@@ -182,7 +184,7 @@ the user's delivery restriction. These per-task choices persist in the receipt;
 head and base PR. While OPEN, it cancels owned auto-merge, reports `PR` with its URL
 and retains the checkout. Once MERGED by any method, either mode cleans released
 resources in that call, on resume or at the next allocation. Default `auto` also requests
-`gh pr merge --auto --merge --match-head-commit <accepted SHA>`. Repository
+a `--merge --match-head-commit <accepted SHA>` merge. Repository
 checks/reviews and merge policy remain authoritative: no admin bypass, strategy
 fallback or repository setting changes. When the repository disallows merge
 commits or refuses the request, delivery reports `PR` with `merge_refused` and

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devlyn-cli",
-  "version": "4.2.21",
+  "version": "4.2.23",
   "description": "Loop & harness engineering for AI coding agents (Claude Code, Codex, and any AGENTS.md-driven agent) — core engineering principles for CLAUDE.md/AGENTS.md and a loop designer that splits one intent into tasks agents drain hands-free",
   "homepage": "https://github.com/fysoul17/devlyn-cli#readme",
   "bin": {