mapify-cli 3.31.3__py3-none-any.whl → 3.32.0__py3-none-any.whl

mapify_cli/__init__.py

@@ -23,7 +23,7 @@ Or install globally:
     mapify check
 """
 
-__version__ = "3.31.3"
+__version__ = "3.32.0"
 
 # MUST stay the first import: it turns "this interpreter is older than 3.11" into
 # a message that says so, instead of the ImportError raised by `from datetime

mapify_cli/templates/codex/hooks/context-meter.py

@@ -36,13 +36,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/detect-clarification-triggers.py

@@ -37,13 +37,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/map-memory-capture.py

@@ -10,13 +10,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/map-memory-endmark.py

@@ -10,13 +10,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/map-memory-recall.py

@@ -10,13 +10,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/map-memory-session.py

@@ -10,13 +10,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/map-stop.py

@@ -10,13 +10,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/map-token-meter.py

@@ -41,13 +41,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/post-compact-context.py

@@ -20,13 +20,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/pre-compact-save-transcript.py

@@ -20,13 +20,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/ralph-context-pruner.py

@@ -25,13 +25,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/ralph-iteration-logger.py

@@ -19,13 +19,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/safety-guardrails.py

@@ -24,8 +24,8 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-CLOSED mode. This file is a blocking PreToolUse gate whose only job is to
 # refuse unsafe tool calls, so an interpreter it cannot run on must not degrade
@@ -34,7 +34,7 @@ import sys
 # how a PreToolUse hook blocks), so the call stops and the reason -- version,
 # interpreter, fix -- reaches the operator. Fix python3 in another terminal;
 # tool calls stay blocked until `python3 --version` reports 3.11+.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/scrub-internal-ids.py

@@ -14,12 +14,16 @@ Gating (no-op in ~all turns):
     1. ``MAP_INVOKED_BY`` set            -> exit (don't run inside a sub-agent).
     2. no ``.map/<branch>/step_state.json`` OR ``workflow_status`` is not
        ``WORKFLOW_COMPLETE``            -> exit (run not finished).
-    3. marker ``.map/<branch>/.scrub_done`` present -> exit (already ran once).
-    4. ``scrub_internal_ids: false`` in ``.map/config.yaml`` -> exit (opt-out).
+    3. no ``.map/<branch>/run_health_report.json`` -> exit (final verification
+       not yet complete; ``workflow_status`` transitions to ``WORKFLOW_COMPLETE``
+       before the final-verifier step, so we gate on the health report instead).
+    4. marker ``.map/<branch>/.scrub_done`` present -> exit (already ran once).
+    5. ``scrub_internal_ids: false`` in ``.map/config.yaml`` -> exit (opt-out).
 
-When it does run: calls the engine in ``clean`` mode, commits the resulting
-working-tree changes as a dedicated ``chore(map): strip internal workflow IDs``
-commit (never amends), and writes the marker so it fires exactly once.
+When it does run: calls the engine in ``clean`` mode, leaves any cleaned files
+unstaged, prints a short ``stderr`` reminder to the operator, and writes the
+marker so it fires exactly once.  The operator decides how and whether to commit
+the changes (preserving the host repository's commit conventions).
 
 Synchronous by design (justified exception to the async-hook rule): the scrub
 must finish and commit before the run is considered done; a detached run would
@@ -39,13 +43,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"
@@ -135,6 +139,13 @@ def main() -> None:
     if status != "WORKFLOW_COMPLETE":
         _silent()
 
+    # Gate on run_health_report.json: written after the final-verifier step.
+    # workflow_status becomes WORKFLOW_COMPLETE before final verification, so
+    # we wait for the health report to avoid scrubbing while the verifier is
+    # reading HEAD.
+    if not (branch_dir / "run_health_report.json").exists():
+        _silent()
+
     marker = branch_dir / ".scrub_done"
     if marker.exists():
         _silent()
@@ -162,17 +173,16 @@ def main() -> None:
         report = {}
 
     modified = report.get("files_modified") or []
+    # Leave cleaned files unstaged so the operator can review and commit them
+    # using the host repository's conventions (ticket ID, sign-off, etc.).
+    # Never auto-commit with a fixed message.
     if modified:
-        try:
-            subprocess.run(["git", "add", "--", *modified], cwd=PROJECT_DIR,
-                           env=env, capture_output=True, text=True, timeout=15, check=False)
-            subprocess.run(
-                ["git", "commit", "-m", "chore(map): strip internal workflow IDs"],
-                cwd=PROJECT_DIR, env=env, capture_output=True, text=True, timeout=30,
-                check=False,
+        sys.stderr.write(
+            "[scrub-internal-ids] cleaned {} file(s) — review and commit with "
+            "your project's conventions:\n  git add -- {}\n".format(
+                len(modified), " ".join(modified)
             )
-        except (OSError, subprocess.SubprocessError):
-            pass  # leave the cleaned working tree in place; never block
+        )
 
     # Mark done so the scrub fires exactly once for this completed run.
     try:

mapify_cli/templates/codex/hooks/workflow-context-injector.py

@@ -25,13 +25,13 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-OPEN mode. Exit 1 is a non-blocking hook error for Claude Code (only
 # exit 2, or a JSON deny, blocks a tool call), so the reason reaches the user
 # and the session continues -- a broken interpreter is not a policy decision.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/hooks/workflow-gate.py

@@ -45,8 +45,8 @@ import sys
 # evaluated annotations) fails with a message that never mentions the version.
 # Name the real cause instead. Kept in sync with
 # mapify_cli/python_runtime.MINIMUM_PYTHON.
-# UP036 is suppressed on purpose: the project targets 3.11, but the interpreter
-# executing this shipped file is the user's `python3`, not the project's.
+# Compare the runtime tuple: the executing interpreter is the user's `python3`,
+# not necessarily the Python version targeted by the project's static checker.
 #
 # FAIL-CLOSED mode. This file is a blocking PreToolUse gate whose only job is to
 # refuse unsafe tool calls, so an interpreter it cannot run on must not degrade
@@ -55,7 +55,7 @@ import sys
 # how a PreToolUse hook blocks), so the call stops and the reason -- version,
 # interpreter, fix -- reaches the operator. Fix python3 in another terminal;
 # tool calls stay blocked until `python3 --version` reports 3.11+.
-if sys.version_info < (3, 11):  # noqa: UP036
+if tuple(sys.version_info) < (3, 11):
     _MAP_PYTHON_PROBLEM = (
         f"MAP requires Python 3.11 or newer, but {sys.executable} is "
         f"Python {sys.version_info[0]}.{sys.version_info[1]}.\n"

mapify_cli/templates/codex/skills/map-efficient/SKILL.md

@@ -96,7 +96,7 @@ Resolve pending approval holds before `resume_from_plan` initializes any executi
 python3 .map/scripts/map_step_runner.py list_approval_holds --state pending
 ```
 
-A pending `plan_approval` requires an explicit operator approve/deny, recorded via `decide_approval_hold <hold-id> <approved|denied> --note "<operator note>"`: approved continues into Step 0, denied STOPS here — revise the plan and re-run `$map-plan` (no staleness re-check); an autonomous chain never reaches this ask because its pre-phase `auto_decide_holds` poll approves `plan_approval` first. A pending `dangerous_action`/`safety_guardrail` hold refuses to proceed instead — surface the hold's `reason` and stop.
+A ready plan needs no approval. A pending `plan_approval` (left by an older `$map-plan`) is not a gate: do not ask — close it via `decide_approval_hold <hold-id> approved --note "plan_approval no longer gates execution"` and continue into Step 0. A pending `dangerous_action`/`safety_guardrail` hold refuses to proceed instead — surface the hold's `reason` and stop.
 
 ## Step 0: Resume Existing State Or Plan
 

mapify_cli/templates/codex/skills/map-efficient/efficient-reference.md

@@ -6,9 +6,8 @@ Load only the section needed by the active phase.
 ## Approval-Hold Preflight
 
 Resolve any pending approval hold BEFORE Step 0's `resume_from_plan`
-bootstraps execution state — a hold left pending means execution has not
-been explicitly authorized, and a denied plan must stop before any
-`step_state.json` exists.
+bootstraps execution state. A ready plan itself needs no approval —
+`$map-plan` no longer opens a hold.
 
 ```bash
 python3 .map/scripts/map_step_runner.py list_approval_holds --state pending
@@ -16,31 +15,20 @@ python3 .map/scripts/map_step_runner.py list_approval_holds --state pending
 
 Each pending hold's `kind` decides the branch:
 
-- **`plan_approval`** — the operator must explicitly approve or deny before
-  execution starts:
+- **`plan_approval`** (left by an older `$map-plan`) — not a gate. Do not
+  ask the operator; close it and continue:
   ```bash
   python3 .map/scripts/map_step_runner.py decide_approval_hold \
-    <hold-id> approved --note "approved by operator; proceeding with plan"
-  # or:
-  python3 .map/scripts/map_step_runner.py decide_approval_hold \
-    <hold-id> denied --note "<why the plan was denied>"
+    <hold-id> approved --note "plan_approval no longer gates execution"
   ```
-  - **Approved** — continue into the pre-flight test baseline below.
-  - **Denied** — STOP. Tell the operator to revise the plan and re-run
-    `$map-plan`; there is no staleness re-check against the denied blueprint
-    — the operator who denied it is the same operator re-running
-    `$map-efficient`.
 - **`dangerous_action` / `safety_guardrail`** (hard stops) — never decide
   these from inside the preflight. Refuse to proceed: surface the hold's
   `reason` and `request_summary`, and stop. The operator resolves the
   underlying issue out of band and decides the hold via `decide_approval_hold`
   before retrying.
 
-An autonomous chain never reaches the interactive ask above: its pre-phase
-`auto_decide_holds` poll auto-approves `plan_approval` before `$map-efficient`
-starts, so the preflight here finds nothing pending. If the operator
-already decided the hold manually (CLI) before starting `$map-efficient`, the
-preflight likewise finds nothing pending and proceeds without asking.
+If the operator already decided a hold manually (CLI) before starting
+`$map-efficient`, the preflight finds nothing pending and proceeds.
 
 ## Pre-Monitor Gates
 

mapify_cli/templates/codex/skills/map-plan/SKILL.md

@@ -130,6 +130,18 @@ that the PRD became ready.
 
 ---
 
+## Pre-flight: Wayfinding Handoff (optional)
+
+A handoff seeds a fresh plan ONLY after Resume Detection returns `no_plan` (or after operator-confirmed archival resolves `goal_mismatch`). On `resume`, existing spec/task-plan wins and the handoff is NOT re-consumed; never overwrite an in-progress plan by re-seeding.
+
+- For explicit `--wayfind <slug>`, select `.map/wayfind/<slug>/handoff.json` (repo-level).
+- Otherwise run `python3 .map/scripts/wayfind_runner.py list_handoffs`; exactly one completed handoff may be offered, but consume only on an explicit user yes. Never guess a match; zero/multiple handoffs means skip.
+- For BOTH explicit and user-accepted offered handoffs, run `python3 .map/scripts/wayfind_runner.py validate_wayfind_handoff <slug>` immediately before seeding. Non-success → STOP: stale, tampered, missing or actively corrected managed evidence is not settled input. Success with `evidence_status: legacy_unrecorded` → surface the provenance warning, never call it verified. Validation is read-only and proves integrity, not truth; do not repair or migrate the map on read.
+
+When a handoff is used, pre-seed the spec: `decisions[]` → **Decisions Made** (settled; do not re-ask), `out_of_scope[]` → **Out of Scope**, `remaining_risks[]` → **Open Questions**. Unresolved research and corrections in risks are not decisions. Continue for anything the handoff did not settle; never modify the wayfinding map.
+
+---
+
 ## Pre-flight: Workflow-Fit Gate
 
 Assess whether MAP planning is warranted. Evaluate these signals:
@@ -773,13 +785,9 @@ Record artifacts in the manifest:
 ```
 exec_command:
   cmd: |
-    PLAN_ARTIFACTS_RESULT=$(python3 .map/scripts/map_step_runner.py record_plan_artifacts)
-    printf '%s\n' "$PLAN_ARTIFACTS_RESULT"
-    PLAN_APPROVAL_HOLD_ID=$(printf '%s' "$PLAN_ARTIFACTS_RESULT" | jq -r '.plan_approval_hold_id // empty')
+    python3 .map/scripts/map_step_runner.py record_plan_artifacts
 ```
 
-`record_plan_artifacts` also opens a `plan_approval` hold at the plan-ready boundary and returns it as `plan_approval_hold_id` (idempotent — re-running finds the same pending hold instead of spamming a new one). Capture `PLAN_APPROVAL_HOLD_ID` for the Step 8 checkpoint. This hold does **not** block `$map-plan` itself: planning artifacts are written and Step 8 prints its checkpoint regardless of whether the hold is still pending. The decision (`decide_approval_hold <hold-id> approved|denied`) happens later, at the `$map-efficient` approval-hold preflight — or automatically via an autonomous chain's `auto_decide_holds` poll. If the result instead carries `plan_approval_hold_error: true`, the hold store failed — say so in the Step 8 checkpoint and have the operator create/decide the hold manually (`create_approval_hold --kind plan_approval ...`).
-
 ---
 
 ## Step 8: Output Checkpoint
@@ -804,7 +812,6 @@ exec_command:
     echo "[ok] Plan written to .map/${BRANCH}/task_plan_${BRANCH}.md"
     echo "[ok] artifact_manifest.json updated"
     echo "[ok] Mode: [standard | light | deep]"
-    echo "[ok] Plan approval hold: ${PLAN_APPROVAL_HOLD_ID:-none} — decide via decide_approval_hold <hold-id> <approved|denied> --note \"<operator note>\" before \$map-efficient will proceed"
     echo ""
     echo "Next steps:"
     echo "  1. Review .map/${BRANCH}/task_plan_${BRANCH}.md"

mapify_cli/templates/codex/skills/map-release/SKILL.md

@@ -73,7 +73,7 @@ Execute all 12 gates. Read the full gate scripts in [release-reference.md § Pha
 - **Gates 5–6:** Build + twine check
 - **Gate 7:** Security audit (`pip-audit`)
 - **Gates 8–10:** Git state — main branch, clean working directory, up-to-date with origin
-- **Gate 11:** Latest CI run on main must have `conclusion: "success"`
+- **Gate 11:** CI run for `git merge-base HEAD origin/main` must have `conclusion: "success"`; unpushed commits may touch only release metadata
 - **Gate 12:** CHANGELOG.md completeness (Unreleased section exists and has content; commit/entry gap check)
 
 **If any gate fails:** ABORT. Fix issues, re-run Phase 1.
@@ -81,27 +81,21 @@ Execute all 12 gates. Read the full gate scripts in [release-reference.md § Pha
 ## Phase 2: Version Determination
 
 Read CHANGELOG.md `[Unreleased]` section to determine bump type (MAJOR/MINOR/PATCH/EXPLICIT).
-Get current version from `pyproject.toml`. Ask the user directly for the bump type.
+Get current version from `pyproject.toml`.
 
-See [release-reference.md § Phase 2](release-reference.md#phase-2-version-determination) for the full question/option block.
-
-## Phase 3: Execute Version Bump Script
+Ask the user directly for PATCH / MINOR / MAJOR / EXPLICIT, and wait for their answer.
 
-Run `./scripts/bump-version.sh --yes "$BUMP_TYPE"`, then verify:
+For EXPLICIT, ask separately for the exact version. Carry only the user's approved
+`BUMP_TYPE` and exact `NEW_VERSION` into Phase 3; each command runs in a fresh shell.
 
-```bash
-# Verify tag points to HEAD
-TAG_COMMIT=$(git rev-list -n 1 "$LAST_TAG")
-HEAD_COMMIT=$(git rev-parse HEAD)
-[[ "$TAG_COMMIT" != "$HEAD_COMMIT" ]] && echo "❌ Tag mismatch" && exit 1
+See [release-reference.md § Phase 2](release-reference.md#phase-2-version-determination) for the full question/option block.
 
-# 🚨 CRITICAL: Verify __version__ in __init__.py (bump-version.sh known bug)
-INIT_VERSION=$(grep -m1 -E '^__version__ = ' src/mapify_cli/__init__.py | sed -E 's/__version__ = "(.*)"/\1/')
-TAG_VERSION="${LAST_TAG#v}"
-[[ "$INIT_VERSION" != "$TAG_VERSION" ]] && echo "❌ __version__ mismatch — fix manually, see reference" && exit 1
+## Phase 3: Execute Version Bump Script
 
-echo "✅ Version bump successful: all version fields match"
-```
+Show the exact approved version and bump type, then execute the Phase 3 reference
+blocks with those values explicitly supplied in each invocation. Never rely on
+variables left by a previous shell. Verify the version-derived `vX.Y.Z` tag points
+to HEAD and both version fields match it using the Phase 3.3 reference block.
 
 If `__version__` mismatches, follow the fix procedure in [release-reference.md § Phase 3 workaround](release-reference.md#phase-3-execute-version-bump-script).
 
@@ -109,25 +103,24 @@ If `__version__` mismatches, follow the fix procedure in [release-reference.md
 
 **⚠️ CRITICAL PHASE:** Once the tag is pushed the release workflow triggers and publishes to PyPI.
 
-Re-verify: on main branch, CI passed, tag does not already exist on remote. Then ask the user directly for **explicit confirmation** (YES / NO / REVIEW options). See [release-reference.md § Phase 4](release-reference.md#phase-4-push-commit-and-tag-irreversible) for the full confirmation block.
+Re-verify: on main branch, exact merge-base CI completed successfully with matching
+`headSha`, only the three allowed metadata files changed, version-derived tag
+points to HEAD and does not already exist on remote. Then request **explicit user
+confirmation** (YES / NO / REVIEW options).
 
-```bash
-git push origin main
-git push origin "$LAST_TAG"
-```
+Ask the user directly and wait; only an unambiguous YES authorizes pushing.
+
+Read [release-reference.md § Phase 4](release-reference.md#phase-4-push-commit-and-tag-irreversible)
+for the confirmation and push blocks. Recompute the tag in the push invocation;
+consent for an earlier version or commit does not authorize a changed release.
 
 If user aborts: stop workflow, exit gracefully. Tag remains local only.
 
 ## Phase 5: CI/CD Monitoring
 
-Wait for the release workflow to start, then watch it to completion:
-
-```bash
-gh run list --workflow=release.yml --limit 1 --json databaseId,status,conclusion,createdAt
-gh run watch "$RUN_ID"
-FINAL_STATUS=$(gh run view "$RUN_ID" --json conclusion --jq '.conclusion')
-[[ "$FINAL_STATUS" != "success" ]] && echo "❌ Release workflow failed — see reference for rollback" && exit 1
-```
+Use the Phase 5 reference block: recompute the version-derived tag and release
+commit, select `release.yml` for that exact commit (not latest-main), derive
+`RUN_ID` in the same shell, then watch and validate the final status and `headSha`.
 
 The GitHub Release is created automatically by the workflow (no manual step).