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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.7.7
+Version: 0.7.8
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

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

@@ -1,6 +1,6 @@
 [project]
 name = "refactorai-cli"
-version = "0.7.7"
+version = "0.7.8"
 description = "Local-first CLI for the refactor platform"
 readme = "README.md"
 requires-python = ">=3.11"

{refactorai_cli-0.7.7 → refactorai_cli-0.7.8}/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.8"

{refactorai_cli-0.7.7 → refactorai_cli-0.7.8}/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.8}/refactorai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.7.7
+Version: 0.7.8
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown