wade-cli 1.2.0__tar.gz → 1.2.2__tar.gz

{wade_cli-1.2.0 → wade_cli-1.2.2}/.wade.yml

@@ -10,6 +10,10 @@ ai:
   default_model: gpt-5.6-terra
   effort: xhigh
   permission_mode: yolo
+  plan:
+    tool: codex
+    model: gpt-5.6-sol
+    effort: high
   deps:
     mode: headless
     timeout: 900

{wade_cli-1.2.0 → wade_cli-1.2.2}/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Conventional Commits](https://conventionalcommits.org/).
 
+## [v1.2.2] — 2026-09-09
+
+### Bug Fixes
+
+- keep retained effort editable in PR-comment retry sessions (#507) (8daabc8)
+
+## [v1.2.1] — 2026-09-08
+
+### Chores
+
+- use sol high for planning (beec132)
+
 ## [v1.2.0] — 2026-09-08
 
 ### Features

{wade_cli-1.2.0 → wade_cli-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: wade-cli
-Version: 1.2.0
+Version: 1.2.2
 Summary: WADE — Workflow for AI-Driven Engineering
 Project-URL: Homepage, https://github.com/ivanviragine/wade
 Project-URL: Repository, https://github.com/ivanviragine/wade

{wade_cli-1.2.0 → wade_cli-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "wade-cli"
-version = "1.2.0"
+version = "1.2.2"
 description = "WADE — Workflow for AI-Driven Engineering"
 readme = "README.md"
 license = "MIT"

{wade_cli-1.2.0 → wade_cli-1.2.2}/src/wade/__init__.py

@@ -1,3 +1,3 @@
 """WADE (Workflow for AI-Driven Engineering) — AI-agent-driven git workflow management CLI."""
 
-__version__ = "1.2.0"
+__version__ = "1.2.2"

{wade_cli-1.2.0 → wade_cli-1.2.2}/src/wade/services/review_service.py

@@ -88,11 +88,12 @@ from wade.utils.terminal import (
 
 logger = structlog.get_logger()
 
-# ``None`` means no caller choice, which lets ``resolve_effort`` read config.
-# The review confirmation UI also offers a distinct "none — use tool default"
-# choice; its value must survive a wait/relaunch without being mistaken for the
-# unset case. This string is accepted by the same ``--effort`` option used in
-# the recovery command, but is private to this review-session handoff.
+# ``None`` means no caller or retry choice, which lets ``resolve_effort`` read
+# config. The review confirmation UI also offers a distinct "none — use tool
+# default" choice; its value must survive a wait/relaunch without being
+# mistaken for the unset case. This string is accepted by the public
+# ``--effort`` option used in a recovery command, but is private to this
+# review-session handoff.
 _EXPLICIT_DEFAULT_EFFORT = "none"
 
 
@@ -1266,9 +1267,15 @@ def start(
         tool=resolved_tool,
         complexity=task.complexity.value if task.complexity else None,
     )
+    # A retry payload and a CLI override deliberately mean different things.
+    # ``effort_explicit`` says this invocation received ``--effort`` and locks
+    # the selector; a non-None ``effort`` can also be a prior UI selection that
+    # must remain editable. Its presence, rather than CLI explicitness, decodes
+    # the UI's retained "none — use tool default" sentinel.
+    effort_payload_present = effort is not None
     resolved_effort = (
         None
-        if effort_explicit and effort == _EXPLICIT_DEFAULT_EFFORT
+        if effort == _EXPLICIT_DEFAULT_EFFORT
         else resolve_effort(
             effort,
             config,
@@ -1341,13 +1348,13 @@ def start(
         )
 
     # Configuration-derived effort should continue to re-resolve when the user
-    # waits for a later review. Preserve a caller's explicit override, or an
-    # actual change made in the confirmation UI, without promoting an implicit
-    # default to an explicit argument.
-    retained_effort_explicit = effort_explicit or resolved_effort != initial_effort
+    # waits for a later review. Preserve a retry/CLI payload, or an actual
+    # confirmation-UI change, without promoting either a retained UI choice or
+    # an implicit configuration value into a CLI override.
+    should_retain_effort_payload = effort_payload_present or resolved_effort != initial_effort
     retained_effort = (
         (resolved_effort.value if resolved_effort is not None else _EXPLICIT_DEFAULT_EFFORT)
-        if retained_effort_explicit
+        if should_retain_effort_payload
         else None
     )
 
@@ -1531,7 +1538,7 @@ def start(
                 ai_explicit=ai_explicit,
                 model_explicit=model_explicit,
                 effort=retained_effort,
-                effort_explicit=retained_effort_explicit,
+                effort_explicit=effort_explicit,
                 permission_mode=resolved_permission_mode.value,
                 permission_mode_explicit=permission_mode_explicit,
                 sandbox=sandbox,
@@ -1765,9 +1772,11 @@ def _post_review_lifecycle(
 ) -> None:
     """Post-review lifecycle menu: Merge PR or wait for new reviews.
 
-    Explicit effort and sandbox selections must survive a "wait for new
-    reviews" re-launch rather than re-resolving from configuration. ``None``
-    (unset) still re-resolves, matching the non-explicit permission-mode path.
+    A retained effort payload and sandbox selection must survive a "wait for
+    new reviews" re-launch rather than re-resolving from configuration.
+    ``effort_explicit`` separately records a real CLI override, which is the
+    only source that locks the effort selector. ``None`` (unset) still
+    re-resolves, matching the non-explicit permission-mode path.
     """
     from wade.ui import prompts
 

{wade_cli-1.2.0 → wade_cli-1.2.2}/tests/unit/test_services/test_review_service.py

@@ -642,7 +642,7 @@ class TestReviewServiceStart:
         assert mock_post.call_args.kwargs["effort"] is None
         assert mock_post.call_args.kwargs["effort_explicit"] is False
 
-    def test_explicit_default_effort_survives_waiting_for_reviews(
+    def test_ui_default_effort_survives_waiting_for_reviews(
         self, tmp_path: Path, mock_setup: dict[str, MagicMock]
     ) -> None:
         """Choosing the UI's tool default must override a configured effort later."""
@@ -672,7 +672,95 @@ class TestReviewServiceStart:
             assert start(target="42") is True
 
         assert mock_post.call_args.kwargs["effort"] == "none"
-        assert mock_post.call_args.kwargs["effort_explicit"] is True
+        assert mock_post.call_args.kwargs["effort_explicit"] is False
+
+    def test_retained_effort_is_preselected_editable_and_re_retained(
+        self, tmp_path: Path, mock_setup: dict[str, MagicMock]
+    ) -> None:
+        """A retained UI level stays editable and survives another unchanged retry."""
+        from crossby.models.ai import AIToolID, EffortLevel
+
+        from wade.services.ai_resolution import confirm_ai_selection
+
+        mock_setup[
+            "get_comprehensive_review_status"
+        ].return_value = self._changes_requested_status()
+        mock_setup["resolve_ai_tool"].return_value = "codex"
+        # Use the real confirmation UI behind the fixture's call spy so this
+        # exercises the selector that the next start() invocation presents.
+        mock_setup["confirm_ai_selection"].side_effect = confirm_ai_selection
+        adapter = MagicMock()
+        caps = adapter.capabilities.return_value
+        caps.supports_effort = True
+        caps.supports_accept_edits = False
+        caps.supports_auto = False
+        caps.supports_yolo = False
+        caps.blocks_until_exit = False
+        adapter.launch.return_value = 0
+        menu_items_seen: list[list[str]] = []
+
+        def select_proceed(_title: str, items: list[str], **_kwargs: object) -> int:
+            menu_items_seen.append(items)
+            return items.index("Proceed")
+
+        with (
+            patch("wade.services.review_service.resolve_effort", return_value=EffortLevel.XHIGH),
+            patch("wade.services.review_service.resolve_sandbox", return_value=False),
+            patch("crossby.ai_tools.AbstractAITool.get", return_value=adapter),
+            patch(
+                "crossby.ai_tools.AbstractAITool.detect_installed",
+                return_value=[AIToolID.CODEX],
+            ),
+            patch("wade.services.review_service.deliver_prompt_if_needed"),
+            patch("wade.ui.prompts.is_tty", return_value=True),
+            patch("wade.ui.prompts.select", side_effect=select_proceed),
+            patch("wade.ui.prompts.confirm", return_value=True),
+            patch("wade.services.review_service._post_review_lifecycle") as mock_post,
+        ):
+            assert start(target="42", effort="xhigh", effort_explicit=False) is True
+
+        confirm_kwargs = mock_setup["confirm_ai_selection"].call_args.kwargs
+        assert confirm_kwargs["resolved_effort"] is EffortLevel.XHIGH
+        assert confirm_kwargs["effort_explicit"] is False
+        assert "Change effort" in menu_items_seen[0]
+        # Proceeding with the retained selection must not drop it on the next wait.
+        assert mock_post.call_args.kwargs["effort"] == "xhigh"
+        assert mock_post.call_args.kwargs["effort_explicit"] is False
+
+    def test_retained_tool_default_bypasses_config_and_stays_editable(
+        self, tmp_path: Path, mock_setup: dict[str, MagicMock]
+    ) -> None:
+        """A retained ``none`` is distinct from no retry payload and never locks the picker."""
+        mock_setup[
+            "get_comprehensive_review_status"
+        ].return_value = self._changes_requested_status()
+        mock_setup["resolve_ai_tool"].return_value = "codex"
+        mock_setup["confirm_ai_selection"].return_value = (
+            "codex",
+            None,
+            None,
+            PermissionMode.DEFAULT,
+        )
+        adapter = MagicMock()
+        adapter.launch.return_value = 0
+        adapter.capabilities.return_value.blocks_until_exit = False
+
+        with (
+            patch("wade.services.review_service.resolve_effort") as mock_resolve_effort,
+            patch("wade.services.review_service.resolve_sandbox", return_value=False),
+            patch("crossby.ai_tools.AbstractAITool.get", return_value=adapter),
+            patch("wade.services.review_service.deliver_prompt_if_needed"),
+            patch("wade.ui.prompts.confirm", return_value=True),
+            patch("wade.services.review_service._post_review_lifecycle") as mock_post,
+        ):
+            assert start(target="42", effort="none", effort_explicit=False) is True
+
+        mock_resolve_effort.assert_not_called()
+        confirm_kwargs = mock_setup["confirm_ai_selection"].call_args.kwargs
+        assert confirm_kwargs["resolved_effort"] is None
+        assert confirm_kwargs["effort_explicit"] is False
+        assert mock_post.call_args.kwargs["effort"] == "none"
+        assert mock_post.call_args.kwargs["effort_explicit"] is False
 
     def test_detached_launch_receives_worktree_context(
         self, tmp_path: Path, mock_setup: dict[str, MagicMock]
@@ -781,7 +869,7 @@ class TestReviewServiceStart:
         assert mock_start.call_args.kwargs["sandbox"] is False
 
     def test_post_lifecycle_relaunch_forwards_confirmed_effort(self, tmp_path: Path) -> None:
-        """A review re-launch keeps the effort selected in the first session."""
+        """A UI-confirmed effort survives a re-launch without locking its picker."""
         from wade.services.review_service import PollOutcome
 
         with (
@@ -801,15 +889,13 @@ class TestReviewServiceStart:
                 99,
                 MagicMock(),
                 effort="high",
-                effort_explicit=True,
+                effort_explicit=False,
             )
 
         assert mock_start.call_args.kwargs["effort"] == "high"
-        assert mock_start.call_args.kwargs["effort_explicit"] is True
+        assert mock_start.call_args.kwargs["effort_explicit"] is False
 
-    def test_post_lifecycle_relaunch_forwards_explicit_tool_default_effort(
-        self, tmp_path: Path
-    ) -> None:
+    def test_post_lifecycle_relaunch_forwards_ui_tool_default_effort(self, tmp_path: Path) -> None:
         """The explicit default is distinct from an unset effort override."""
         from wade.services.review_service import PollOutcome
 
@@ -830,11 +916,11 @@ class TestReviewServiceStart:
                 99,
                 MagicMock(),
                 effort="none",
-                effort_explicit=True,
+                effort_explicit=False,
             )
 
         assert mock_start.call_args.kwargs["effort"] == "none"
-        assert mock_start.call_args.kwargs["effort_explicit"] is True
+        assert mock_start.call_args.kwargs["effort_explicit"] is False
 
     def test_resolves_worktree_by_issue_when_title_drifted(
         self, mock_setup: dict[str, MagicMock]