refactorai-cli 0.4.8__tar.gz → 0.4.10__tar.gz

{refactorai_cli-0.4.8 → refactorai_cli-0.4.10}/PKG-INFO

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

{refactorai_cli-0.4.8 → refactorai_cli-0.4.10}/pyproject.toml

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

{refactorai_cli-0.4.8 → refactorai_cli-0.4.10}/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.4.8"
+__version__ = "0.4.10"

{refactorai_cli-0.4.8 → refactorai_cli-0.4.10}/refactorai_cli/commands/watch_cmds.py

@@ -79,6 +79,48 @@ def _preview_for_run(project_root: Path, run_id: str, *, limit: int = 3) -> list
     return lines
 
 
+def _pending_for_run(
+    project_root: Path,
+    run_id: str,
+    *,
+    limit: int = 3,
+) -> tuple[int, list[str]]:
+    """Return ``(pending_count, preview_lines)`` for requests created by ``run_id``."""
+    if not run_id:
+        return 0, []
+    try:
+        from refactor_core.refactor_requests import IN_PROGRESS, PENDING, list_requests
+    except Exception:
+        return 0, []
+    try:
+        requests = list_requests(project_root)
+    except Exception:
+        return 0, []
+    matches = [
+        rr
+        for rr in requests
+        if str(getattr(rr, "created_by_run", "") or "") == run_id
+        and str(getattr(rr, "status", "") or "") in {PENDING, IN_PROGRESS}
+    ]
+    if not matches:
+        return 0, []
+    lines: list[str] = []
+    for rr in matches[: max(1, limit)]:
+        sev = str(getattr(rr, "severity", "medium") or "medium").lower()
+        location = str(getattr(rr, "location", "") or "").strip() or str(
+            getattr(rr, "file_path", "") or "(unknown location)"
+        )
+        rec = _truncate(
+            str(getattr(rr, "recommendation", "") or getattr(rr, "rationale", "") or "").strip(),
+            limit=100,
+        )
+        if rec:
+            lines.append(f"[{sev}] {location} - {rec}")
+        else:
+            lines.append(f"[{sev}] {location}")
+    return len(matches), lines
+
+
 def _resolve_repo(project_root: Path | None) -> Path:
     root = git_scope.repo_root(project_root or Path.cwd())
     if not root:
@@ -175,7 +217,7 @@ def _read_key(timeout: float) -> str:
     """Non-blocking key read on a POSIX TTY, normalized to a token.
 
     Returns ``up``/``down`` for arrow keys, the raw character for normal keys
-    (case preserved so ``[r]`` and ``[R]`` are distinguishable), ``esc`` for a
+    (used for hotkeys like ``[r]`` and ``[f]``), ``esc`` for a
     bare Escape, or ``""`` when nothing was pressed / the terminal is not
     interactive. Sleeps ``timeout`` in the non-interactive case so the caller's
     poll cadence is preserved.
@@ -219,15 +261,19 @@ def _read_key(timeout: float) -> str:
 def build_action_command(action: str, sha: str, *, executable: str = "refactor") -> list[str] | None:
     """Build the argv for a terminal action. Pure + testable (docs/42 Phase 4).
 
-    ``code`` reuses pending requests; ``refresh`` regenerates them. ``merge`` /
-    ``drop`` operate on the refactor branch built by ``code`` (local only).
+    ``code`` reuses pending requests; ``refresh`` regenerates them. Both pass
+    ``--keep`` so resolving from the terminal only *builds* the refactor branch
+    (per-request commits + final test) and never pops its own merge/keep/drop
+    prompt — the terminal's ``[m]`` merge / ``[x]`` drop keys are the single,
+    explicit place that decision is made. ``merge`` / ``drop`` operate on that
+    already-built refactor branch (local only, never pushes).
     """
     if action == "code":
         # Commit-scoped so `[r]` resolves THIS commit's requests (docs/41 Phase 4).
-        return [executable, "code", "--commit", sha]
+        return [executable, "code", "--commit", sha, "--keep"]
     if action == "refresh":
-        # `[R]` regenerates the requests for this commit before resolving.
-        return [executable, "code", "--commit", sha, "--refresh-requests"]
+        # `[f]` regenerates the requests for this commit before resolving.
+        return [executable, "code", "--commit", sha, "--refresh-requests", "--keep"]
     if action == "diff":
         # Shows the pending refactor-request patch diffs (not the git diff).
         return [executable, "diff"]
@@ -280,10 +326,19 @@ def _run_action(live, project_root: Path, action: str, node, state: WatchState)
     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 in ("code", "refresh"):
-        # Resolving/regenerating requests changes the tree; re-review this commit
-        # to refresh its gate/RR counts on the next consume pass.
+    if action == "refresh":
+        # `[f]` explicitly regenerates requests, so re-review this commit on the
+        # next pass.
         state.requeue(node.sha)
+    elif action == "code":
+        # `[r]` is resolve/reuse. Do NOT auto re-review here (that can regenerate
+        # duplicate-looking findings); instead reflect current pending requests
+        # from the existing run in-place.
+        node_after = state.get(node.sha)
+        if node_after and node_after.run_id:
+            pending_count, preview = _pending_for_run(project_root, node_after.run_id)
+            node_after.rr_count = pending_count
+            node_after.rr_preview = preview
     console.print("\n[dim]watch: returning to the Refactor Terminal...[/dim]")
     live.start()
 
@@ -315,10 +370,10 @@ def _run_tui(project_root: Path, state: WatchState, runner: ReviewRunner) -> Non
                 state.move_selection(-1)
             elif key in ("down", "j"):
                 state.move_selection(+1)
-            elif key in ("r", "R", "d", "m", "x"):
+            elif key in ("r", "f", "d", "m", "x"):
                 action = {
                     "r": "code",
-                    "R": "refresh",
+                    "f": "refresh",
                     "d": "diff",
                     "m": "merge",
                     "x": "drop",

{refactorai_cli-0.4.8 → refactorai_cli-0.4.10}/refactorai_cli/watch_state.py

@@ -329,7 +329,7 @@ def render_graph(state: WatchState, *, now: datetime | None = None, width: int =
         _with_pad(
             Text.from_markup(
             "[dim]\\[↑/↓ or j/k][/dim] select   [bold]\\[r][/bold] refactor   "
-            "[bold]\\[R][/bold] refresh   [bold]\\[d][/bold] diff   "
+            "[bold]\\[f][/bold] fresh review   [bold]\\[d][/bold] diff   "
             "[bold]\\[m][/bold] merge   [bold]\\[x][/bold] drop   "
             "[bold]\\[p][/bold] push   [bold]\\[q][/bold] quit"
             )

{refactorai_cli-0.4.8 → refactorai_cli-0.4.10}/refactorai_cli.egg-info/PKG-INFO

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