bmad-module-skill-forge 2.2.0 → 3.0.0

package/src/shared/scripts/skf-promote-staged.py

@@ -0,0 +1,430 @@
+# /// script
+# requires-python = ">=3.11"
+# dependencies = []
+# ///
+"""SKF Promote Staged: move a compiled skill from its staging folder into place, byte for byte.
+
+skf-create-skill step 5 writes every artifact of a skill into its staging
+folder, `_bmad-output/.skf-stage/{skill-name}/`, and steps 5a to 6 edit
+them there (doc sources, auto-shard, doc-rot, skill-check --fix, the
+description guard, the provenance fixes). Step 7 publishes that folder.
+Writing each file again from the copies the model holds in context can
+drop an edit a later step made on disk, or a file such as a
+references/full-*.md that auto-shard created, so this helper copies the
+staged bytes instead and reports what it wrote.
+
+Subcommand:
+
+  promote --stage <dir> --package <skill_package> --forge-version <dir>
+          [--inventory <extraction inventory JSON> --source-root <dir>]
+          [--carry-manual <earlier package>]
+
+What goes where:
+
+  <package>/        SKILL.md, context-snippet.md and metadata.json, every
+                    file under the staged references/, and scripts/<name>
+                    and assets/<name> for each scripts_inventory[] and
+                    assets_inventory[] entry of --inventory, copied from
+                    <source-root>/<source_file>
+  <forge-version>/  provenance-map.json, evidence-report.md and
+                    extraction-rules.yaml
+
+The package is built in `<package>.skf-tmp/` with skf-atomic-write.py
+stage-dir and swapped into place with its commit-dir, so a reader sees the
+earlier package or the new one, never a mix, and a run that compiles a
+version again leaves no file of the earlier package behind. Each workspace
+file goes through skf-atomic-write.py write into --forge-version, which is
+created when missing; nothing else in that folder (earlier result files,
+test reports) is touched. Every promoted file is read back and its SHA-256
+compared with the bytes it came from.
+
+Any other file in the staging folder is not promoted and is listed in
+`ignored`, as is a file under references/ that is hidden (a name starting
+with `.`) or that ends in `.skf-tmp`, a write skf-atomic-write.py did not
+finish. A script or asset whose bytes no longer match the content_hash
+the inventory recorded is still copied, with a warning.
+
+Hand-written content (--carry-manual). A run that compiles a version
+again replaces the earlier package of that version, so --carry-manual
+names it (usually the --package folder itself) and the helper reads it
+before the swap:
+
+  - every file under its scripts/[MANUAL]/ and assets/[MANUAL]/ goes into
+    the new package at the same path (kind "manual");
+  - each [MANUAL] block of its SKILL.md that holds more than whitespace
+    and the note create-skill seeds a marker with must be in the staged
+    SKILL.md: a block of the same name with the same interior once line
+    endings, trailing spaces and surrounding blank lines are set aside
+    (create-skill step 5 carries them there, so step 6 validates them).
+    A block is an open marker `<!-- [MANUAL:<name>] -->` and the first
+    `<!-- [/MANUAL:<name>] -->` after it, as skf-hash-content.py pairs
+    them. When one is not there, the earlier SKILL.md is written to
+    <forge-version>/manual-backup/SKILL-<UTC time>.md before the swap and
+    a warning names the block, so nothing hand-written is lost; each run
+    writes a new name, so a later run never replaces an earlier backup.
+
+`manual` reports it: `from` (the folder read, or null without the flag),
+`blocks` (the names found in the staged SKILL.md), `missing_blocks`,
+`files` (package-relative paths) and `backup` (the copy's path, or null).
+
+Output (stdout, exit 0):
+
+  {
+    "status": "ok",
+    "package": "<package, / separators>",
+    "forge_version": "<forge-version, / separators>",
+    "files": [{"path": "...", "kind": "deliverable|reference|script|asset|manual|workspace",
+               "bytes": N, "sha256": "sha256:<hex>"}, ...],
+    "counts": {"deliverables": 3, "references": N, "scripts": N, "assets": N,
+               "manual": N, "workspace": 3},
+    "ignored": ["<staged file not promoted>", ...],
+    "manual": {"from": "<folder>"|null, "blocks": ["<name>", ...],
+               "missing_blocks": ["<name>", ...], "files": ["scripts/[MANUAL]/...", ...],
+               "backup": "<forge-version>/manual-backup/SKILL-<UTC time>.md"|null},
+    "warnings": ["..."]
+  }
+
+Exit codes:
+  0  promoted and verified
+  1  input error, nothing written: a staged file the package or the forge
+     folder needs is missing, the inventory cannot be read, a script or
+     asset is missing, lies outside --source-root or shares its
+     scripts/<name> or assets/<name> with another, --carry-manual is not
+     a folder or a file of it cannot be read, or a --carry-manual file
+     would replace a promoted file
+  2  write failed (one line on stderr names it): a failed backup or package
+     swap leaves the earlier package in place, while a workspace file that
+     fails after the swap leaves the new package and the workspace files
+     written before it
+"""
+
+from __future__ import annotations
+
+import argparse
+import hashlib
+import json
+import os
+import re
+import shutil
+import subprocess
+import sys
+import time
+from pathlib import Path, PurePosixPath
+
+ATOMIC_WRITE = Path(__file__).resolve().parent / "skf-atomic-write.py"
+DELIVERABLES = ("SKILL.md", "context-snippet.md", "metadata.json")
+WORKSPACE_FILES = ("provenance-map.json", "evidence-report.md", "extraction-rules.yaml")
+REFERENCES = "references"
+# skf-atomic-write.py's temporary name: a write it did not finish leaves <name>.skf-tmp.
+TMP_SUFFIX = ".skf-tmp"
+# The inventory lists and the package folder each one lands in.
+BUNDLED = (("scripts_inventory", "scripts", "script"), ("assets_inventory", "assets", "asset"))
+# The package folders that hold user-authored files (docs/skill-model.md).
+MANUAL_FOLDERS = ("scripts/[MANUAL]", "assets/[MANUAL]")
+# The forge version folder's backup folder; skf-skill-inventory.py's
+# FORGE_VERSION_FILES names it, so the ownership checks count it as SKF's.
+MANUAL_BACKUP = "manual-backup"
+# The note create-skill seeds a [MANUAL] marker with (compile-assembly-rules.md Section 8).
+SEEDED_NOTE = b"<!-- Add custom notes here. This section is preserved during skill updates. -->"
+# skf-hash-content.py's [MANUAL] markers; the open pattern never matches a close.
+_MANUAL_OPEN_RE = re.compile(rb"<!--\s*\[MANUAL:([^\]]+)\]\s*-->")
+_MANUAL_CLOSE_RE = re.compile(rb"<!--\s*\[/MANUAL:([^\]]+)\]\s*-->")
+ATOMIC_TIMEOUT_SEC = 120
+
+
+class InputError(Exception):
+    """Exit 1: nothing was written."""
+
+
+class WriteError(Exception):
+    """Exit 2: a write failed."""
+
+
+def _sha256(data: bytes) -> str:
+    return "sha256:" + hashlib.sha256(data).hexdigest()
+
+
+def _posix(path: Path) -> str:
+    return path.as_posix()
+
+
+def _atomic(args: list[str], data: bytes | None = None) -> None:
+    """Run skf-atomic-write.py with `args`; a non-zero exit is a WriteError."""
+    try:
+        proc = subprocess.run([sys.executable, str(ATOMIC_WRITE), *args], input=data or b"",
+                              capture_output=True, timeout=ATOMIC_TIMEOUT_SEC, check=False)
+    except (OSError, subprocess.TimeoutExpired) as exc:
+        raise WriteError(f"skf-atomic-write.py {args[0]} did not run: {exc}") from exc
+    if proc.returncode != 0:
+        detail = proc.stderr.decode("utf-8", "replace").strip().splitlines()
+        raise WriteError(f"skf-atomic-write.py {args[0]} failed: {detail[-1] if detail else proc.returncode}")
+
+
+def _staged_references(stage: Path) -> list[Path]:
+    """The staged reference files, less a hidden one and a write an interrupted run left half done."""
+    folder = stage / REFERENCES
+    if not folder.is_dir():
+        return []
+    return sorted(p for p in folder.rglob("*") if p.is_file() and not p.name.endswith(TMP_SUFFIX)
+                  and not any(part.startswith(".") for part in p.relative_to(folder).parts))
+
+
+def _bundled_files(inventory: Path | None, source_root: Path | None) -> list[tuple[str, str, Path, str | None]]:
+    """(kind, package-relative path, source file, recorded hash) per inventory script and asset."""
+    if inventory is None:
+        return []
+    try:
+        data = json.loads(inventory.read_text(encoding="utf-8"))
+    except (OSError, UnicodeDecodeError, ValueError) as exc:
+        raise InputError(f"cannot read the inventory {_posix(inventory)}: {exc}") from exc
+    if not isinstance(data, dict):
+        raise InputError(f"the inventory {_posix(inventory)} is not a JSON object")
+    entries: list[tuple[str, str, Path, str | None]] = []
+    seen: dict[str, str] = {}
+    for key, folder, kind in BUNDLED:
+        records = data.get(key) or []
+        if not isinstance(records, list):
+            raise InputError(f"the inventory's {key} is not a list")
+        for record in records:
+            if not isinstance(record, dict) or not isinstance(record.get("source_file"), str):
+                raise InputError(f"a {key} entry has no source_file: {record!r}")
+            if source_root is None:
+                raise InputError(f"the inventory lists {key} entries: pass --source-root")
+            rel = PurePosixPath(record["source_file"])
+            if rel.is_absolute() or ".." in rel.parts or not rel.parts:
+                raise InputError(f"{key} entry {record['source_file']!r} is not a path inside --source-root")
+            name = record.get("name") or rel.name
+            if not isinstance(name, str) or not name or "/" in name or "\\" in name:
+                raise InputError(f"{key} entry {record['source_file']!r} has no usable name")
+            target = f"{folder}/{name}"
+            if target in seen:
+                raise InputError(f"{seen[target]!r} and {record['source_file']!r} would both be {target}")
+            seen[target] = record["source_file"]
+            source = source_root.joinpath(*rel.parts)
+            if not source.is_file():
+                raise InputError(f"{key} entry {record['source_file']!r} is not a file under --source-root")
+            recorded = record.get("content_hash")
+            entries.append((kind, target, source, recorded if isinstance(recorded, str) else None))
+    return entries
+
+
+def _manual_blocks(data: bytes) -> list[tuple[str, bytes]]:
+    """(name, interior) of each [MANUAL] block: an open marker paired with the
+    first close marker of its name after it; an unclosed one is skipped."""
+    closes = [(m.start(), m.group(1).strip()) for m in _MANUAL_CLOSE_RE.finditer(data)]
+    blocks = []
+    for m in _MANUAL_OPEN_RE.finditer(data):
+        name = m.group(1).strip()
+        end = next((start for start, close in closes if start >= m.end() and close == name), None)
+        if end is not None:
+            blocks.append((name.decode("utf-8", "replace"), data[m.end():end]))
+    return blocks
+
+
+def _normalized(interior: bytes) -> bytes:
+    """A block's interior as the check compares it: LF line endings, no
+    trailing spaces, no surrounding blank lines (a CRLF checkout of the
+    earlier SKILL.md still holds the block an LF staged one carries)."""
+    lines = interior.replace(b"\r\n", b"\n").split(b"\n")
+    return b"\n".join(line.rstrip() for line in lines).strip()
+
+
+def _hand_written(interior: bytes) -> bool:
+    """A block holds more than whitespace and the note create-skill seeds it with."""
+    return _normalized(interior) not in (b"", SEEDED_NOTE)
+
+
+def _read(path: Path) -> bytes:
+    """The bytes of an earlier package file; one it cannot read is an InputError."""
+    try:
+        return path.read_bytes()
+    except OSError as exc:
+        raise InputError(f"cannot read {_posix(path)}: {exc}") from exc
+
+
+def _manual_files(earlier: Path) -> list[tuple[str, bytes]]:
+    """(package-relative path, bytes) of each file under the earlier package's [MANUAL] folders."""
+    found = []
+    for folder in MANUAL_FOLDERS:
+        root = earlier.joinpath(*PurePosixPath(folder).parts)
+        if root.is_dir():
+            found += [(p.relative_to(earlier).as_posix(), _read(p))
+                      for p in sorted(root.rglob("*")) if p.is_file()]
+    return found
+
+
+def _held_blocks(earlier_skill_md: bytes, staged_skill_md: bytes) -> tuple[list[str], list[str]]:
+    """The names of the earlier SKILL.md's hand-written blocks the staged one
+    holds (same name, same normalized interior), and of those it lacks."""
+    staged: dict[str, set[bytes]] = {}
+    for name, interior in _manual_blocks(staged_skill_md):
+        staged.setdefault(name, set()).add(_normalized(interior))
+    held, lacking = [], []
+    for name, interior in _manual_blocks(earlier_skill_md):
+        if _hand_written(interior):
+            (held if _normalized(interior) in staged.get(name, set()) else lacking).append(name)
+    return held, lacking
+
+
+def _backup_target(forge_version: Path) -> Path:
+    """manual-backup/SKILL-<UTC time>.md under the forge version folder, a
+    name no earlier backup holds, so a backup the user has not restored
+    from yet is never replaced."""
+    folder = forge_version / MANUAL_BACKUP
+    stamp = time.strftime("%Y%m%d-%H%M%S", time.gmtime())
+    target, n = folder / f"SKILL-{stamp}.md", 1
+    while os.path.lexists(target):
+        n += 1
+        target = folder / f"SKILL-{stamp}-{n}.md"
+    return target
+
+
+def promote(stage: Path, package: Path, forge_version: Path,
+            inventory: Path | None = None, source_root: Path | None = None,
+            carry_manual: Path | None = None) -> dict:
+    """Promote the staging folder (see the module docstring); raises InputError or WriteError."""
+    if not stage.is_dir():
+        raise InputError(f"no staging folder at {_posix(stage)}")
+    missing = [name for name in (*DELIVERABLES, *WORKSPACE_FILES) if not (stage / name).is_file()]
+    if missing:
+        raise InputError(f"the staging folder {_posix(stage)} has no {', '.join(missing)}")
+    references = _staged_references(stage)
+    bundled = _bundled_files(inventory, source_root)
+
+    plan: list[tuple[str, str, bytes]] = []  # (kind, package-relative path, bytes)
+    for name in DELIVERABLES:
+        plan.append(("deliverable", name, (stage / name).read_bytes()))
+    for path in references:
+        plan.append(("reference", path.relative_to(stage).as_posix(), path.read_bytes()))
+    warnings: list[str] = []
+    for kind, rel, source, recorded in bundled:
+        data = source.read_bytes()
+        if recorded is not None and recorded != _sha256(data):
+            warnings.append(f"{rel}: {_posix(source)} changed since extraction recorded {recorded}")
+        plan.append((kind, rel, data))
+    workspace = [(name, (stage / name).read_bytes()) for name in WORKSPACE_FILES]
+
+    # The earlier package's hand-written content, read before the swap deletes it.
+    manual = {"from": None, "blocks": [], "missing_blocks": [], "files": [], "backup": None}
+    earlier_skill_md = b""
+    if carry_manual is not None:
+        if not carry_manual.is_dir():
+            raise InputError(f"--carry-manual {_posix(carry_manual)} is not a folder")
+        if (carry_manual / "SKILL.md").is_file():
+            earlier_skill_md = _read(carry_manual / "SKILL.md")
+        held, lacking = _held_blocks(earlier_skill_md, (stage / "SKILL.md").read_bytes())
+        files = _manual_files(carry_manual)
+        taken = {rel for _, rel, _ in plan}
+        for rel, data in files:
+            if rel in taken:
+                raise InputError(f"{rel} of --carry-manual would replace a promoted file")
+            plan.append(("manual", rel, data))
+        manual.update({"from": _posix(carry_manual), "blocks": held, "missing_blocks": lacking,
+                       "files": [rel for rel, _ in files]})
+
+    promoted = {_posix(p.relative_to(stage)) for p in references} | set(DELIVERABLES) | set(WORKSPACE_FILES)
+    ignored = sorted(p.relative_to(stage).as_posix() for p in stage.rglob("*")
+                     if p.is_file() and p.relative_to(stage).as_posix() not in promoted)
+
+    # A hand-written block the staged SKILL.md lacks: keep the earlier
+    # SKILL.md before the swap deletes it.
+    if manual["missing_blocks"]:
+        target = _backup_target(forge_version)
+        _atomic(["write", "--target", str(target)], earlier_skill_md)
+        _verified(target, "workspace", earlier_skill_md)
+        manual["backup"] = _posix(target)
+        warnings.append(f"SKILL.md: the [MANUAL] block(s) {', '.join(manual['missing_blocks'])} of "
+                        f"{_posix(carry_manual)} are not in the new SKILL.md; the earlier SKILL.md is "
+                        f"kept at {_posix(target)}")
+
+    # The package: build it beside its target, then swap it in.
+    _atomic(["stage-dir", "--target", str(package)])
+    building = package.with_name(package.name + ".skf-tmp")
+    try:
+        for _, rel, data in plan:
+            target = building.joinpath(*PurePosixPath(rel).parts)
+            target.parent.mkdir(parents=True, exist_ok=True)
+            target.write_bytes(data)
+    except OSError as exc:
+        shutil.rmtree(building, ignore_errors=True)
+        raise WriteError(f"cannot build {_posix(building)}: {exc}") from exc
+    _atomic(["commit-dir", "--target", str(package)])
+
+    # The workspace files, one atomic write each.
+    for name, data in workspace:
+        _atomic(["write", "--target", str(forge_version / name)], data)
+
+    files = []
+    for kind, rel, data in plan:
+        files.append(_verified(package.joinpath(*PurePosixPath(rel).parts), kind, data))
+    for name, data in workspace:
+        files.append(_verified(forge_version / name, "workspace", data))
+    counts = {"deliverables": len(DELIVERABLES), "references": len(references),
+              "scripts": sum(1 for kind, *_ in bundled if kind == "script"),
+              "assets": sum(1 for kind, *_ in bundled if kind == "asset"),
+              "manual": len(manual["files"]), "workspace": len(WORKSPACE_FILES)}
+    return {"status": "ok", "package": _posix(package), "forge_version": _posix(forge_version),
+            "files": files, "counts": counts, "ignored": ignored, "manual": manual, "warnings": warnings}
+
+
+def _verified(path: Path, kind: str, data: bytes) -> dict:
+    """The promoted file's record, after checking it holds the bytes it came from."""
+    try:
+        written = path.read_bytes()
+    except OSError as exc:
+        raise WriteError(f"cannot read back {_posix(path)}: {exc}") from exc
+    if written != data:
+        raise WriteError(f"{_posix(path)} does not hold the bytes it was promoted from")
+    return {"path": _posix(path), "kind": kind, "bytes": len(written), "sha256": _sha256(written)}
+
+
+def _build_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(
+        prog="skf-promote-staged.py",
+        description=__doc__,
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    sub = parser.add_subparsers(dest="command", required=True)
+    p = sub.add_parser("promote", help="copy a staged skill into its package and forge version folders")
+    p.add_argument("--stage", required=True, type=Path, help="the staging folder, _bmad-output/.skf-stage/<skill>")
+    p.add_argument("--package", required=True, type=Path, help="the skill package folder, {skill_package}")
+    p.add_argument("--forge-version", required=True, type=Path, help="the forge version folder, {forge_version}")
+    p.add_argument("--inventory", type=Path, default=None,
+                   help="the extraction inventory JSON whose scripts_inventory and assets_inventory are bundled")
+    p.add_argument("--source-root", type=Path, default=None,
+                   help="the source tree the inventory's source_file paths are relative to")
+    p.add_argument("--carry-manual", type=Path, default=None,
+                   help="the earlier package this one replaces: carry its [MANUAL] files and check "
+                        "its [MANUAL] blocks are in the staged SKILL.md")
+    return parser
+
+
+def main(argv: list[str] | None = None) -> int:
+    args = _build_parser().parse_args(argv)
+    try:
+        result = promote(args.stage, args.package, args.forge_version, args.inventory, args.source_root,
+                         args.carry_manual)
+    except InputError as exc:
+        print(json.dumps({"status": "error", "message": str(exc)}), file=sys.stderr)
+        return 1
+    except WriteError as exc:
+        print(json.dumps({"status": "error", "message": str(exc)}), file=sys.stderr)
+        return 2
+    print(json.dumps(result, indent=2))
+    return 0
+
+
+def _force_utf8(*streams) -> None:
+    """Reconfigure the JSON streams to UTF-8 (a Windows console uses cp1252)."""
+    for stream in streams:
+        if hasattr(stream, "reconfigure"):
+            errors = getattr(stream, "errors", None)
+            if errors is None:
+                stream.reconfigure(encoding="utf-8")
+            else:
+                stream.reconfigure(encoding="utf-8", errors=errors)
+
+
+if __name__ == "__main__":
+    _force_utf8(sys.stdout, sys.stderr)
+    sys.exit(main())

package/src/shared/scripts/skf-provenance-gap-dispatch.py

@@ -1,5 +1,5 @@
 # /// script
-# requires-python = ">=3.10"
+# requires-python = ">=3.11"
 # dependencies = ["pyyaml"]
 # ///
 """SKF Provenance Gap Dispatch — Major-Version Scope Reconciliation feeder.
@@ -17,8 +17,16 @@ deterministic operations before the LLM can prompt the user:
      - `promoted` for this path → already in scope (skip)
      - `skipped` for this path → user previously declined (skip)
      - `demoted-include` or `demoted-exclude` → pre-decided demotion
+     - `deferred-headless` for this path → a headless run met it and left
+       it for a person: unresolved, so the next interactive run asks
      - no matching amendment → unresolved (caller prompts user)
 
+     A `skipped` amendment whose reason is `headless: no user to prompt`
+     is the automatic skip a headless run wrote before `deferred-headless`
+     existed. No person declined the path, so it counts as
+     `deferred-headless` too (as skf-resolve-authoritative-files.py reads
+     the same legacy record).
+
 The prose previously asked the LLM to do all three per run. The
 markdown parsing in particular is fiddly (heading lookahead, table
 vs bullet vs definition list formats); keeping it in prose lets
@@ -45,7 +53,7 @@ Output JSON (stdout):
                 | "unresolved",
         "prior_action": "promoted" | "skipped"
                       | "demoted-include" | "demoted-exclude"
-                      | null
+                      | "deferred-headless" | null
       }, ...
     ],
     "summary": {
@@ -59,6 +67,9 @@ Output JSON (stdout):
   - `no-candidates` → report exists but Out-of-Scope section is absent/empty
   - `candidates-found` → classified[] is populated; iterate unresolved entries
 
+An `unresolved` entry with `prior_action: "deferred-headless"` is one a
+headless run deferred; with `null` no run has decided it yet.
+
 Exit codes:
   0  — operation succeeded (any status)
   1  — user error (paths invalid, brief unparseable)
@@ -238,6 +249,12 @@ _PRE_DECIDED_SKIPPED = "pre-decided-skipped"
 _PRE_DECIDED_DEMOTED = "pre-decided-demoted"
 _UNRESOLVED = "unresolved"
 
+_SKIPPED = "skipped"
+_DEFERRED = "deferred-headless"
+# The reason a headless run gave its automatic skip before deferred-headless
+# existed. Such a skip was never a person's decision.
+_LEGACY_HEADLESS_REASON = "headless: no user to prompt"
+
 
 def load_brief(brief_path: Path) -> dict:
     """Parse a skill-brief.yaml file. Raises ValueError on load failure."""
@@ -272,7 +289,7 @@ def reconcile(candidates: list[dict], brief: dict) -> list[dict]:
         if not isinstance(amend, dict):
             continue
         path = amend.get("path")
-        action = amend.get("action")
+        action = _amendment_action(amend)
         if isinstance(path, str) and isinstance(action, str):
             by_path.setdefault(path, []).append(action)
 
@@ -293,20 +310,35 @@ def reconcile(candidates: list[dict], brief: dict) -> list[dict]:
     return classified
 
 
+def _amendment_action(amend: dict) -> str | None:
+    """The action an amendment records, reading a legacy headless skip as a deferral."""
+    action = amend.get("action")
+    if not isinstance(action, str):
+        return None
+    reason = amend.get("reason")
+    if action == _SKIPPED and isinstance(reason, str) and reason.strip() == _LEGACY_HEADLESS_REASON:
+        return _DEFERRED
+    return action
+
+
 def _classify(prior_actions: list[str]) -> tuple[str, str | None]:
     """Pick the dominant amendment action for a single candidate path.
 
     A path may have multiple amendments (e.g. promoted then later
-    demoted-exclude). Most recent action wins — the list is in
-    amendment-record-insertion order, so iterate from the end.
+    demoted-exclude). Most recent action wins: the list is in
+    amendment-record-insertion order, so iterate from the end. A
+    deferred-headless amendment decides nothing: the path stays
+    unresolved for the next interactive run, which a person answers.
     """
     for action in reversed(prior_actions):
         if action == "promoted":
             return _ALREADY_IN_SCOPE, "promoted"
-        if action == "skipped":
-            return _PRE_DECIDED_SKIPPED, "skipped"
+        if action == _SKIPPED:
+            return _PRE_DECIDED_SKIPPED, _SKIPPED
         if action in ("demoted-include", "demoted-exclude"):
             return _PRE_DECIDED_DEMOTED, action
+        if action == _DEFERRED:
+            return _UNRESOLVED, _DEFERRED
     return _UNRESOLVED, None