agentic-devtools 0.2.47__tar.gz → 0.2.48__tar.gz

{agentic_devtools-0.2.47 → agentic_devtools-0.2.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-devtools
-Version: 0.2.47
+Version: 0.2.48
 Summary: Agentic devtools integrate Jira, DevOps & more
 Author: ayaiayorg
 License-Expression: MIT

{agentic_devtools-0.2.47 → agentic_devtools-0.2.48}/agentic_devtools/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.47'
-__version_tuple__ = version_tuple = (0, 2, 47)
+__version__ = version = '0.2.48'
+__version_tuple__ = version_tuple = (0, 2, 48)
 
 __commit_id__ = commit_id = None

{agentic_devtools-0.2.47 → agentic_devtools-0.2.48}/agentic_devtools/cli/azure_devops/file_review_commands.py

@@ -17,7 +17,7 @@ from datetime import datetime, timezone
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from ...state import get_pull_request_id, get_state_dir, get_value, is_dry_run
+from ...state import get_pull_request_id, get_state_dir, get_value, is_dry_run, is_safe_dir_segment
 from .auth import get_auth_headers, get_pat
 from .config import AzureDevOpsConfig
 from .helpers import (
@@ -129,10 +129,16 @@ def _get_queue_path(pull_request_id: int) -> Path:
 
     Returns the new commit-hash-scoped path
     (``pull-request-review/<dir_name>/queue.json``).  If that file does not yet
-    exist but the legacy path (``pull-request-review/prompts/<pr_id>/queue.json``)
-    does, the legacy path is returned instead so that in-progress review sessions
-    created before the commit-hash-short refactor continue to work transparently
-    after an upgrade.
+    exist, two backward-compatible fallbacks are tried in order:
+
+    1. **8-char hash directory** – prior versions used ``commit_hash_short[:8]``
+       instead of the current 12-char truncation.  If ``commit_hash_short`` is at
+       least 8 characters long, the 8-char prefix directory is checked.
+    2. **Legacy path** – ``pull-request-review/prompts/<pr_id>/queue.json`` from
+       the original pre-commit-hash layout.
+
+    This ensures in-progress reviews started under either older scheme continue to
+    work transparently after an upgrade.
     """
     commit_hash_short = get_value("review.commit_hash_short")
     # Suppress warnings here: this function is called many times per review command.
@@ -141,10 +147,15 @@ def _get_queue_path(pull_request_id: int) -> Path:
     dir_name = resolve_review_artifact_dir_name(pull_request_id, commit_hash_short, warn=False)
     state_dir = get_state_dir()
     new_path = state_dir / "pull-request-review" / dir_name / "queue.json"
-    # Backward-compatible fallback: silently use the legacy path when the new one
-    # is absent but an old-format queue still exists.  This prevents silent queue
-    # loss (empty/default status) when upgrading mid-review.
     if not new_path.exists():
+        # Fallback 1: 8-char hash directory from prior versions.
+        if isinstance(commit_hash_short, str) and len(commit_hash_short) >= 8:
+            short8_dir_name = commit_hash_short[:8]
+            if is_safe_dir_segment(short8_dir_name):
+                short8_path = state_dir / "pull-request-review" / short8_dir_name / "queue.json"
+                if short8_path.exists():
+                    return short8_path
+        # Fallback 2: legacy pre-commit-hash path.
         legacy_path = state_dir / "pull-request-review" / "prompts" / str(pull_request_id) / "queue.json"
         if legacy_path.exists():
             return legacy_path
@@ -241,7 +252,7 @@ def trigger_in_progress_for_file(
         dry_run=dry_run,
     )
 
-    # Cascade folder and overall summary updates. Persist the updated
+    # Cascade the overall summary update. Persist the updated
     # review_state even if downstream cascade execution fails, so the
     # local state reflects the already-PATCHed file comment.
     try:
@@ -595,7 +606,7 @@ def _resolve_file_threads(
     return resolved_count
 
 
-def approve_file() -> None:  # pragma: no cover
+def approve_file(*, skip_cascade: bool = False) -> None:  # pragma: no cover
     """
     Approve a file in a pull request review.
 
@@ -604,7 +615,7 @@ def approve_file() -> None:  # pragma: no cover
     2. PATCHes the existing file summary comment with rendered markdown
     3. PATCHes the file thread status to "closed"
     4. Marks the file as reviewed in Azure DevOps
-    5. Cascades folder and PR summary updates via PATCH
+    5. Cascades the overall PR summary update via PATCH (unless skip_cascade=True)
     6. Saves updated review state
     7. Updates the review queue and triggers workflow continuation
 
@@ -620,6 +631,12 @@ def approve_file() -> None:  # pragma: no cover
         - content (deprecated): Falls back to file_review.summary with a warning
         - dry_run: If true, only print what would be done
 
+    Args:
+        skip_cascade: When True, skip the overall summary cascade PATCH update
+            for this call. Useful for batch flows that defer cascade execution
+            to a single post-loop update while still persisting per-file review
+            state.
+
     Raises:
         SystemExit: On validation or execution errors.
     """
@@ -754,21 +771,22 @@ def approve_file() -> None:  # pragma: no cover
             dry_run=dry_run,
         )
 
-        # Cascade folder and overall summary updates. Persist the updated
+        # Cascade the overall summary update. Persist the updated
         # review_state even if downstream cascade execution fails, so the
         # local state reflects the already-PATCHed file comment.
         try:
-            cascade_attrs = _get_attribution_params(review_state, config)
-            patch_operations = cascade_status_update(review_state, file_path, base_url, **cascade_attrs)
-            execute_cascade(
-                patch_operations=patch_operations,
-                requests_module=requests,
-                headers=headers,
-                config=config,
-                repo_id=repo_id,
-                pull_request_id=pull_request_id,
-                dry_run=dry_run,
-            )
+            if not skip_cascade:
+                cascade_attrs = _get_attribution_params(review_state, config)
+                patch_operations = cascade_status_update(review_state, file_path, base_url, **cascade_attrs)
+                execute_cascade(
+                    patch_operations=patch_operations,
+                    requests_module=requests,
+                    headers=headers,
+                    config=config,
+                    repo_id=repo_id,
+                    pull_request_id=pull_request_id,
+                    dry_run=dry_run,
+                )
         finally:
             save_review_state(review_state)
 
@@ -815,7 +833,7 @@ def approve_file() -> None:  # pragma: no cover
     print_next_file_prompt(pull_request_id)
 
 
-def request_changes() -> None:
+def request_changes(*, skip_cascade: bool = False) -> None:
     """
     Request changes on a file in a pull request review with multiple suggestions.
 
@@ -826,7 +844,7 @@ def request_changes() -> None:
     4. PATCHes the file summary comment with categorized suggestion links
     5. Sets file thread status to "active" (needs work)
     6. Marks the file as reviewed in Azure DevOps
-    7. Cascades folder and PR summary updates via PATCH
+    7. Cascades the overall PR summary update via PATCH (unless skip_cascade=True)
     8. Saves updated review state
     9. Updates the review queue and triggers workflow continuation
 
@@ -845,6 +863,12 @@ def request_changes() -> None:
           When end_line is null or omitted, it is treated as equal to line.
         - dry_run: If true, only print what would be done
 
+    Args:
+        skip_cascade: When True, skip the overall summary cascade PATCH update
+            for this call. The command still posts suggestion threads, updates
+            file/thread status, and persists review_state so batch callers can
+            run one deferred overall cascade at the end.
+
     Suggestion schema:
         {
             "content": str,                 # Review comment text (required)
@@ -1111,18 +1135,19 @@ def request_changes() -> None:
                 dry_run=dry_run,
             )
 
-            # Cascade folder and overall summary updates
-            cascade_attrs = _get_attribution_params(review_state, config)
-            patch_operations = cascade_status_update(review_state, file_path, base_url, **cascade_attrs)
-            execute_cascade(
-                patch_operations=patch_operations,
-                requests_module=requests,
-                headers=headers,
-                config=config,
-                repo_id=repo_id,
-                pull_request_id=pull_request_id,
-                dry_run=dry_run,
-            )
+            # Cascade the overall summary update
+            if not skip_cascade:
+                cascade_attrs = _get_attribution_params(review_state, config)
+                patch_operations = cascade_status_update(review_state, file_path, base_url, **cascade_attrs)
+                execute_cascade(
+                    patch_operations=patch_operations,
+                    requests_module=requests,
+                    headers=headers,
+                    config=config,
+                    repo_id=repo_id,
+                    pull_request_id=pull_request_id,
+                    dry_run=dry_run,
+                )
         finally:
             save_review_state(review_state)
 
@@ -1183,7 +1208,7 @@ def request_changes() -> None:
     print_next_file_prompt(pull_request_id)
 
 
-def request_changes_with_suggestion() -> None:
+def request_changes_with_suggestion(*, skip_cascade: bool = False) -> None:
     """
     Request changes with code suggestion(s) on a file in a pull request review.
 
@@ -1194,6 +1219,12 @@ def request_changes_with_suggestion() -> None:
     State keys read: same as request_changes, but each suggestion in
     file_review.suggestions requires a replacement_code field.
 
+    Args:
+        skip_cascade: Forwarded to request_changes(). When True, suppresses the
+            overall summary cascade update (overall summary thread status PATCH)
+            while preserving all other request-changes behavior and state
+            persistence.
+
     Suggestion schema:
         {
             "content": str,                 # Review comment text (required)
@@ -1285,7 +1316,7 @@ def request_changes_with_suggestion() -> None:
     # so that replacement_code is preserved in state for retries and dry_run does
     # not leave mutated state behind.
     try:
-        request_changes()
+        request_changes(skip_cascade=skip_cascade)
     finally:
         if suggestions_raw:
             set_value("file_review.suggestions", suggestions_raw)
@@ -1913,11 +1944,11 @@ def submit_reviews() -> None:
                 print(f"[{i + 1}/{total}] Processing {outcome} for {file_path}...")
                 try:
                     if outcome == _BATCH_OUTCOME_APPROVE:
-                        approve_file()
+                        approve_file(skip_cascade=True)
                     elif outcome == _BATCH_OUTCOME_CHANGES:
-                        request_changes()
+                        request_changes(skip_cascade=True)
                     else:
-                        request_changes_with_suggestion()
+                        request_changes_with_suggestion(skip_cascade=True)
                     succeeded += 1
                     print("  \u2705 Done")
                 except SystemExit as exc:
@@ -1926,6 +1957,38 @@ def submit_reviews() -> None:
                         failed += 1
                     else:
                         succeeded += 1
+
+            # Deferred cascade: update overall summary once after all files
+            if succeeded > 0:
+                try:
+                    from .review_scaffold import _build_pr_base_url
+                    from .review_state import load_review_state as _load_rs
+                    from .status_cascade import (
+                        cascade_overall_summary_update,
+                        execute_cascade,
+                    )
+
+                    review_state = _load_rs(pr_id)
+                    cascade_config = AzureDevOpsConfig.from_state()
+                    base_url = _build_pr_base_url(cascade_config, pr_id)
+                    cascade_attrs = _get_attribution_params(review_state, cascade_config)
+                    patch_operations = cascade_overall_summary_update(review_state, base_url, **cascade_attrs)
+                    execute_cascade(
+                        patch_operations=patch_operations,
+                        requests_module=None,
+                        headers={},
+                        config=cascade_config,
+                        repo_id=review_state.repoId,
+                        pull_request_id=pr_id,
+                        dry_run=dry_run,
+                    )
+                except FileNotFoundError:
+                    print(
+                        "Warning: review-state.json not found; skipping overall summary cascade.",
+                        file=sys.stderr,
+                    )
+                except Exception as exc:
+                    print(f"Warning: cascade update failed: {exc}", file=sys.stderr)
         finally:
             set_batch_context(None)
     elif valid_items:

{agentic_devtools-0.2.47 → agentic_devtools-0.2.48}/agentic_devtools/cli/azure_devops/review_commands.py

@@ -826,7 +826,7 @@ def setup_pull_request_review() -> None:
 
     commit_hash_short = ""
     if source_commit_id:
-        commit_hash_short = source_commit_id[:8]
+        commit_hash_short = source_commit_id[:12]
         # Validate that commit_hash_short is safe to persist and use as a path segment.
         if not is_safe_dir_segment(commit_hash_short):
             print(

{agentic_devtools-0.2.47 → agentic_devtools-0.2.48}/tests/unit/cli/azure_devops/file_review_commands/test__get_queue_path.py

@@ -103,8 +103,57 @@ class TestGetQueuePath:
 
         assert result == tmp_path / "pull-request-review" / "12345678" / "queue.json"
 
+    def test_falls_back_to_8char_path_when_12char_path_missing(self, tmp_path):
+        """Should use 8-char hash directory when 12-char path absent but 8-char exists."""
+        # Create the 8-char directory but NOT the 12-char directory
+        short8_dir = tmp_path / "pull-request-review" / "abcdef12"
+        short8_dir.mkdir(parents=True)
+        short8_queue = short8_dir / "queue.json"
+        short8_queue.write_text("{}")
+
+        with (
+            patch(
+                "agentic_devtools.cli.azure_devops.file_review_commands.get_state_dir",
+                return_value=tmp_path,
+            ),
+            patch(
+                "agentic_devtools.cli.azure_devops.file_review_commands.get_value",
+                return_value="abcdef123456",
+            ),
+        ):
+            result = _get_queue_path(12345)
+
+        assert result == short8_queue
+
+    def test_prefers_12char_path_over_8char_path(self, tmp_path):
+        """Should prefer the 12-char directory when both 12-char and 8-char exist."""
+        # Create both 12-char and 8-char directories
+        new_dir = tmp_path / "pull-request-review" / "abcdef123456"
+        new_dir.mkdir(parents=True)
+        new_queue = new_dir / "queue.json"
+        new_queue.write_text("{}")
+
+        short8_dir = tmp_path / "pull-request-review" / "abcdef12"
+        short8_dir.mkdir(parents=True)
+        short8_queue = short8_dir / "queue.json"
+        short8_queue.write_text("{}")
+
+        with (
+            patch(
+                "agentic_devtools.cli.azure_devops.file_review_commands.get_state_dir",
+                return_value=tmp_path,
+            ),
+            patch(
+                "agentic_devtools.cli.azure_devops.file_review_commands.get_value",
+                return_value="abcdef123456",
+            ),
+        ):
+            result = _get_queue_path(12345)
+
+        assert result == new_queue
+
     def test_falls_back_to_legacy_path_when_new_path_missing(self, tmp_path):
-        """Should use legacy queue path when new path absent but legacy exists."""
+        """Should use legacy queue path when neither 12-char nor 8-char paths exist but legacy exists."""
         # Create the legacy queue file but NOT the new-format file
         legacy_dir = tmp_path / "pull-request-review" / "prompts" / "12345"
         legacy_dir.mkdir(parents=True)
@@ -118,7 +167,28 @@ class TestGetQueuePath:
             ),
             patch(
                 "agentic_devtools.cli.azure_devops.file_review_commands.get_value",
-                return_value="abc12345",
+                return_value="abc12345abcd",
+            ),
+        ):
+            result = _get_queue_path(12345)
+
+        assert result == legacy_queue
+
+    def test_skips_unsafe_8char_fallback_and_uses_legacy_path(self, tmp_path):
+        """Should ignore unsafe 8-char fallback segment and continue to legacy path."""
+        legacy_dir = tmp_path / "pull-request-review" / "prompts" / "12345"
+        legacy_dir.mkdir(parents=True)
+        legacy_queue = legacy_dir / "queue.json"
+        legacy_queue.write_text("{}")
+
+        with (
+            patch(
+                "agentic_devtools.cli.azure_devops.file_review_commands.get_state_dir",
+                return_value=tmp_path,
+            ),
+            patch(
+                "agentic_devtools.cli.azure_devops.file_review_commands.get_value",
+                return_value="../evil12",
             ),
         ):
             result = _get_queue_path(12345)

{agentic_devtools-0.2.47 → agentic_devtools-0.2.48}/tests/unit/cli/azure_devops/file_review_commands/test_approve_file.py

@@ -345,3 +345,111 @@ class TestApproveFileRecordVerdict:
         # No spurious 'unknown' row should exist
         file_entry = review_state.files["/src/main.py"]
         assert all(mv.modelId != "unknown" for mv in file_entry.modelVerdicts)
+
+
+class TestApproveFileSkipCascade:
+    """Tests for the skip_cascade parameter in approve_file."""
+
+    def _setup_state(self, set_value):
+        set_value("pull_request_id", "23046")
+        set_value("file_review.file_path", "/src/main.py")
+        set_value("file_review.summary", "LGTM!")
+
+    def test_skip_cascade_true_skips_cascade(self, temp_state_dir, clear_state_before):
+        """skip_cascade=True should skip cascade_status_update but still call save_review_state."""
+        from agentic_devtools.state import set_value
+
+        review_state = _make_review_state()
+        mock_save = MagicMock()
+        with ExitStack() as stack:
+            mock_cascade = stack.enter_context(
+                patch(
+                    "agentic_devtools.cli.azure_devops.status_cascade.cascade_status_update",
+                    return_value=[],
+                )
+            )
+            mock_execute = stack.enter_context(
+                patch("agentic_devtools.cli.azure_devops.status_cascade.execute_cascade")
+            )
+            stack.enter_context(
+                patch(
+                    "agentic_devtools.cli.azure_devops.review_state.load_review_state",
+                    return_value=review_state,
+                )
+            )
+            stack.enter_context(patch("agentic_devtools.cli.azure_devops.review_state.save_review_state", mock_save))
+            stack.enter_context(
+                patch(
+                    "agentic_devtools.cli.azure_devops.review_templates.render_file_summary",
+                    return_value="## Approved",
+                )
+            )
+            stack.enter_context(
+                patch(
+                    "agentic_devtools.cli.azure_devops.review_scaffold._build_pr_base_url",
+                    return_value="https://dev.azure.com/org/proj/_git/repo/pullRequest/23046",
+                )
+            )
+            stack.enter_context(patch(f"{_MOD}.require_requests", return_value=MagicMock()))
+            stack.enter_context(patch(f"{_MOD}.get_pat", return_value="fake-pat"))
+            stack.enter_context(patch(f"{_MOD}.get_auth_headers", return_value={"Authorization": "Basic xxx"}))
+            stack.enter_context(patch(f"{_MOD}.patch_comment"))
+            stack.enter_context(patch(f"{_MOD}.patch_thread_status"))
+            stack.enter_context(patch(f"{_MOD}.mark_file_reviewed"))
+            stack.enter_context(patch(f"{_MOD}._update_queue_after_review", return_value=(2, 1)))
+            stack.enter_context(patch(f"{_MOD}.print_next_file_prompt"))
+
+            self._setup_state(set_value)
+            approve_file(skip_cascade=True)
+
+        mock_cascade.assert_not_called()
+        mock_execute.assert_not_called()
+        mock_save.assert_called_once_with(review_state)
+
+    def test_skip_cascade_false_default_cascades(self, temp_state_dir, clear_state_before):
+        """Default skip_cascade=False should call cascade_status_update and execute_cascade."""
+        from agentic_devtools.state import set_value
+
+        review_state = _make_review_state()
+        mock_save = MagicMock()
+        with ExitStack() as stack:
+            mock_cascade = stack.enter_context(
+                patch(
+                    "agentic_devtools.cli.azure_devops.status_cascade.cascade_status_update",
+                    return_value=[],
+                )
+            )
+            stack.enter_context(patch("agentic_devtools.cli.azure_devops.status_cascade.execute_cascade"))
+            stack.enter_context(
+                patch(
+                    "agentic_devtools.cli.azure_devops.review_state.load_review_state",
+                    return_value=review_state,
+                )
+            )
+            stack.enter_context(patch("agentic_devtools.cli.azure_devops.review_state.save_review_state", mock_save))
+            stack.enter_context(
+                patch(
+                    "agentic_devtools.cli.azure_devops.review_templates.render_file_summary",
+                    return_value="## Approved",
+                )
+            )
+            stack.enter_context(
+                patch(
+                    "agentic_devtools.cli.azure_devops.review_scaffold._build_pr_base_url",
+                    return_value="https://dev.azure.com/org/proj/_git/repo/pullRequest/23046",
+                )
+            )
+            stack.enter_context(patch(f"{_MOD}.require_requests", return_value=MagicMock()))
+            stack.enter_context(patch(f"{_MOD}.get_pat", return_value="fake-pat"))
+            stack.enter_context(patch(f"{_MOD}.get_auth_headers", return_value={"Authorization": "Basic xxx"}))
+            stack.enter_context(patch(f"{_MOD}.patch_comment"))
+            stack.enter_context(patch(f"{_MOD}.patch_thread_status"))
+            stack.enter_context(patch(f"{_MOD}.mark_file_reviewed"))
+            stack.enter_context(patch(f"{_MOD}._update_queue_after_review", return_value=(2, 1)))
+            stack.enter_context(patch(f"{_MOD}.print_next_file_prompt"))
+
+            self._setup_state(set_value)
+            approve_file()
+
+        mock_cascade.assert_called_once()
+        mock_save.assert_called_once_with(review_state)

{agentic_devtools-0.2.47 → agentic_devtools-0.2.48}/tests/unit/cli/azure_devops/file_review_commands/test_request_changes.py

@@ -1128,3 +1128,48 @@ class TestRequestChangesRecordVerdict:
         # No spurious 'unknown' row should exist
         file_entry = review_state.files["/src/main.py"]
         assert all(mv.modelId != "unknown" for mv in file_entry.modelVerdicts)
+
+
+class TestRequestChangesSkipCascade:
+    """Tests for the skip_cascade parameter in request_changes."""
+
+    def _setup_state(self, set_value, suggestions=None):
+        set_value("pull_request_id", "23046")
+        set_value("file_review.file_path", "/src/main.py")
+        set_value("file_review.summary", "Error handling risk.")
+        set_value("file_review.suggestions", suggestions or _SUGGESTIONS)
+
+    def test_skip_cascade_true_skips_cascade(self, temp_state_dir, clear_state_before):
+        """skip_cascade=True should skip cascade_status_update but still call save_review_state."""
+        from agentic_devtools.state import set_value
+
+        mock_requests = MagicMock()
+        mock_requests.post.return_value = _make_post_response(1001, 2001)
+
+        review_state = _make_review_state()
+        mock_save = MagicMock()
+        with ExitStack() as stack:
+            handles = _enter_patch_flow_mocks(stack, review_state, mock_requests, mock_save=mock_save)
+            self._setup_state(set_value)
+            request_changes(skip_cascade=True)
+
+        handles["cascade"].assert_not_called()
+        handles["execute"].assert_not_called()
+        mock_save.assert_called_once_with(review_state)
+
+    def test_skip_cascade_false_default_cascades(self, temp_state_dir, clear_state_before):
+        """Default skip_cascade=False should call cascade_status_update and execute_cascade."""
+        from agentic_devtools.state import set_value
+
+        mock_requests = MagicMock()
+        mock_requests.post.return_value = _make_post_response(1001, 2001)
+
+        review_state = _make_review_state()
+        mock_save = MagicMock()
+        with ExitStack() as stack:
+            handles = _enter_patch_flow_mocks(stack, review_state, mock_requests, mock_save=mock_save)
+            self._setup_state(set_value)
+            request_changes()
+
+        handles["cascade"].assert_called_once()
+        mock_save.assert_called_once_with(review_state)

{agentic_devtools-0.2.47 → agentic_devtools-0.2.48}/tests/unit/cli/azure_devops/file_review_commands/test_request_changes_with_suggestion.py

@@ -604,3 +604,20 @@ class TestRequestChangesWithSuggestionPatchFlow:
         # Persisted content should include the fence-wrapped replacement code
         assert "```suggestion" in file_entry.suggestions[0].content
         assert "var x = y?.Z;" in file_entry.suggestions[0].content
+
+
+class TestRequestChangesWithSuggestionSkipCascade:
+    """Tests for skip_cascade forwarding in request_changes_with_suggestion."""
+
+    def test_skip_cascade_forwarded_to_request_changes(self, temp_state_dir, clear_state_before):
+        """skip_cascade=True should be forwarded to request_changes()."""
+        from agentic_devtools.state import set_value
+
+        set_value("pull_request_id", "23046")
+        set_value("file_review.file_path", "/src/main.py")
+        set_value("file_review.summary", "Error handling risk.")
+        set_value("file_review.suggestions", _SUGGESTIONS)
+
+        with patch(f"{_MOD}.request_changes") as mock_rc:
+            request_changes_with_suggestion(skip_cascade=True)
+            mock_rc.assert_called_once_with(skip_cascade=True)