devlyn-cli 3.1.1 → 3.1.3

package/config/skills/_shared/resolve-bootstrap.py

@@ -282,17 +282,14 @@ def init_spec_source(
         block("BLOCKED:invalid-flags", f"spec unreadable: {raw_path}: {exc}")
     helper = shared_dir / "spec-verify-check.py"
     expected = path.with_name("spec.expected.json")
-    if expected.is_file():
-        run_checked([sys.executable, str(helper), "--check-expected", str(expected)], cwd)
-    else:
-        run_checked([sys.executable, str(helper), "--check", str(path)], cwd)
     module = load_spec_helper(shared_dir)
     if expected.is_file():
         found, _staged, error, _expected_path, _data = module.stage_from_expected(path, staging_dir)
         if not found or error:
             block("BLOCKED:invalid-flags", error or f"expected contract not found: {expected}")
     else:
-        _staged, error = module.stage_from_source(path, staging_dir)
+        run_checked([sys.executable, str(helper), "--check", str(path)], cwd)
+        _found, _staged, error = module.stage_from_source(path, staging_dir)
         if error:
             block("BLOCKED:invalid-flags", error)
     staged_path = staging_dir / "spec-verify.json"
@@ -336,7 +333,7 @@ def capture_external_diff(cwd: pathlib.Path, ref: str) -> bytes:
     if source.is_file():
         raw = source.read_bytes()
     else:
-        proc = subprocess.run(["git", "diff", "--binary", ref], cwd=cwd, capture_output=True)
+        proc = subprocess.run(["git", "diff", "--binary", "--no-ext-diff", "--src-prefix=a/", "--dst-prefix=b/", ref], cwd=cwd, capture_output=True)
         if proc.returncode != 0:
             block("BLOCKED:invalid-flags", os.fsdecode(proc.stderr or proc.stdout).strip())
         raw = proc.stdout
@@ -1187,6 +1184,16 @@ def self_test() -> int:
         staged = strict_json((work / ".devlyn" / "spec-verify.json").read_text(encoding="utf-8"))
         assert staged["verification_commands"][0]["cmd"] == "printf ok"
         assert spec_result["source"]["spec_sha256"] == sha256(spec_raw)
+        pure_spec = spec_dir / "design.md"
+        pure_spec.write_text(
+            "# Design\n\n<!-- devlyn:verification -->\n## Verification\n\n"
+            '```json\n{"pure_design":true,"verification_commands":[]}\n```\n',
+            encoding="utf-8",
+        )
+        complete_prior(work)
+        pure_result = bootstrap(["--spec", str(pure_spec.relative_to(work))], work, script_shared)
+        assert pure_result["source"]["spec_sha256"] == sha256(pure_spec.read_bytes())
+        assert not (work / ".devlyn/spec-verify.json").exists()
         external_patch.write_bytes(b"stale free-form patch\n")
         complete_prior(work)
         bootstrap(["fresh", "goal"], work, script_shared)
@@ -1208,8 +1215,46 @@ def self_test() -> int:
         assert verify_result["mode"] == "verify-only"
         assert external_patch.read_bytes() == patch_raw
         subprocess.run(["git", "restore", "app.py"], cwd=work, check=True)
+        # Ambient no-prefix config must not change the reader's a/b contract.
+        (work / "app.py").write_text("print('prefix control')\n", encoding="utf-8")
+        settings = ["diff.noprefix"] + (["diff.external"] if os.name != "nt" else [])
+        for setting in settings:
+            subprocess.run(["git", "config", setting, "true"], cwd=work, check=True)
+            try:
+                assert b"diff --git a/app.py b/app.py\n" in capture_external_diff(work, "HEAD")
+            finally:
+                subprocess.run(["git", "config", "--unset", setting], cwd=work, check=True)
+        subprocess.run(["git", "restore", "app.py"], cwd=work, check=True)
         print("PASS bootstrap self-test patch lifecycle: full-mode removal + dirty verify-only exact capture")
 
+        for valid_named in (True, False):
+            named_work = root / f"named-spec-{valid_named}"
+            init_repo(named_work)
+            named_spec = named_work / "X.md"
+            named_spec.write_text(
+                "---\ncomplexity: " + ("medium" if valid_named else "hihg") + "\n---\n# Named spec\n",
+                encoding="utf-8",
+            )
+            (named_work / "spec.md").write_text(
+                "---\ncomplexity: " + ("hihg" if valid_named else "medium") + "\n---\n# Unrelated spec\n",
+                encoding="utf-8",
+            )
+            (named_work / "spec.expected.json").write_text(json.dumps({
+                "verification_commands": [{"cmd": "printf named-contract"}],
+            }), encoding="utf-8")
+            try:
+                result = bootstrap(["--spec", "X.md"], named_work, script_shared)
+            except BootstrapBlocked as exc:
+                assert not valid_named and exc.reason == "BLOCKED:invalid-flags", exc
+                assert "frontmatter complexity" in exc.detail, exc.detail
+                assert not (named_work / ".devlyn").exists()
+            else:
+                assert valid_named, "invalid named spec was accepted via unrelated spec.md"
+                assert result["source"]["spec_path"] == "X.md"
+                assert result["source"]["spec_sha256"] == sha256(named_spec.read_bytes())
+                staged = strict_json((named_work / ".devlyn/spec-verify.json").read_text(encoding="utf-8"))
+                assert staged["verification_commands"] == [{"cmd": "printf named-contract"}]
+
         dirty_work = root / "dirty-repo"
         init_repo(dirty_work)
         bootstrap(["clean", "baseline"], dirty_work, script_shared)