agentic-devtools 0.2.32__tar.gz → 0.2.33__tar.gz

{agentic_devtools-0.2.32 → agentic_devtools-0.2.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-devtools
-Version: 0.2.32
+Version: 0.2.33
 Summary: AI assistant helper commands for the Dragonfly platform
 Author: Dragonfly Team
 License-Expression: MIT

{agentic_devtools-0.2.32 → agentic_devtools-0.2.33}/agentic_devtools/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.32'
-__version_tuple__ = version_tuple = (0, 2, 32)
+__version__ = version = '0.2.33'
+__version_tuple__ = version_tuple = (0, 2, 33)
 
 __commit_id__ = commit_id = None

{agentic_devtools-0.2.32 → agentic_devtools-0.2.33}/agentic_devtools/cli/azure_devops/file_review_commands.py

@@ -13,7 +13,7 @@ import json
 import sys
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Optional
+from typing import TYPE_CHECKING, Dict, Optional
 
 from ...state import get_pull_request_id, get_state_dir, get_value, is_dry_run
 from .auth import get_auth_headers, get_pat
@@ -27,6 +27,9 @@ from .helpers import (
 )
 from .mark_reviewed import mark_file_reviewed
 
+if TYPE_CHECKING:
+    from .review_state import ReviewState
+
 
 def _normalize_repo_path(path: Optional[str]) -> Optional[str]:
     """Normalize a file path to repository format (/path/to/file)."""
@@ -38,6 +41,65 @@ def _normalize_repo_path(path: Optional[str]) -> Optional[str]:
     return f"/{clean}"
 
 
+def _get_attribution_params(
+    review_state: "ReviewState",
+    config: AzureDevOpsConfig,
+    file_path: Optional[str] = None,
+) -> Dict[str, Optional[str]]:
+    """Extract attribution parameters from ReviewState for comment rendering.
+
+    Returns a dict with keys ``model_name``, ``commit_hash``, and ``commit_url``
+    that can be unpacked as keyword arguments into ``render_file_summary()`` and
+    ``render_overall_summary()``.  Any value may be ``None`` when the required
+    data is absent (e.g. no sessions recorded, no commit hash stored yet).
+
+    Args:
+        review_state: Current ReviewState instance.
+        config: AzureDevOpsConfig with org/project/repository.
+        file_path: Optional file path for per-file URL (overall PR URL used when absent).
+
+    Returns:
+        Dict with ``model_name``, ``commit_hash``, and ``commit_url``.
+    """
+    from .review_attribution import build_commit_file_url, build_commit_pr_url
+    from .review_state import normalize_file_path
+
+    # Prefer the latest session model ID when available, but fall back to the
+    # top-level ReviewState.modelId for backward/partial states where sessions
+    # may be empty while the model is still known.
+    model_name: Optional[str]
+    if getattr(review_state, "sessions", None):
+        model_name = review_state.sessions[-1].modelId
+    else:
+        model_name = getattr(review_state, "modelId", None)
+
+    commit_hash = review_state.commitHash
+    commit_url: Optional[str] = None
+    if commit_hash and review_state.latestIterationId:
+        try:
+            if file_path:
+                normalized = normalize_file_path(file_path)
+                commit_url = build_commit_file_url(
+                    config.organization,
+                    config.project,
+                    config.repository,
+                    review_state.prId,
+                    normalized,
+                    review_state.latestIterationId,
+                )
+            else:
+                commit_url = build_commit_pr_url(
+                    config.organization,
+                    config.project,
+                    config.repository,
+                    review_state.prId,
+                    review_state.latestIterationId,
+                )
+        except Exception:
+            commit_url = None
+    return {"model_name": model_name, "commit_hash": commit_hash, "commit_url": commit_url}
+
+
 def _get_thread_file_path(thread: dict) -> Optional[str]:
     """Extract the file path from a thread's context."""
     context = thread.get("threadContext")
@@ -81,9 +143,7 @@ def _get_queue_path(pull_request_id: int) -> Path:
     # 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():
-        legacy_path = (
-            state_dir / "pull-request-review" / "prompts" / str(pull_request_id) / "queue.json"
-        )
+        legacy_path = state_dir / "pull-request-review" / "prompts" / str(pull_request_id) / "queue.json"
         if legacy_path.exists():
             return legacy_path
     return new_path
@@ -511,7 +571,18 @@ def trigger_in_progress_for_file(
         auth_headers = get_auth_headers(get_pat())
 
     # PATCH file summary comment content; file thread status stays "active" per spec
-    file_content = render_file_summary(file_entry, file_entry.suggestions, base_url)
+    attrs = _get_attribution_params(review_state, config, file_path=file_path)
+
+    # Ensure the current model's verdict reflects that review is in progress.
+    # attrs["model_name"] holds the model ID derived from the review session.
+    model_id = attrs.get("model_name")
+    if model_id is not None:
+        current_verdict = file_entry.get_model_verdict(model_id)
+        if current_verdict is not None:
+            current_verdict.status = ReviewStatus.IN_PROGRESS.value
+            current_verdict.verdictType = None
+
+    file_content = render_file_summary(file_entry, file_entry.suggestions, base_url, **attrs)
     patch_comment(
         requests_module=requests_module,
         headers=auth_headers,
@@ -528,7 +599,8 @@ def trigger_in_progress_for_file(
     # review_state even if downstream cascade execution fails, so the
     # local state reflects the already-PATCHed file comment.
     try:
-        ops = cascade_status_update(review_state, file_path, base_url)
+        cascade_attrs = _get_attribution_params(review_state, config)
+        ops = cascade_status_update(review_state, file_path, base_url, **cascade_attrs)
         execute_cascade(ops, requests_module, auth_headers, config, repo_id, pull_request_id, dry_run=dry_run)
     finally:
         if not dry_run:
@@ -1059,8 +1131,20 @@ def approve_file() -> None:  # pragma: no cover
             )
             sys.exit(1)
 
+        # Record verdict for model progress table; skip when no model ID is known
+        # to avoid polluting the review state with a spurious "unknown" row.
+        from .verdict_protocol import VerdictType, record_verdict
+
+        if review_state.sessions:
+            model_id = review_state.sessions[-1].modelId
+        else:
+            model_id = getattr(review_state, "modelId", None)
+        if model_id:
+            record_verdict(file_entry, model_id, VerdictType.AGREE, ReviewStatus.APPROVED.value)
+
         # PATCH file summary comment with regenerated markdown
-        file_content = render_file_summary(file_entry, [], base_url)
+        attrs = _get_attribution_params(review_state, config, file_path=file_path)
+        file_content = render_file_summary(file_entry, [], base_url, **attrs)
         patch_comment(
             requests_module=requests,
             headers=headers,
@@ -1098,7 +1182,8 @@ def approve_file() -> None:  # pragma: no cover
         # review_state even if downstream cascade execution fails, so the
         # local state reflects the already-PATCHed file comment.
         try:
-            patch_operations = cascade_status_update(review_state, file_path, base_url)
+            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,
@@ -1573,8 +1658,20 @@ def request_changes() -> None:
 
             file_entry = review_state.files[normalized]
 
+            # Record verdict for model progress table; skip when no model ID is known
+            # to avoid polluting the review state with a spurious "unknown" row.
+            from .verdict_protocol import VerdictType, record_verdict
+
+            if review_state.sessions:
+                model_id = review_state.sessions[-1].modelId
+            else:
+                model_id = getattr(review_state, "modelId", None)
+            if model_id:
+                record_verdict(file_entry, model_id, VerdictType.AGREE, ReviewStatus.NEEDS_WORK.value)
+
             # PATCH file summary comment with regenerated markdown
-            file_content = render_file_summary(file_entry, file_entry.suggestions, base_url)
+            attrs = _get_attribution_params(review_state, config, file_path=file_path)
+            file_content = render_file_summary(file_entry, file_entry.suggestions, base_url, **attrs)
             patch_comment(
                 requests_module=requests,
                 headers=headers,
@@ -1609,7 +1706,8 @@ def request_changes() -> None:
             )
 
             # Cascade folder and overall summary updates
-            patch_operations = cascade_status_update(review_state, file_path, base_url)
+            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,

{agentic_devtools-0.2.32 → agentic_devtools-0.2.33}/agentic_devtools/cli/azure_devops/review_scaffold.py

@@ -16,15 +16,17 @@ re-scaffolding are also handled here.
 
 import sys
 import uuid
-from dataclasses import dataclass, field
+from dataclasses import dataclass, field, replace
 from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, List, Optional, Tuple
 from urllib.parse import quote
 
 from .config import AzureDevOpsConfig
+from .review_attribution import build_commit_file_url, build_commit_pr_url
 from .review_state import (
     FileEntry,
     FolderGroup,
+    ModelVerdict,
     OverallSummary,
     ReviewSession,
     ReviewState,
@@ -42,6 +44,7 @@ from .suggestion_verification import (
     render_abort_summary,
     render_unaddressed_thread_comment,
 )
+from .verdict_protocol import initialize_model_verdicts
 
 # Stale session threshold: sessions older than this are considered crashed.
 STALE_SESSION_THRESHOLD = timedelta(hours=2)
@@ -977,6 +980,11 @@ def _fresh_scaffold(
 
     # Step 1: Create file summary threads
     file_entries: Dict[str, FileEntry] = {}
+    commit_url_pr = (
+        build_commit_pr_url(config.organization, config.project, repo_name, pull_request_id, latest_iteration_id)
+        if commit_hash and latest_iteration_id
+        else None
+    )
     for file_path in files:
         normalized = normalize_file_path(file_path)
         folder = _get_folder_for_path(file_path)
@@ -989,17 +997,31 @@ def _fresh_scaffold(
             fileName=file_name,
             status=ReviewStatus.UNREVIEWED.value,
         )
-        content = render_file_summary(temp_entry, [], base_url)
+        if model_id:
+            initialize_model_verdicts(temp_entry, [model_id])
+        commit_url_file = (
+            build_commit_file_url(
+                config.organization, config.project, repo_name, pull_request_id, normalized, latest_iteration_id
+            )
+            if commit_hash and latest_iteration_id
+            else None
+        )
+        content = render_file_summary(
+            temp_entry, [], base_url, model_name=model_id, commit_hash=commit_hash, commit_url=commit_url_file
+        )
 
         print(f"Creating file summary thread for {normalized}...")
         thread_id, comment_id = _post_thread(requests_module, headers, threads_url, content, file_path=normalized)
-        file_entries[normalized] = FileEntry(
+        file_entry = FileEntry(
             threadId=thread_id,
             commentId=comment_id,
             folder=folder,
             fileName=file_name,
             status=ReviewStatus.UNREVIEWED.value,
         )
+        if model_id:
+            initialize_model_verdicts(file_entry, [model_id])
+        file_entries[normalized] = file_entry
 
     # Step 2: Build lightweight folder groups
     folder_groups: Dict[str, FolderGroup] = {}
@@ -1011,7 +1033,9 @@ def _fresh_scaffold(
 
     # Step 3: Create overall PR summary thread
     temp_state = _build_state(file_entries, folder_groups)
-    overall_content = render_overall_summary(temp_state, base_url)
+    overall_content = render_overall_summary(
+        temp_state, base_url, model_name=model_id, commit_hash=commit_hash, commit_url=commit_url_pr
+    )
     print("Creating overall PR summary thread...")
     overall_thread_id, overall_comment_id = _post_thread(requests_module, headers, threads_url, overall_content)
 
@@ -1241,6 +1265,11 @@ def _incremental_rescaffold(
         return None
 
     # Process new files
+    commit_url_pr = (
+        build_commit_pr_url(config.organization, config.project, repo_name, pull_request_id, latest_iteration_id)
+        if commit_hash and latest_iteration_id
+        else None
+    )
     for file_path in changes.new_files:
         folder = _get_folder_for_path(file_path)
         file_name = _get_file_name(file_path)
@@ -1251,21 +1280,42 @@ def _incremental_rescaffold(
             fileName=file_name,
             status=ReviewStatus.UNREVIEWED.value,
         )
-        content = render_file_summary(temp_entry, [], base_url)
+        if model_id:
+            initialize_model_verdicts(temp_entry, [model_id])
+        commit_url_file = (
+            build_commit_file_url(
+                config.organization, config.project, repo_name, pull_request_id, file_path, latest_iteration_id
+            )
+            if commit_hash and latest_iteration_id
+            else None
+        )
+        content = render_file_summary(
+            temp_entry, [], base_url, model_name=model_id, commit_hash=commit_hash, commit_url=commit_url_file
+        )
         print(f"Scaffolding new file thread for {file_path}...")
         thread_id, comment_id = _post_thread(requests_module, headers, threads_url, content, file_path=file_path)
-        existing_state.files[file_path] = FileEntry(
+        new_file_entry = FileEntry(
             threadId=thread_id,
             commentId=comment_id,
             folder=folder,
             fileName=file_name,
             status=ReviewStatus.UNREVIEWED.value,
         )
+        if model_id:
+            initialize_model_verdicts(new_file_entry, [model_id])
+        existing_state.files[file_path] = new_file_entry
 
     # Process modified files
     for file_path in changes.modified_files:
         fe = existing_state.files.get(file_path)
         if fe and fe.threadId:
+            commit_url_file = (
+                build_commit_file_url(
+                    config.organization, config.project, repo_name, pull_request_id, file_path, latest_iteration_id
+                )
+                if commit_hash and latest_iteration_id
+                else None
+            )
             try:
                 _demote_main_comment(
                     requests_module,
@@ -1274,15 +1324,19 @@ def _incremental_rescaffold(
                     fe.threadId,
                     fe.commentId,
                     render_file_summary(
-                        FileEntry(
-                            threadId=fe.threadId,
-                            commentId=fe.commentId,
-                            folder=fe.folder,
-                            fileName=fe.fileName,
+                        replace(
+                            fe,
                             status=ReviewStatus.UNREVIEWED.value,
+                            summary=None,
+                            suggestions=[],
+                            modelVerdicts=[ModelVerdict(modelId=mv.modelId) for mv in fe.modelVerdicts],
+                            consolidationStatus=None,
                         ),
                         [],
                         base_url,
+                        model_name=model_id,
+                        commit_hash=commit_hash,
+                        commit_url=commit_url_file,
                     ),
                 )
             except Exception as exc:
@@ -1292,6 +1346,10 @@ def _incremental_rescaffold(
             fe.suggestions = []
             fe.status = ReviewStatus.UNREVIEWED.value
             fe.summary = None
+            for mv in fe.modelVerdicts:
+                mv.status = ReviewStatus.UNREVIEWED.value
+                mv.verdictType = None
+            fe.consolidationStatus = None
 
     # Process deleted files
     for file_path in changes.deleted_files:
@@ -1328,7 +1386,9 @@ def _incremental_rescaffold(
     if n_new > 0 or n_mod > 0 or n_del > 0:
         overall = existing_state.overallSummary
         if overall.threadId:
-            new_summary = render_overall_summary(existing_state, base_url)
+            new_summary = render_overall_summary(
+                existing_state, base_url, model_name=model_id, commit_hash=commit_hash, commit_url=commit_url_pr
+            )
             try:
                 _demote_main_comment(
                     requests_module,
@@ -1344,7 +1404,9 @@ def _incremental_rescaffold(
         # Rebase with no changes — demote and re-render summary
         overall = existing_state.overallSummary
         if overall.threadId:
-            new_summary = render_overall_summary(existing_state, base_url)
+            new_summary = render_overall_summary(
+                existing_state, base_url, model_name=model_id, commit_hash=commit_hash, commit_url=commit_url_pr
+            )
             try:
                 _demote_main_comment(
                     requests_module,

{agentic_devtools-0.2.32 → agentic_devtools-0.2.33}/agentic_devtools/cli/azure_devops/status_cascade.py

@@ -7,7 +7,7 @@ Provides functions to:
 """
 
 from dataclasses import dataclass
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 from .config import AzureDevOpsConfig
 from .helpers import patch_comment, patch_thread_status
@@ -63,6 +63,9 @@ def cascade_status_update(
     state: ReviewState,
     file_path: str,
     base_url: str,
+    model_name: Optional[str] = None,
+    commit_hash: Optional[str] = None,
+    commit_url: Optional[str] = None,
 ) -> List[PatchOperation]:
     """Compute PATCH operations needed after a file's status has changed.
 
@@ -75,6 +78,9 @@ def cascade_status_update(
         state: Full ReviewState (mutated in-place with new overall status).
         file_path: Path of the file whose status has changed.
         base_url: PR root URL for generating markdown content.
+        model_name: Model identifier for attribution line (optional).
+        commit_hash: Commit hash for attribution line (optional).
+        commit_url: URL to the commit/iteration for attribution line (optional).
 
     Returns:
         List of PatchOperation objects to execute via execute_cascade.
@@ -94,7 +100,9 @@ def cascade_status_update(
     ops: List[PatchOperation] = []
 
     # Overall summary comment PATCH
-    overall_content = render_overall_summary(state, base_url)
+    overall_content = render_overall_summary(
+        state, base_url, model_name=model_name, commit_hash=commit_hash, commit_url=commit_url
+    )
     ops.append(
         PatchOperation(
             thread_id=state.overallSummary.threadId,
@@ -110,6 +118,9 @@ def cascade_status_update(
 def cascade_overall_summary_update(
     state: ReviewState,
     base_url: str,
+    model_name: Optional[str] = None,
+    commit_hash: Optional[str] = None,
+    commit_url: Optional[str] = None,
 ) -> List[PatchOperation]:
     """Compute PATCH operations for the overall PR summary without a file context.
 
@@ -120,6 +131,9 @@ def cascade_overall_summary_update(
     Args:
         state: Full ReviewState (mutated in-place with new overall status).
         base_url: PR root URL for generating markdown content.
+        model_name: Model identifier for attribution line (optional).
+        commit_hash: Short commit hash for attribution line (optional).
+        commit_url: URL to the commit/iteration for attribution line (optional).
 
     Returns:
         List of PatchOperation objects to execute via execute_cascade.
@@ -127,7 +141,34 @@ def cascade_overall_summary_update(
     new_overall_status = derive_overall_status(state)
     state.overallSummary.status = new_overall_status
 
-    overall_content = render_overall_summary(state, base_url)
+    # If attribution parameters were not provided explicitly, derive them from
+    # the ReviewState instance so that callers (e.g. workflow completion flows)
+    # that don't pass these parameters still render attribution when the data
+    # is available.
+    if model_name is None:
+        if getattr(state, "sessions", None):
+            model_name = state.sessions[-1].modelId
+        else:
+            model_name = getattr(state, "modelId", None)
+    if commit_hash is None:
+        commit_hash = getattr(state, "commitHash", None)
+    if commit_url is None and commit_hash and getattr(state, "latestIterationId", None):
+        from .review_attribution import build_commit_pr_url
+
+        try:
+            commit_url = build_commit_pr_url(
+                state.organization,
+                state.project,
+                state.repoName,
+                state.prId,
+                state.latestIterationId,
+            )
+        except Exception:
+            commit_url = None
+
+    overall_content = render_overall_summary(
+        state, base_url, model_name=model_name, commit_hash=commit_hash, commit_url=commit_url
+    )
     return [
         PatchOperation(
             thread_id=state.overallSummary.threadId,