prizmkit 1.1.153 → 1.1.155

package/bundled/dev-pipeline/prizmkit_runtime/reset.py

@@ -38,8 +38,11 @@ class ResetOptions:
     item_id: str = ""
     item_range: tuple[str, str] | None = None
     filter_mode: str = ""
+    state_only: bool = False
+    fresh_checkout: bool = False
     clean: bool = False
     preserve_runtime: bool = False
+    all_items: bool = False
     help_requested: bool = False
     unknown_args: tuple[str, ...] = ()
 
@@ -112,7 +115,7 @@ def run_reset_command(kind: str, legacy_args: tuple[str, ...], paths) -> Command
     list_path = _resolve_list_path(options.list_path, paths.project_root)
     if not list_path.is_file():
         return CommandResult(1, f"Python {kind} reset", f"{kind} list not found: {list_path}")
-    if not options.preserve_runtime and not (family.state_dir / "pipeline.json").is_file():
+    if (options.fresh_checkout or options.clean) and not (family.state_dir / "pipeline.json").is_file():
         return CommandResult(1, f"Python {kind} reset", f"No pipeline state found. Run the {kind} pipeline first to initialize.")
 
     options = ResetOptions(
@@ -120,8 +123,11 @@ def run_reset_command(kind: str, legacy_args: tuple[str, ...], paths) -> Command
         item_id=options.item_id,
         item_range=options.item_range,
         filter_mode=options.filter_mode,
+        state_only=options.state_only,
+        fresh_checkout=options.fresh_checkout,
         clean=options.clean,
         preserve_runtime=options.preserve_runtime,
+        all_items=options.all_items,
         help_requested=options.help_requested,
         unknown_args=options.unknown_args,
     )
@@ -140,6 +146,16 @@ def run_reset_command(kind: str, legacy_args: tuple[str, ...], paths) -> Command
             text,
             stdout=text,
         )
+    if options.state_only:
+        state_result = _run_state_only_updater(family, options, paths.project_root)
+        text = state_result.stdout.strip() or state_result.stderr.strip() or "State-only reset failed"
+        ok = state_result.returncode == 0 and _json_without_error(state_result.stdout)
+        return CommandResult(
+            0 if ok else 1,
+            f"Python {kind} reset --state-only",
+            text,
+            stdout=text,
+        )
 
     try:
         items = _resolve_items(family, options)
@@ -174,8 +190,11 @@ def _parse_reset_args(family: RunnerFamily, legacy_args: Sequence[str]) -> Reset
     item_id = ""
     item_range: tuple[str, str] | None = None
     filter_mode = ""
+    state_only = False
+    fresh_checkout = False
     clean = False
     preserve_runtime = False
+    all_items = False
     help_requested = False
     unknown: list[str] = []
     positional: list[str] = []
@@ -183,16 +202,22 @@ def _parse_reset_args(family: RunnerFamily, legacy_args: Sequence[str]) -> Reset
     index = 0
     while index < len(args):
         arg = args[index]
-        if arg in {"--help", "-h", "help"}:
+        if arg in {"--help", "-h"}:
             help_requested = True
+        elif arg == "--state-only":
+            state_only = True
+        elif arg == "--fresh-checkout":
+            fresh_checkout = True
         elif arg == "--clean":
             clean = True
         elif arg == "--preserve-runtime":
             preserve_runtime = True
+        elif arg == "--all":
+            all_items = True
         elif arg == "--run":
             raise ValueError(
                 "Reset no longer accepts --run. Run reset first, then execute "
-                f"`{family.kind} run` as a separate command."
+                f"`run {family.kind}` as a separate command."
             )
         elif arg in FILTER_FLAGS:
             next_filter = FILTER_FLAGS[arg]
@@ -208,9 +233,15 @@ def _parse_reset_args(family: RunnerFamily, legacy_args: Sequence[str]) -> Reset
 
     for value in positional:
         if _looks_like_range(value, family.id_prefix):
-            item_range = _normalize_range(value, family.id_prefix)
-        elif _looks_like_item_id(value, family.id_prefix) and not item_id:
-            item_id = _normalize_item_id(value, family.id_prefix)
+            if item_range is None and not item_id:
+                item_range = _normalize_range(value, family.id_prefix)
+            else:
+                unknown.append(value)
+        elif _looks_like_item_id(value, family.id_prefix):
+            if not item_id and item_range is None:
+                item_id = _normalize_item_id(value, family.id_prefix)
+            else:
+                unknown.append(value)
         elif list_path == family.plan_path:
             list_path = Path(value).expanduser()
         else:
@@ -221,8 +252,11 @@ def _parse_reset_args(family: RunnerFamily, legacy_args: Sequence[str]) -> Reset
         item_id=item_id,
         item_range=item_range,
         filter_mode=filter_mode,
+        state_only=state_only,
+        fresh_checkout=fresh_checkout,
         clean=clean,
         preserve_runtime=preserve_runtime,
+        all_items=all_items,
         help_requested=help_requested,
         unknown_args=tuple(unknown),
     )
@@ -231,14 +265,51 @@ def _parse_reset_args(family: RunnerFamily, legacy_args: Sequence[str]) -> Reset
 def _reset_option_error(family: RunnerFamily, options: ResetOptions) -> str:
     if options.unknown_args:
         return "Unsupported reset arguments: " + " ".join(options.unknown_args)
-    if not options.preserve_runtime:
+
+    selected_modes = [
+        name
+        for name, enabled in (
+            ("--state-only", options.state_only),
+            ("--fresh-checkout", options.fresh_checkout),
+            ("--clean", options.clean),
+            ("--preserve-runtime", options.preserve_runtime),
+        )
+        if enabled
+    ]
+    if len(selected_modes) != 1:
+        return (
+            "Exactly one reset mode is required: --state-only, --fresh-checkout, "
+            "--clean, or --preserve-runtime.\n" + _help_text(family)
+        )
+
+    selectors = sum(
+        bool(value)
+        for value in (
+            options.item_id,
+            options.item_range,
+            options.filter_mode,
+            options.all_items,
+        )
+    )
+    if options.state_only:
+        if options.item_range or options.filter_mode:
+            return "--state-only accepts only one item ID or explicit --all; ranges and status filters are unsupported."
+        if selectors != 1 or not (options.item_id or options.all_items):
+            return "--state-only requires exactly one item ID or explicit --all."
+        return ""
+
+    if options.fresh_checkout or options.clean:
+        if options.all_items:
+            return "--all is supported only with --state-only."
+        if selectors != 1:
+            mode = "--clean" if options.clean else "--fresh-checkout"
+            return f"{mode} requires exactly one item ID, range, or supported status filter."
         return ""
+
     if options.filter_mode != "failed":
         return "--preserve-runtime requires --failed and cannot be used with another reset filter."
-    if options.clean:
-        return "--preserve-runtime and --clean are mutually exclusive."
-    if options.item_id or options.item_range:
-        return "--preserve-runtime is a whole-list failed-chain reset and cannot target an ID or range."
+    if options.item_id or options.item_range or options.all_items:
+        return "--preserve-runtime is a whole-list failed-chain reset and cannot target an ID, range, or --all."
     return ""
 
 
@@ -282,6 +353,8 @@ def _resolve_items(family: RunnerFamily, options: ResetOptions) -> tuple[ResetIt
     for item_id in ids:
         item = by_id.get(item_id)
         if not isinstance(item, dict):
+            if options.item_id:
+                raise ValueError(f"{FAMILY_LABELS[family.kind].title()} '{item_id}' not found in {options.list_path}")
             continue
         title = str(item.get(TITLE_FIELD_BY_KIND[family.kind]) or "")
         resolved.append(ResetItem(item_id=item_id, title=title, slug=_slug_for_item(family, item_id, title), status=str(item.get("status") or "unknown")))
@@ -339,6 +412,8 @@ def _reset_one(family: RunnerFamily, item: ResetItem, options: ResetOptions, pro
         except RuntimeError as exc:
             lines.append(f"ERROR: Reset {item.item_id} checkout identity failed: {exc}")
             return False
+        if options.fresh_checkout:
+            lines.append(f"Fresh-checkout boundary published for {item.item_id}")
         lines.append(f"{item.item_id} {action} complete: status -> pending, retry count -> 0")
         return True
     error = _error_text(result.stdout) or result.stderr.strip() or "unknown"
@@ -346,6 +421,33 @@ def _reset_one(family: RunnerFamily, item: ResetItem, options: ResetOptions, pro
     return False
 
 
+def _run_state_only_updater(
+    family: RunnerFamily,
+    options: ResetOptions,
+    project_root: Path,
+) -> subprocess.CompletedProcess[str]:
+    command = [
+        sys.executable,
+        str(family.updater_script),
+        family.list_arg,
+        str(options.list_path),
+        "--state-dir",
+        str(family.state_dir),
+        "--action",
+        "reset_state",
+    ]
+    if options.item_id:
+        command.extend([family.item_id_arg, options.item_id])
+    return subprocess.run(
+        command,
+        cwd=str(project_root),
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+        check=False,
+    )
+
+
 def _run_updater(family: RunnerFamily, action: str, options: ResetOptions, item: ResetItem, project_root: Path) -> subprocess.CompletedProcess[str]:
     command = [
         sys.executable,
@@ -455,9 +557,14 @@ def _numeric_suffix(value: str, prefix: str) -> int:
 def _help_text(family: RunnerFamily) -> str:
     label = FAMILY_LABELS[family.kind]
     return (
-        f"Usage: prizmkit-runtime reset {family.kind} <{label}-id|range> [--clean] "
-        "[--auto-skipped|--failed|--stalled] [list-path]\n"
+        f"Usage: prizmkit-runtime reset {family.kind} <{label}-id> --state-only [list-path]\n"
+        f"       prizmkit-runtime reset {family.kind} --state-only --all [list-path]\n"
+        f"       prizmkit-runtime reset {family.kind} <{label}-id|range> --fresh-checkout [list-path]\n"
+        f"       prizmkit-runtime reset {family.kind} <--auto-skipped|--failed|--stalled> --fresh-checkout [list-path]\n"
+        f"       prizmkit-runtime reset {family.kind} <{label}-id|range> --clean [list-path]\n"
+        f"       prizmkit-runtime reset {family.kind} <--auto-skipped|--failed|--stalled> --clean [list-path]\n"
         f"       prizmkit-runtime reset {family.kind} --failed --preserve-runtime [list-path]\n"
-        "Reset changes state only and never accepts --run; execute the matching family run command separately.\n"
-        "Standard/clean reset abandons the active checkout boundary. Preserve-runtime reset keeps task runtime and work."
+        "Exactly one reset mode is required. State-only preserves checkout, Git, checkpoints, and artifacts; "
+        "fresh-checkout publishes a new checkout boundary; clean is destructive; preserve-runtime is whole-list failed recovery.\n"
+        "Reset never accepts --run; execute the matching run <family> command separately."
     )

package/bundled/dev-pipeline/prizmkit_runtime/reset_preserve.py

@@ -126,7 +126,7 @@ class PreserveRuntimeResetResult:
                 "Existing sessions, checkpoints, artifacts, branches, worktrees, and task work were not deleted.",
                 "Reset did not start a runner. Run separately:",
                 "python3 ./.prizmkit/dev-pipeline/cli.py "
-                f"{family.kind} run {shlex.quote(str(list_path))}",
+                f"run {family.kind} {shlex.quote(str(list_path))}",
             )
         )
         return tuple(lines)

package/bundled/dev-pipeline/prizmkit_runtime/runner_classification.py

@@ -65,6 +65,17 @@ def classify_session(
             progress_fingerprint=fingerprint,
             checkpoint_state=checkpoint.semantic_snapshot,
         )
+    if (
+        checkpoint is not None
+        and checkpoint.semantic_complete
+        and not _runtime_commit_receipt_matches(project_root, checkpoint)
+    ):
+        return SessionClassification(
+            "commit_missing",
+            reason="runtime_commit_receipt_mismatch",
+            progress_fingerprint=fingerprint,
+            checkpoint_state=checkpoint.semantic_snapshot,
+        )
     if _is_terminal_success(result) and checkpoint is not None and checkpoint.semantic_complete:
         return SessionClassification(
             "success",
@@ -172,6 +183,25 @@ def _is_terminal_success(result: AISessionResult) -> bool:
     )
 
 
+def _runtime_commit_receipt_matches(
+    project_root: Path,
+    checkpoint: CheckpointState,
+) -> bool:
+    """Verify canonical Runtime receipt identity against the current Git HEAD."""
+    commit_hash = checkpoint.semantic.runtime_commit_hash
+    base_head = checkpoint.semantic.runtime_base_head
+    if not commit_hash and not base_head:
+        return True
+    head = run_git_command(project_root, ("rev-parse", "HEAD"))
+    parent = run_git_command(project_root, ("rev-parse", f"{commit_hash}^"))
+    return bool(
+        head.return_code == 0
+        and parent.return_code == 0
+        and head.stdout.strip().lower() == commit_hash.lower()
+        and parent.stdout.strip().lower() == base_head.lower()
+    )
+
+
 def _has_late_runtime_error_after_completion(
     result: AISessionResult,
     checkpoint: CheckpointState | None,
@@ -201,9 +231,27 @@ def has_branch_completion_evidence(
     working_branch: str,
     artifact_path: Path | None,
 ) -> bool:
-    """Return true only when a task branch is ahead and semantically complete."""
-    if not base_branch or not working_branch or not has_completed_artifact_path(artifact_path, project_root):
+    """Require semantic completion and matching Runtime receipt on the task branch."""
+    if not base_branch or not working_branch or artifact_path is None:
+        return False
+    checkpoint_path = artifact_path / "workflow-checkpoint.json"
+    if not checkpoint_path.is_file():
+        return False
+    checkpoint = load_checkpoint_state(checkpoint_path, project_root=project_root)
+    if not checkpoint.semantic_complete:
         return False
+    commit_hash = checkpoint.semantic.runtime_commit_hash
+    base_head = checkpoint.semantic.runtime_base_head
+    if commit_hash or base_head:
+        branch_head = run_git_command(project_root, ("rev-parse", working_branch))
+        parent = run_git_command(project_root, ("rev-parse", f"{commit_hash}^"))
+        if not (
+            branch_head.return_code == 0
+            and parent.return_code == 0
+            and branch_head.stdout.strip().lower() == commit_hash.lower()
+            and parent.stdout.strip().lower() == base_head.lower()
+        ):
+            return False
     return _has_commit_range(project_root, base_branch, working_branch)
 
 

package/bundled/dev-pipeline/prizmkit_runtime/runner_models.py

@@ -79,7 +79,6 @@ class RunnerInvocation:
     item_filter: str = ""
     max_retries: int | None = None
     max_infra_retries: int = 3
-    mode: str | None = None
     dry_run: bool = False
     clean: bool = False
     no_reset: bool = False
@@ -95,7 +94,6 @@ class PromptGenerationResult:
 
     output_path: Path
     model: str = ""
-    pipeline_mode: str = ""
     checkpoint_path: Path | None = None
     artifact_path: Path | None = None
     raw: Mapping[str, object] = field(default_factory=dict)
@@ -273,7 +271,6 @@ def parse_invocation(
     item_filter = ""
     max_retries: int | None = None
     max_infra_retries = 3
-    mode: str | None = None
     dry_run = False
     clean = False
     no_reset = False
@@ -285,7 +282,7 @@ def parse_invocation(
     index = 0
     while index < len(args):
         arg = args[index]
-        if arg in {"--help", "-h", "help"}:
+        if arg in {"--help", "-h"}:
             help_requested = True
         elif arg == "--dry-run":
             dry_run = True
@@ -308,11 +305,6 @@ def parse_invocation(
             max_infra_retries = _safe_int(args[index], 3)
         elif arg.startswith("--max-infra-retries="):
             max_infra_retries = _safe_int(arg.split("=", 1)[1], 3)
-        elif arg == "--mode" and index + 1 < len(args):
-            index += 1
-            mode = args[index]
-        elif arg.startswith("--mode="):
-            mode = arg.split("=", 1)[1]
         elif arg == "--resume-phase" and index + 1 < len(args):
             index += 1
             resume_phase = args[index]
@@ -339,7 +331,6 @@ def parse_invocation(
         item_filter=item_filter,
         max_retries=max_retries,
         max_infra_retries=max_infra_retries,
-        mode=mode,
         dry_run=dry_run,
         clean=clean,
         no_reset=no_reset,

package/bundled/dev-pipeline/prizmkit_runtime/runner_prompts.py

@@ -22,6 +22,7 @@ def generate_prompt(
     project_root: Path,
     execution_root: Path | None = None,
     continuation: dict[str, object] | None = None,
+    preview: bool = False,
 ) -> PromptGenerationResult:
     """Run the existing prompt generator and return its structured JSON result."""
     visible_root = execution_root or project_root
@@ -47,8 +48,8 @@ def generate_prompt(
         "--output",
         str(session_paths.prompt_path),
     ]
-    if invocation.mode:
-        command.extend(["--mode", invocation.mode])
+    if preview:
+        command.append("--no-checkpoint-write")
     if continuation:
         command.extend(["--continuation-mode", "ai_error"])
         for flag, key in (
@@ -95,7 +96,6 @@ def generate_prompt(
     return PromptGenerationResult(
         output_path=output_path,
         model=str(data.get("model") or ""),
-        pipeline_mode=str(data.get("pipeline_mode") or ""),
         checkpoint_path=Path(str(checkpoint)) if checkpoint else None,
         artifact_path=_artifact_path(family, visible_root, item_id, data),
         raw=data,