refactorai-cli 0.7.7__tar.gz → 0.7.9__tar.gz

{refactorai_cli-0.7.7 → refactorai_cli-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.7.7
+Version: 0.7.9
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,7 +8,7 @@ Requires-Dist: typer>=0.12.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: refactorai-core>=3.2.19
+Requires-Dist: refactorai-core>=3.2.20
 
 # refactorai-cli
 

{refactorai_cli-0.7.7 → refactorai_cli-0.7.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "refactorai-cli"
-version = "0.7.7"
+version = "0.7.9"
 description = "Local-first CLI for the refactor platform"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -12,7 +12,7 @@ dependencies = [
   "httpx>=0.27.0",
   "rich>=13.7.0",
   "PyYAML>=6.0.1",
-  "refactorai-core>=3.2.19",
+  "refactorai-core>=3.2.20",
 ]
 
 [project.scripts]

{refactorai_cli-0.7.7 → refactorai_cli-0.7.9}/refactorai_cli/__init__.py

@@ -5,4 +5,4 @@ the shared `refactor_core` pipeline from a project folder while staying
 authenticated to the hosted platform via a developer key.
 """
 
-__version__ = "0.7.7"
+__version__ = "0.7.9"

{refactorai_cli-0.7.7 → refactorai_cli-0.7.9}/refactorai_cli/cloud_rr.py

@@ -328,6 +328,20 @@ def _missing_binaries(command: str | None, *, env: dict | None = None) -> list[s
     return [b for b in _required_binaries(command) if not _binary_on_path(b, env=env)]
 
 
+def _command_runtimes(command: str | None) -> list[str]:
+    """Managed runtime ids implied by the command's required binaries."""
+    if not command:
+        return []
+    from refactor_core.host_toolchain import binary_to_runtime
+
+    out: list[str] = []
+    for binary in _required_binaries(command):
+        runtime = binary_to_runtime(binary)
+        if runtime and runtime not in out:
+            out.append(runtime)
+    return out
+
+
 def _normalize_command_interpreters(command: str | None, *, env: dict | None = None) -> str | None:
     """Rewrite a bare ``python`` command token to ``python3`` when needed.
 
@@ -521,12 +535,12 @@ def _provision_toolchain(
 ) -> tuple[dict | None, str]:
     """Provision managed runtimes for every missing binary in ``test_command``.
 
-    Returns ``(env, note)``. ``env`` (with the toolchain(s) on ``PATH``) is
-    returned only when at least one runtime was actually provisioned; otherwise
-    ``None`` (the caller runs with the inherited environment). Composite commands
-    are handled per segment so a monorepo runner like ``cd client && npm test &&
-    cd server && pytest`` provisions BOTH node and python. No-ops when the command
-    is already runnable, has no managed runtime, or provisioning is disabled.
+    Returns ``(env, note)``. ``env`` (with provisioned toolchain(s) on ``PATH``)
+    is returned only when at least one runtime was provisioned; otherwise
+    ``None`` (caller uses inherited env). Composite commands are handled per
+    segment so e.g. ``cd client && npm test && cd server && pytest`` can
+    provision BOTH node and python. Dependency restore is run-level and handled
+    by the caller after provisioning.
     """
     if not test_command or not _managed_toolchain_enabled(config):
         return None, ""
@@ -570,10 +584,6 @@ def _provision_toolchain(
             continue
         _emit(progress_cb, phase="rr", event="toolchain_ready", runtime=runtime)
         merged_env = _merge_toolchain_env(merged_env, env)
-        _restore_dependencies(
-            execution_root, runtime, merged_env, progress_cb,
-            config=config, dep_locator_cb=dep_locator_cb,
-        )
 
     return merged_env, " ".join(n for n in notes if n).strip()
 
@@ -1607,10 +1617,18 @@ def run_cloud_refactor_requests(
     if toolchain_note:
         notes.append(toolchain_note)
 
-    if not requests:
-        return _build_artifact(
-            run_store, run_id, constitution, model_id, outcomes, counts,
-            notes, stopped=False, stop_reason="", test_command=test_command,
+    # Run-level dependency preflight: always attempt dependency restoration for
+    # runtimes implied by the configured test command, even when binaries are
+    # already present on PATH. This prevents import-time baseline failures from
+    # deferring requests one-by-one later in the loop.
+    for runtime in _command_runtimes(test_command):
+        _restore_dependencies(
+            execution_root,
+            runtime,
+            toolchain_env,
+            progress_cb,
+            config=config,
+            dep_locator_cb=_dep_locator,
         )
 
     # Fail-fast: if a test command is configured but STILL not runnable after
@@ -1642,6 +1660,43 @@ def run_cloud_refactor_requests(
             notes, stopped=True, stop_reason=reason, test_command=test_command,
         )
 
+    # Run-level baseline characterization: execute ONCE and reuse for all RR
+    # steps. If baseline is red, stop the run before opening the RR session so
+    # requests are not deferred one-by-one for dependency/env failures.
+    baseline_ok, baseline_detail = _run_test(execution_root, test_command, env=toolchain_env)
+    _emit(
+        progress_cb,
+        phase="rr",
+        event="baseline_test",
+        rr_id="",
+        passed=baseline_ok,
+        detail=baseline_detail,
+        execution_env="host+toolchain" if toolchain_env else "host",
+    )
+    if not baseline_ok:
+        reason = (
+            "baseline characterization test is not green. "
+            f"Fix test/dependency issues, then retry. Detail: {baseline_detail}"
+        )
+        _emit(
+            progress_cb,
+            phase="rr",
+            event="preflight_failed",
+            reason=reason,
+            test_command=test_command or "",
+        )
+        notes.append(reason)
+        return _build_artifact(
+            run_store, run_id, constitution, model_id, outcomes, counts,
+            notes, stopped=True, stop_reason=reason, test_command=test_command,
+        )
+
+    if not requests:
+        return _build_artifact(
+            run_store, run_id, constitution, model_id, outcomes, counts,
+            notes, stopped=False, stop_reason="", test_command=test_command,
+        )
+
     session = _Session(
         auth_ctx=auth_ctx,
         execution_mode=execution_mode,
@@ -1704,6 +1759,10 @@ def run_cloud_refactor_requests(
 
     guard = 0
     max_iters = max(50, len(requests) * 25)
+    # Cache the single run-level baseline result and reuse it whenever the
+    # server asks for `run_baseline_test` for a specific RR.
+    cached_baseline: tuple[bool, str] = (baseline_ok, baseline_detail)
+
     while guard < max_iters:
         guard += 1
         act = str(action.get("action", ""))
@@ -1716,7 +1775,7 @@ def run_cloud_refactor_requests(
             current_rr_id = action.get("rr_id", "") or current_rr_id
             _emit(progress_cb, phase="rr", event="test_generating", rr_id=current_rr_id)
             _write_generated_test(project_root, current_rr_id, action, by_id)
-            passed, detail = _run_test(execution_root, test_command, env=toolchain_env)
+            passed, detail = cached_baseline
             _emit(progress_cb, phase="rr", event="baseline_test", rr_id=current_rr_id,
                   passed=passed, detail=detail,
                   execution_env="host+toolchain" if toolchain_env else "host")

{refactorai_cli-0.7.7 → refactorai_cli-0.7.9}/refactorai_cli/commands/watch_cmds.py

@@ -13,6 +13,7 @@ headless). The heavy lifting (state machine, rendering, review parsing) lives in
 
 from __future__ import annotations
 
+import contextlib
 import json
 import os
 import select
@@ -294,6 +295,36 @@ def _ingest_event(project_root: Path, state: WatchState, event: dict) -> None:
         node.rr_preview = preview
 
 
+def _has_refactor_merge_evidence(project_root: Path, node, fin: FinalizeInfo) -> bool:
+    """True when this finalize branch has concrete evidence of refactor commits.
+
+    Guards against false "merged" labels when a branch exists but carries no
+    applied RR commits (for example, a deferred/no-op run where the branch tip is
+    still the same as the source commit).
+    """
+    # Strongest signal: persisted per-request commits for this branch.
+    if getattr(fin, "commits", None):
+        return True
+    # Fallback signal: branch tip diverged from the source commit.
+    source_sha = str(getattr(fin, "source_sha", "") or getattr(node, "sha", "") or "")
+    try:
+        branch_tip = git_scope.resolve_sha(project_root, fin.refactor_branch) or ""
+    except Exception:
+        branch_tip = ""
+    return bool(branch_tip and source_sha and not _shas_match(branch_tip, source_sha))
+
+
+def _is_still_merged(project_root: Path, fin: FinalizeInfo, primary: str) -> bool:
+    """Best-effort check that a branch is really merged into primary."""
+    try:
+        # Use deep=True to also preserve squash/rebase merges.
+        return git_scope.branch_merged_into(
+            project_root, fin.refactor_branch, primary, deep=True
+        )
+    except Exception:
+        return True
+
+
 def reconcile_merged(project_root: Path, state: WatchState, *, deep: bool = False) -> None:
     """Detect refactor branches integrated into the primary branch out-of-band.
 
@@ -310,7 +341,18 @@ def reconcile_merged(project_root: Path, state: WatchState, *, deep: bool = Fals
         fin = getattr(node, "finalize", None)
         if fin is None or not fin.branch_exists:
             continue
-        if fin.outcome in (refactor_branch_store.OUTCOME_MERGED, refactor_branch_store.OUTCOME_DROPPED):
+        if fin.outcome == refactor_branch_store.OUTCOME_MERGED:
+            # Self-heal stale metadata: if a prior run marked merged incorrectly
+            # but the branch is still not merged, clear the terminal outcome.
+            if not _is_still_merged(project_root, fin, primary):
+                refactor_branch_store.set_outcome(project_root, fin.refactor_branch, "")
+                node.finalize = resolve_finalize(project_root, node)
+                watch_ledger.record_commit(project_root, node)
+            continue
+        if fin.outcome == refactor_branch_store.OUTCOME_DROPPED:
+            continue
+        # Don't infer merged for empty/no-op branches.
+        if not _has_refactor_merge_evidence(project_root, node, fin):
             continue
         try:
             merged = git_scope.branch_merged_into(project_root, fin.refactor_branch, primary, deep=deep)
@@ -632,6 +674,25 @@ def _launch_interactive(cmd: list[str], cwd: Path) -> int:
         return 130
 
 
+def _wait_for_return_key() -> None:
+    """Block until one key is pressed before returning to the watch TUI.
+
+    Used for short-lived actions like ``diff`` so output does not flash and
+    disappear when the live screen resumes.
+    """
+    if not sys.stdin.isatty():
+        # Fallback for non-tty stdin where `_read_key` cannot detect a raw key.
+        with contextlib.suppress(EOFError, KeyboardInterrupt):
+            typer.prompt("Press Enter to return to the Refactor Terminal", default="")
+        return
+
+    console.print("[dim]watch: press any key to return to the Refactor Terminal...[/dim]")
+    while True:
+        key = _read_key(0.1)
+        if key:
+            return
+
+
 def _run_json_stream(project_root: Path, state: WatchState, runner: ReviewRunner, once: bool) -> None:
     """Emit a newline-delimited JSON node-event stream (agents / headless)."""
     emitted: dict[str, str] = {}
@@ -703,6 +764,8 @@ def _run_action(
     console.print(f"\n[bold bright_cyan]watch:[/bold bright_cyan] {action} for "
                   f"[yellow]{node.short_sha}[/yellow] ({node.branch or 'detached'})\n")
     _launch_interactive(cmd, project_root)
+    if action == "diff":
+        _wait_for_return_key()
     if action == "refresh":
         # `[f]` explicitly regenerates requests, so re-review this commit on the
         # next pass (also clears any `[b] back` override).

{refactorai_cli-0.7.7 → refactorai_cli-0.7.9}/refactorai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.7.7
+Version: 0.7.9
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,7 +8,7 @@ Requires-Dist: typer>=0.12.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: refactorai-core>=3.2.19
+Requires-Dist: refactorai-core>=3.2.20
 
 # refactorai-cli
 

{refactorai_cli-0.7.7 → refactorai_cli-0.7.9}/refactorai_cli.egg-info/requires.txt

@@ -2,4 +2,4 @@ typer>=0.12.0
 httpx>=0.27.0
 rich>=13.7.0
 PyYAML>=6.0.1
-refactorai-core>=3.2.19
+refactorai-core>=3.2.20