refactorai-cli 0.4.11__tar.gz → 0.4.14__tar.gz

{refactorai_cli-0.4.11 → refactorai_cli-0.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.4.11
+Version: 0.4.14
 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.6
+Requires-Dist: refactorai-core>=3.2.8
 
 # refactorai-cli
 

{refactorai_cli-0.4.11 → refactorai_cli-0.4.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "refactorai-cli"
-version = "0.4.11"
+version = "0.4.14"
 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.6",
+  "refactorai-core>=3.2.8",
 ]
 
 [project.scripts]

{refactorai_cli-0.4.11 → refactorai_cli-0.4.14}/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.11"
+__version__ = "0.4.14"

{refactorai_cli-0.4.11 → refactorai_cli-0.4.14}/refactorai_cli/cloud_rr.py

@@ -651,6 +651,7 @@ def run_cloud_refactor_requests(
     apply_byok_payload: Callable[[dict, object], None] | None = None,
     toolchain_consent_cb: Callable[[dict], bool] | None = None,
     commit_cb: Callable[[object], None] | None = None,
+    on_rr_failure: str = "continue",
 ) -> RunArtifact:
     """Drive pending RRs through the cloud server-run loop and return a summary.
 
@@ -665,6 +666,12 @@ def run_cloud_refactor_requests(
     once per RR that reaches ``APPLIED`` so the CLI can record one git commit per
     resolved request on an isolated refactor branch. Best-effort; git failures
     never break the cloud RR loop.
+
+    ``on_rr_failure`` (``continue`` | ``defer`` | ``stop``) mirrors the local
+    executor policy and is forwarded to the server so a single failing RR no
+    longer halts the whole run by default (parity with local). The client stays a
+    thin executor: it stops only when the server returns a ``failed`` verdict with
+    no ``next_rr_id`` (older servers that always stop remain compatible).
     """
     project_root = Path(project_root)
     progress_cb = progress_cb or (lambda e: None)
@@ -741,6 +748,7 @@ def run_cloud_refactor_requests(
         "constitution_hash": constitution.content_hash,
         "constitution_body": getattr(constitution, "body", "") or "",
         "model_hint": resolved_model,
+        "on_rr_failure": str(on_rr_failure or "continue"),
         "rrs": [
             {
                 "rr_id": rr.rr_id,
@@ -875,12 +883,17 @@ def run_cloud_refactor_requests(
                 attempts_by_id.get(completed_id, 0 if verdict == "deferred" else 1),
                 outcomes, counts, progress_cb, commit_cb=commit_cb,
             )
-            if verdict == "failed":
+            next_id = str(action.get("next_rr_id", "") or "")
+            # With `continue`/`defer` (the default) the server advances after a
+            # failure, so the client resolves the remaining requests in one pass
+            # instead of stopping at the first failure (parity with local). Only a
+            # `stop` policy halts the run (no next RR named); a failed *last* RR
+            # under `continue` simply ends the queue, it is not a halt.
+            if verdict == "failed" and not next_id and str(on_rr_failure) == "stop":
                 stopped = True
                 stop_reason = str(action.get("message", "") or "refactor request failed")
                 _emit(progress_cb, phase="rr", event="run_stopped", rr_id=completed_id, reason=stop_reason)
                 break
-            next_id = str(action.get("next_rr_id", "") or "")
             if not next_id:
                 break
             current_rr_id = next_id

{refactorai_cli-0.4.11 → refactorai_cli-0.4.14}/refactorai_cli/commands/run_cmds.py

@@ -651,6 +651,26 @@ def _is_cloud_mode(constitution) -> bool:
     return bool(_cloud_execution_mode(constitution))
 
 
+def _documents_digest(documents: list | None) -> str:
+    """Stable digest of the exact documents sent to the platform.
+
+    Folds each document's path + content so a commit-scoped review keys on the
+    code it actually reviews. Without this, two commits share the same
+    idempotency key (same account/stage/constitution/target) and the server
+    replays the FIRST commit's findings for the second commit -- re-suggesting
+    changes that were already applied/merged (docs/41 `R28`).
+    """
+    hasher = hashlib.sha256()
+    for doc in sorted(documents or [], key=lambda d: str((d or {}).get("path", ""))):
+        if not isinstance(doc, dict):
+            continue
+        hasher.update(str(doc.get("path", "")).encode("utf-8"))
+        hasher.update(b"\x00")
+        hasher.update(str(doc.get("content", "")).encode("utf-8"))
+        hasher.update(b"\x1f")
+    return hasher.hexdigest()
+
+
 def _stable_idempotency_key(
     *,
     account_id: str,
@@ -659,15 +679,29 @@ def _stable_idempotency_key(
     target: str,
     max_alerts: int,
     execution_mode: str,
+    scope_digest: str = "",
 ) -> str:
     """Deterministic idempotency key so retries replay instead of re-charging (C10).
 
-    The key MUST change when inputs change (target/constitution/stage/mode) so
-    distinct runs are not incorrectly deduplicated, and MUST be stable across
+    The key MUST change when inputs change (target/constitution/stage/mode/scope)
+    so distinct runs are not incorrectly deduplicated, and MUST be stable across
     retries of the same logical run so managed quota is not double-charged.
+
+    ``scope_digest`` folds the actual reviewed documents into the key so a
+    commit-scoped review of a different commit (or of changed code) produces a
+    distinct key and a fresh server run, instead of replaying an earlier commit's
+    cached findings.
     """
     seed = "|".join(
-        [account_id, execution_mode, stage, constitution_hash, str(target), str(int(max_alerts))]
+        [
+            account_id,
+            execution_mode,
+            stage,
+            constitution_hash,
+            str(target),
+            str(int(max_alerts)),
+            scope_digest,
+        ]
     )
     return hashlib.sha256(seed.encode("utf-8")).hexdigest()
 
@@ -707,6 +741,10 @@ def _cloud_inference(
 
     execution_mode = _cloud_execution_mode(constitution) or "cloud_managed"
     auth_ctx = ensure_authenticated(project_root)
+    # Digest the exact documents so the idempotency key keys on the reviewed
+    # code, not just account/stage/target. (The backend independently recomputes
+    # a documents hash for its own replay guard, so this need not be sent.)
+    documents_hash = _documents_digest(documents)
     payload = {
         "stage": stage,
         "execution_mode": execution_mode,
@@ -728,6 +766,7 @@ def _cloud_inference(
         target=target,
         max_alerts=max_alerts,
         execution_mode=execution_mode,
+        scope_digest=documents_hash,
     )
     try:
         response = httpx.post(
@@ -2955,7 +2994,19 @@ def code(
         changed=changed,
         intent=intent,
     )
-    _confirm_full_project_scope(code_scope, command="code", assume_yes=yes_full_project)
+    # Decide reuse-vs-generate up front. The full-project confirmation only guards
+    # *creating* a large request set; when we are resolving an existing pending
+    # queue (the common `[r]` resume case) there is nothing to confirm, so a root
+    # commit no longer re-prompts every run (docs/42 `R29`, Part L).
+    reused_requests = [] if (code_scope and refresh_requests) else pending_requests(project_root)
+    will_generate_requests = bool(refresh_requests) or not reused_requests
+    if will_generate_requests:
+        _confirm_full_project_scope(code_scope, command="code", assume_yes=yes_full_project)
+    elif code_scope and code_scope.get("full_project"):
+        console.print(
+            f"[dim]code: resuming {len(reused_requests)} pending request(s) for this "
+            "commit (full-project review already ran).[/dim]"
+        )
     code_scope_paths = code_scope.get("scope_paths") if code_scope else None
     code_changed_paths = code_scope.get("changed_paths") if code_scope else None
     if code_scope:
@@ -3043,11 +3094,9 @@ def code(
         # Reuse the existing pending requests by default (docs/42 `R29`, Phase 1):
         # `[r]`/`code --commit` resolves the queue already created for this commit
         # rather than regenerating it. `--refresh-requests` opts back into a fresh
-        # scoped review so the request set is rebuilt from scratch.
-        if code_scope and refresh_requests:
-            requests = []
-        else:
-            requests = pending_requests(project_root)
+        # scoped review so the request set is rebuilt from scratch. Computed above
+        # (``reused_requests``) so the full-project prompt could be skipped on reuse.
+        requests = reused_requests
         if not requests:
             if code_scope and refresh_requests:
                 console.print(
@@ -3169,6 +3218,7 @@ def code(
                     apply_byok_payload=_apply_byok_payload,
                     toolchain_consent_cb=_toolchain_consent_prompt(auto_approve=auto_approve),
                     commit_cb=rr_commit_cb,
+                    on_rr_failure=on_rr_failure,
                 )
         else:
             # Local mode is unchanged: dispatch to the local executor with the

{refactorai_cli-0.4.11 → refactorai_cli-0.4.14}/refactorai_cli/commands/watch_cmds.py

@@ -415,6 +415,7 @@ def build_action_command(
     executable: str = "refactor",
     branch: str | None = None,
     rr_id: str | None = None,
+    yes_full_project: bool = False,
 ) -> list[str] | None:
     """Build the argv for a terminal action. Pure + testable (docs/42, docs/43).
 
@@ -430,10 +431,18 @@ def build_action_command(
     """
     if action == "code":
         # Commit-scoped so `[r]` resolves THIS commit's requests (docs/41 Phase 4).
-        return [executable, "code", "--commit", sha, "--keep"]
+        cmd = [executable, "code", "--commit", sha, "--keep"]
+        if yes_full_project:
+            # Root/full-scope commits would otherwise pop a hidden confirmation in
+            # the suspended terminal; auto-confirm so `[r]` never appears to hang.
+            cmd.append("--yes-full-project")
+        return cmd
     if action == "refresh":
         # `[f]` regenerates the requests for this commit before resolving.
-        return [executable, "code", "--commit", sha, "--refresh-requests", "--keep"]
+        cmd = [executable, "code", "--commit", sha, "--refresh-requests", "--keep"]
+        if yes_full_project:
+            cmd.append("--yes-full-project")
+        return cmd
     if action == "diff":
         # Shows the pending refactor-request patch diffs (not the git diff).
         return [executable, "diff"]
@@ -506,7 +515,12 @@ def _run_action(
 ) -> None:
     """Suspend the live graph, run an interactive action, then refresh the node."""
     branch = node.finalize.refactor_branch if getattr(node, "finalize", None) else None
-    cmd = build_action_command(action, node.sha, branch=branch, rr_id=rr_id)
+    # Root/full-scope commits expand `code` to a full-project review; auto-confirm
+    # so `[r]`/`[f]` never stall on a hidden prompt in the suspended terminal.
+    yes_full_project = getattr(node, "scope_mode", "") == "full"
+    cmd = build_action_command(
+        action, node.sha, branch=branch, rr_id=rr_id, yes_full_project=yes_full_project
+    )
     if not cmd:
         return
     live.stop()

{refactorai_cli-0.4.11 → refactorai_cli-0.4.14}/refactorai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.4.11
+Version: 0.4.14
 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.6
+Requires-Dist: refactorai-core>=3.2.8
 
 # refactorai-cli
 

{refactorai_cli-0.4.11 → refactorai_cli-0.4.14}/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.6
+refactorai-core>=3.2.8