prizmkit 1.1.148 → 1.1.150

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

@@ -39,7 +39,7 @@ class ResetOptions:
     item_range: tuple[str, str] | None = None
     filter_mode: str = ""
     clean: bool = False
-    run_after: bool = False
+    preserve_runtime: bool = False
     help_requested: bool = False
     unknown_args: tuple[str, ...] = ()
 
@@ -99,14 +99,20 @@ STALLED_FILTER_STATUSES = {
 def run_reset_command(kind: str, legacy_args: tuple[str, ...], paths) -> CommandResult:
     """Run a manual reset command for feature, bugfix, or refactor."""
     family = family_for(kind, paths)
-    options = _parse_reset_args(family, legacy_args)
+    try:
+        options = _parse_reset_args(family, legacy_args)
+    except ValueError as exc:
+        return CommandResult(2, f"Python {kind} reset", str(exc))
     if options.help_requested:
         return CommandResult(0, f"Python {kind} reset", _help_text(family), stdout=_help_text(family))
+    option_error = _reset_option_error(family, options)
+    if option_error:
+        return CommandResult(2, f"Python {kind} reset", option_error)
 
     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 (family.state_dir / "pipeline.json").is_file():
+    if not options.preserve_runtime 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(
@@ -115,10 +121,26 @@ def run_reset_command(kind: str, legacy_args: tuple[str, ...], paths) -> Command
         item_range=options.item_range,
         filter_mode=options.filter_mode,
         clean=options.clean,
-        run_after=options.run_after,
+        preserve_runtime=options.preserve_runtime,
         help_requested=options.help_requested,
         unknown_args=options.unknown_args,
     )
+    if options.preserve_runtime:
+        from .reset_preserve import run_preserve_runtime_reset
+
+        preserve_result = run_preserve_runtime_reset(
+            family,
+            options.list_path,
+            paths.project_root,
+        )
+        text = "\n".join(preserve_result.lines(family, options.list_path))
+        return CommandResult(
+            0 if preserve_result.ok else 1,
+            f"Python {kind} reset",
+            text,
+            stdout=text,
+        )
+
     try:
         items = _resolve_items(family, options)
     except ValueError as exc:
@@ -126,18 +148,6 @@ def run_reset_command(kind: str, legacy_args: tuple[str, ...], paths) -> Command
     if not items:
         return CommandResult(0, f"Python {kind} reset", f"No {FAMILY_LABELS[kind]}s found with status: {options.filter_mode}")
 
-    if options.run_after and len(items) > 1:
-        options = ResetOptions(
-            list_path=options.list_path,
-            item_id=options.item_id,
-            item_range=options.item_range,
-            filter_mode=options.filter_mode,
-            clean=options.clean,
-            run_after=False,
-            help_requested=False,
-            unknown_args=options.unknown_args,
-        )
-
     lines: list[str] = []
     success = 0
     failed = 0
@@ -155,14 +165,6 @@ def run_reset_command(kind: str, legacy_args: tuple[str, ...], paths) -> Command
             failed += 1
 
     lines.append(f"Reset complete: {success} succeeded, {failed} failed")
-    if options.run_after and len(items) == 1 and failed == 0:
-        from .runners import run_pipeline_command
-
-        lines.append(f"Auto-retrying {items[0].item_id} via Python foreground runner...")
-        retry_result = run_pipeline_command(kind, "run", (items[0].item_id, str(options.list_path)), paths)
-        lines.append(retry_result.render())
-        return CommandResult(retry_result.exit_code, f"Python {kind} reset", "\n".join(lines), stdout="\n".join(lines))
-
     return CommandResult(0 if failed == 0 else 1, f"Python {kind} reset", "\n".join(lines), stdout="\n".join(lines))
 
 
@@ -173,7 +175,7 @@ def _parse_reset_args(family: RunnerFamily, legacy_args: Sequence[str]) -> Reset
     item_range: tuple[str, str] | None = None
     filter_mode = ""
     clean = False
-    run_after = False
+    preserve_runtime = False
     help_requested = False
     unknown: list[str] = []
     positional: list[str] = []
@@ -185,10 +187,19 @@ def _parse_reset_args(family: RunnerFamily, legacy_args: Sequence[str]) -> Reset
             help_requested = True
         elif arg == "--clean":
             clean = True
+        elif arg == "--preserve-runtime":
+            preserve_runtime = True
         elif arg == "--run":
-            run_after = True
+            raise ValueError(
+                "Reset no longer accepts --run. Run reset first, then execute "
+                f"`{family.kind} run` as a separate command."
+            )
         elif arg in FILTER_FLAGS:
-            filter_mode = FILTER_FLAGS[arg]
+            next_filter = FILTER_FLAGS[arg]
+            if filter_mode and filter_mode != next_filter:
+                unknown.append(arg)
+            else:
+                filter_mode = next_filter
         elif arg.startswith("-"):
             unknown.append(arg)
         else:
@@ -211,12 +222,26 @@ def _parse_reset_args(family: RunnerFamily, legacy_args: Sequence[str]) -> Reset
         item_range=item_range,
         filter_mode=filter_mode,
         clean=clean,
-        run_after=run_after,
+        preserve_runtime=preserve_runtime,
         help_requested=help_requested,
         unknown_args=tuple(unknown),
     )
 
 
+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:
+        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."
+    return ""
+
+
 def _resolve_list_path(path: Path, project_root: Path) -> Path:
     return path.resolve() if path.is_absolute() else (project_root / path).resolve()
 
@@ -430,7 +455,9 @@ 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] [--run] "
+        f"Usage: prizmkit-runtime reset {family.kind} <{label}-id|range> [--clean] "
         "[--auto-skipped|--failed|--stalled] [list-path]\n"
-        "Reset is a destructive manual operation and is not used for automatic context continuation."
+        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."
     )