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

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

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

{agentic_devtools-0.2.47 → agentic_devtools-0.2.49}/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.49'
+__version_tuple__ = version_tuple = (0, 2, 49)
 
 __commit_id__ = commit_id = None

{agentic_devtools-0.2.47 → agentic_devtools-0.2.49}/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:
@@ -265,6 +276,11 @@ def _complete_active_session(pull_request_id: int) -> None:
     call is a no-op — a ``_NoChange`` sentinel is raised inside the
     context manager so the file is not rewritten needlessly.
 
+    After persisting the status change, updates the corresponding activity
+    log comment in Azure DevOps (if ``activityLogCommentId`` is set) to
+    show ``✅ Completed``.  API errors are caught and logged so that the
+    completion flow is never interrupted.
+
     Silently returns when ``review-state.json`` does not exist (matching
     the pattern in ``trigger_in_progress_for_file``).
 
@@ -273,6 +289,12 @@ def _complete_active_session(pull_request_id: int) -> None:
     """
     from .review_state import read_modify_write_review_state
 
+    completed_session = None
+    activity_log_thread_id = 0
+    commit_hash = None
+    repo_id = None
+    session_index = 0
+
     try:
         with read_modify_write_review_state(pull_request_id) as review_state:
             # Iterate in reverse to find the latest in-progress session
@@ -280,6 +302,12 @@ def _complete_active_session(pull_request_id: int) -> None:
                 if session.status == "in_progress":
                     session.status = "completed"
                     session.completedUtc = datetime.now(timezone.utc).isoformat()
+                    # Capture info for activity log update after lock release
+                    completed_session = session
+                    activity_log_thread_id = review_state.activityLogThreadId
+                    commit_hash = review_state.commitHash
+                    repo_id = review_state.repoId
+                    session_index = review_state.sessions.index(session) + 1
                     break
             else:
                 # No in-progress session found — skip the save.
@@ -287,6 +315,32 @@ def _complete_active_session(pull_request_id: int) -> None:
     except (FileNotFoundError, _NoChange):
         return
 
+    # Update activity log comment outside the file lock
+    if completed_session is not None and completed_session.activityLogCommentId is not None and activity_log_thread_id:
+        try:
+            from .review_scaffold import _update_activity_log_comment_status
+
+            requests_module = require_requests()
+            headers = get_auth_headers(get_pat())
+            config = AzureDevOpsConfig.from_state()
+            threads_url = config.build_api_url(repo_id, "pullRequests", pull_request_id, "threads")
+
+            _update_activity_log_comment_status(
+                requests_module,
+                headers,
+                threads_url,
+                activity_log_thread_id,
+                completed_session.activityLogCommentId,
+                "✅",
+                "Completed",
+                completed_session,
+                commit_hash,
+                session_index,
+                "Review session completed successfully.",
+            )
+        except Exception as exc:
+            print(f"Warning: Could not update activity log comment: {exc}", file=sys.stderr)
+
 
 def print_next_file_prompt(pull_request_id: int) -> None:
     """
@@ -595,7 +649,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 +658,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 +674,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 +814,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 +876,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 +887,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 +906,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 +1178,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 +1251,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 +1262,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 +1359,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 +1987,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 +2000,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.49}/agentic_devtools/cli/azure_devops/review_commands.py

@@ -474,7 +474,11 @@ def generate_review_prompts(
 
 def _write_file_prompt(directory: Path, file_detail: dict, threads_for_file: list) -> Path:
     """Write a file review prompt to disk."""
-    from .review_helpers import convert_to_prompt_filename
+    from .review_helpers import (
+        build_full_file_content_section,
+        convert_to_prompt_filename,
+        resolve_repository_root,
+    )
 
     filename = convert_to_prompt_filename(file_detail.get("path", ""))
     prompt_path = directory / filename
@@ -498,6 +502,14 @@ def _write_file_prompt(directory: Path, file_detail: dict, threads_for_file: lis
         "```",
     ]
 
+    lines.extend(
+        build_full_file_content_section(
+            file_path=file_detail.get("path", ""),
+            change_type=file_detail.get("changeType", "edit"),
+            repo_root=resolve_repository_root(),
+        )
+    )
+
     prompt_path.write_text("\n".join(lines), encoding="utf-8")
     return prompt_path
 
@@ -826,7 +838,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(