agentic-devtools 0.2.548__py3-none-any.whl → 0.2.549__py3-none-any.whl

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.548'
-__version_tuple__ = version_tuple = (0, 2, 548)
+__version__ = version = '0.2.549'
+__version_tuple__ = version_tuple = (0, 2, 549)
 
 __commit_id__ = commit_id = None

agentic_devtools/cli/ci/github_provider.py

@@ -3924,6 +3924,12 @@ class GitHubActionsProvider(CIPlatformProvider):
         files = _parse_paginated_json(response)
         return [f["filename"] for f in files]
 
+    @retry_with_backoff()
+    def list_pr_commits(self, pr_number: int) -> list[dict[str, Any]]:
+        """Return paginated PR commits oldest first, with their parent SHAs."""
+        response = _gh_api(self._repo_api(f"/pulls/{pr_number}/commits"), paginate=True)
+        return _parse_paginated_json(response)
+
     @retry_with_backoff()
     def get_check_annotations(self, check_run_id: int, limit: int) -> list[str]:
         """Get annotations from a check run."""

agentic_devtools/cli/ci/pipeline/runner.py

@@ -11,6 +11,7 @@ import re
 import sys
 import zlib
 from collections.abc import Mapping, Sequence
+from dataclasses import replace
 from datetime import UTC, datetime
 from typing import TypedDict, cast
 
@@ -578,6 +579,46 @@ def _find_recent_conflict_repair_head(
     return marker_head
 
 
+def _find_conflict_repair_output(
+    provider: CIPlatformProvider,
+    pr_number: int,
+    pre_head_sha: str,
+    current_head_sha: str,
+) -> str:
+    """Resolve the earliest repair child, falling back to the next PR commit."""
+    try:
+        commits = provider.list_pr_commits(pr_number)
+        if not isinstance(commits, list):
+            raise ValueError("PR commit list unavailable")
+        shas: list[str] = []
+        parent_shas: list[list[str]] = []
+        for commit in commits:
+            if not isinstance(commit, dict) or not isinstance(commit.get("sha"), str) or not commit["sha"]:
+                raise ValueError("PR commit SHA unavailable")
+            parents = commit.get("parents", [])
+            if not isinstance(parents, list) or any(
+                not isinstance(parent, dict) or not isinstance(parent.get("sha"), str) for parent in parents
+            ):
+                raise ValueError("PR commit parents unavailable")
+            shas.append(commit["sha"])
+            parent_shas.append([parent["sha"] for parent in parents])
+        if pre_head_sha not in shas:
+            raise ValueError("pre-repair HEAD not found in PR commit list")
+        if current_head_sha not in shas or shas.index(current_head_sha) <= shas.index(pre_head_sha):
+            raise ValueError("current HEAD not found after pre-repair HEAD in PR commit list")
+        start = shas.index(pre_head_sha) + 1
+        end = shas.index(current_head_sha) + 1
+        for index in range(start, end):
+            if pre_head_sha in parent_shas[index]:
+                return shas[index]
+        return shas[start]
+    except Exception as exc:
+        if isinstance(exc, ProviderRateLimitError) and exc.is_rate_limit:
+            raise
+        logger.error("PR #%d: conflict-repair output unavailable: %s", pr_number, str(exc)[:200])
+        return ""
+
+
 def _persist_conflict_repair_validation(
     provider: CIPlatformProvider,
     pr_number: int,
@@ -943,6 +984,56 @@ def run_pipeline(
                 f"PR #{current_snapshot.pr_number}: conflict-repair diff validation unavailable ({exc})"
             )
             logger.error(guard_block_reason)
+    repair_snapshot = current_snapshot
+    if pre_repair_head_sha:
+        repair_output_sha = _find_conflict_repair_output(
+            provider, current_snapshot.pr_number, pre_repair_head_sha, current_snapshot.head_sha
+        )
+        try:
+            if not repair_output_sha:
+                raise ValueError("conflict-repair output unavailable from PR commit list")
+            if repair_output_sha != current_snapshot.head_sha:
+                repair_files = provider.compute_diff_files(
+                    base_branch=current_snapshot.base_branch,
+                    sha=repair_output_sha,
+                    base_sha=current_snapshot.base_sha,
+                )
+                if not isinstance(repair_files, list) or any(
+                    not isinstance(path, str) or not path for path in repair_files
+                ):
+                    raise ValueError("conflict-repair output file inventory unavailable")
+                repair_hash = None
+                try:
+                    repair_hash = provider.compute_diff_hash(
+                        base_branch=current_snapshot.base_branch,
+                        sha=repair_output_sha,
+                        base_sha=current_snapshot.base_sha,
+                    )
+                except Exception as exc:
+                    if isinstance(exc, ProviderRateLimitError) and exc.is_rate_limit:
+                        raise
+                    logger.warning(
+                        "PR #%d: Failed to compute repair-output fingerprint for %s: %s",
+                        current_snapshot.pr_number,
+                        repair_output_sha[:8],
+                        str(exc)[:200],
+                    )
+                repair_snapshot = replace(
+                    current_snapshot,
+                    head_sha=repair_output_sha,
+                    files=repair_files,
+                    diff_hash=repair_hash if isinstance(repair_hash, str) else "",
+                    diff_hash_available=isinstance(repair_hash, str) and bool(repair_hash),
+                )
+        except Exception as exc:
+            if isinstance(exc, ProviderRateLimitError) and exc.is_rate_limit:
+                raise
+            guard_blocked = True
+            guard_block_reason = (
+                f"PR #{current_snapshot.pr_number}: conflict-repair diff validation unavailable ({exc})"
+            )
+            logger.error(guard_block_reason)
+            pre_repair_head_sha = ""
     if pre_repair_head_sha:
         pre_repair_hash = ""
         pre_repair_hash_available = False
@@ -996,12 +1087,12 @@ def run_pipeline(
         cross_run_fingerprints_available = (
             bool(current_snapshot.base_sha)
             and pre_repair_hash_available
-            and current_snapshot.diff_hash_available
+            and repair_snapshot.diff_hash_available
             and bool(pre_repair_hash)
-            and bool(current_snapshot.diff_hash)
+            and bool(repair_snapshot.diff_hash)
         )
-        current_diff_hash = current_snapshot.diff_hash
-        current_diff_hash_available = current_snapshot.diff_hash_available
+        current_diff_hash = repair_snapshot.diff_hash
+        current_diff_hash_available = repair_snapshot.diff_hash_available
         if not cross_run_fingerprints_available and current_snapshot.base_sha and pre_repair_files is not None:
             exact_diff_fingerprints = [
                 _get_exact_diff_fingerprint(
@@ -1013,7 +1104,7 @@ def run_pipeline(
                 )
                 for head_sha, expected_files in (
                     (pre_repair_head_sha, pre_repair_files),
-                    (current_snapshot.head_sha, current_snapshot.files),
+                    (repair_snapshot.head_sha, repair_snapshot.files),
                 )
             ]
             if all(exact_diff_fingerprints):
@@ -1025,19 +1116,19 @@ def run_pipeline(
             guard_blocked = True
             guard_block_reason = (
                 f"PR #{current_snapshot.pr_number}: post-repair diff validation blocked "
-                f"(pre-repair HEAD={pre_repair_head_sha}, post-repair HEAD={current_snapshot.head_sha}, "
-                f"base={current_snapshot.base_branch}, changed-file count={len(current_snapshot.files)}, "
+                f"(pre-repair HEAD={pre_repair_head_sha}, post-repair HEAD={repair_snapshot.head_sha}, "
+                f"base={current_snapshot.base_branch}, changed-file count={len(repair_snapshot.files)}, "
                 "missing files=<unavailable>; pre-repair file inventory unavailable)"
             )
             logger.error(guard_block_reason)
             pre_repair_head_sha = ""
         baseline_files = (
-            pre_repair_files if pre_repair_files is not None else (current_snapshot.files or ["<pre-repair-diff>"])
+            pre_repair_files if pre_repair_files is not None else (repair_snapshot.files or ["<pre-repair-diff>"])
         )
         if pre_repair_head_sha:
             cross_run_check = validate_diff_preservation(
                 pre_files=baseline_files,
-                post_files=current_snapshot.files,
+                post_files=repair_snapshot.files,
                 pre_hash=pre_repair_hash,
                 post_hash=current_diff_hash,
                 pre_hash_available=pre_repair_hash_available and bool(current_snapshot.base_sha),
@@ -1045,7 +1136,7 @@ def run_pipeline(
                 fingerprint_supported=True,
                 intentional_noop=False,
                 pre_head_sha=pre_repair_head_sha,
-                post_head_sha=current_snapshot.head_sha,
+                post_head_sha=repair_snapshot.head_sha,
                 pre_base_branch=current_snapshot.base_branch,
                 post_base_branch=current_snapshot.base_branch,
                 pre_base_sha=current_snapshot.base_sha,
@@ -1056,8 +1147,8 @@ def run_pipeline(
                 guard_blocked = True
                 guard_block_reason = (
                     f"PR #{current_snapshot.pr_number}: post-repair diff validation blocked "
-                    f"(pre-repair HEAD={pre_repair_head_sha}, post-repair HEAD={current_snapshot.head_sha}, "
-                    f"base={current_snapshot.base_branch}, changed-file count={len(current_snapshot.files)}, "
+                    f"(pre-repair HEAD={pre_repair_head_sha}, post-repair HEAD={repair_snapshot.head_sha}, "
+                    f"base={current_snapshot.base_branch}, changed-file count={len(repair_snapshot.files)}, "
                     f"missing files={missing}; {cross_run_check.reason})"
                 )
                 logger.error(guard_block_reason)

agentic_devtools/cli/ci/provider.py

@@ -411,6 +411,10 @@ class CIPlatformProvider(ABC):
         """Return changed files compared with the base, when supported."""
         return None
 
+    def list_pr_commits(self, pr_number: int) -> list[dict[str, Any]]:
+        """Return PR commits oldest first, including ``sha`` and ``parents``."""
+        raise NotImplementedError(f"{type(self).__name__} does not implement list_pr_commits")
+
     @abstractmethod
     def list_review_comments(self, pr_number: int, review_id: int) -> list[ReviewCommentInfo]:
         """List inline comments from a specific review.

{agentic_devtools-0.2.548.dist-info → agentic_devtools-0.2.549.dist-info}/METADATA

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

{agentic_devtools-0.2.548.dist-info → agentic_devtools-0.2.549.dist-info}/RECORD

@@ -1,5 +1,5 @@
 agentic_devtools/__init__.py,sha256=J_Zw_vWKghk-cLmqI83hXQmSiS8zMhGIHM5WPLDkZuo,242
-agentic_devtools/_version.py,sha256=ojzVDrlWMI2Qvet0wUNekX1OB0rnYRlHIriLBnNB3O8,524
+agentic_devtools/_version.py,sha256=H2VpPdW7WdQH-H0NmkEpI-HIQN4oeYF9KCyJIqty95E,524
 agentic_devtools/agdt_gitignore.py,sha256=vVVqTjBZ_ijn6U3Lnh_JGrARLschYVN-fFal9jDk0Ak,2694
 agentic_devtools/background_tasks.py,sha256=sFgmqOnCdCjclABJ8V__yDwBXDyi45b1Z-MVv3G2zB8,17664
 agentic_devtools/config.py,sha256=DEVxTVZhsQbVQwO9qdB_1h19aBpjMzF6xJY_ePYLGLs,15629
@@ -179,12 +179,12 @@ agentic_devtools/cli/ci/dispatcher_throttle.py,sha256=urJQ_jUkSdx4mtWxrKrzbPdDd_
 agentic_devtools/cli/ci/due_probe_wakeup.py,sha256=qUSgDbtZ09jytNt6UbCFrwxCoeUObKx6u5W0GQXYeNs,13343
 agentic_devtools/cli/ci/exceptions.py,sha256=zpKWOgnBbHHQgAQRvdRW4VFnE_qdgqgmo8r1H-x47l4,1086
 agentic_devtools/cli/ci/finalization_state.py,sha256=UasYfCuLmm-4e2pNmDwgGzC7mNr8B6frJH8o6dAlGPM,7157
-agentic_devtools/cli/ci/github_provider.py,sha256=KaD_Qv2vvTd1G9OWX8vPuBMdLJzIKxgYOGd6OKj8MKs,401742
+agentic_devtools/cli/ci/github_provider.py,sha256=wBTpgrrnnkIv6FZx0VemEgLnPnTzcqMS4TVkb3gBGh0,402056
 agentic_devtools/cli/ci/guards.py,sha256=ehy3urO_utrpBa2d5FsqwkJFnlWHG718a1uGhHFTF3c,56984
 agentic_devtools/cli/ci/job_logs.py,sha256=du0-DiNGNxyg2J5YwlFPJ0VW9Ib8eNcwzlia0RCd9SY,12810
 agentic_devtools/cli/ci/logging_config.py,sha256=Tw_h8LB709gbMd0WZMATLAPIJ1r_c_nE18Bi4bvldHA,2340
 agentic_devtools/cli/ci/models.py,sha256=jc7-j7T4plMvw6KuytASQTJwup-VBRgP3sKh3NY7RtY,20535
-agentic_devtools/cli/ci/provider.py,sha256=oUDYz4KvTvRfTQa6bDH4szjEPU2GHZAj25fx48Xr5QE,50012
+agentic_devtools/cli/ci/provider.py,sha256=ao5j7I0Oaxy7lslgQVscvxl904RmDBMhUPXSfsQXAPM,50260
 agentic_devtools/cli/ci/push_attribution.py,sha256=BcG5p1OAbdE_LrX8w7dKNHsXI2RchP4z5T6ObxOHfRI,4276
 agentic_devtools/cli/ci/repair_prompt.py,sha256=KnNyDRuTmDyDUP7M47FDPZeREmZMFlri8Yntkb38pEU,3241
 agentic_devtools/cli/ci/retry.py,sha256=z5LCO0vRHwvuc7k7fCY25uonq51EX3szQRq-3BXzOF4,8657
@@ -218,7 +218,7 @@ agentic_devtools/cli/ci/pipeline/exclusion.py,sha256=mrOG5G1-m3U-GM4YgtMTuzmoj02
 agentic_devtools/cli/ci/pipeline/gate_verdict.py,sha256=PGxb9Z540ki-i-tJAn-ezcISKHizR16hIXfnVbbZvMQ,44516
 agentic_devtools/cli/ci/pipeline/models.py,sha256=6YpK9_Ezoc4yIhqz4EZr3m32Mxd1f0NSNOoEK-_yJU4,3678
 agentic_devtools/cli/ci/pipeline/repair_attempts.py,sha256=K0L7AIu_Ob_bP-m7G5KDikJDxP9Jx4Z9vh5O5AFUBPw,9727
-agentic_devtools/cli/ci/pipeline/runner.py,sha256=-gnb8uFZQasACG602_NPS8ep7odGbPvzkfu2bhmL3A4,81212
+agentic_devtools/cli/ci/pipeline/runner.py,sha256=qV1ZziehdoHRSXQllIeet4mXVYU7fCAwbpkVN6WQRME,85540
 agentic_devtools/cli/ci/pipeline/session_detector.py,sha256=hXFoNW4J9pM1J_g5_7YXAeyol4PKGRIChzqHSZnxspM,15181
 agentic_devtools/cli/ci/pipeline/snapshot.py,sha256=Qc-H_ko6K2LgzoNVkZxMgHrJ6BoufPEl_616lDZfFhA,54137
 agentic_devtools/cli/ci/pipeline/suggestions.py,sha256=s2FB-y1gd73R3P_5X2CSQJfZPWO5QFU2jFGYB25ZZuY,26965
@@ -1160,8 +1160,8 @@ agentic_devtools/_bundled_skills/skills/speckit-plan/SKILL.md,sha256=qYLpzgLCIZ6
 agentic_devtools/_bundled_skills/skills/speckit-specify/SKILL.md,sha256=d9FkeZpBhQKt6aWUggtFA3Vqt4pZqYmTcSkfAANSPA8,11820
 agentic_devtools/_bundled_skills/skills/write-github-commit-message/SKILL.md,sha256=Ep1lR8NDN117Iytj172VZgqazFiLpJ56Z7RXgaTnxR8,2626
 agentic_devtools/_bundled_skills/skills/write-github-commit-message/commit-types.md,sha256=bTy_t68ZD6R87rFIzq9wybTu8Wudoahb7nB9IWC4bFo,1839
-agentic_devtools-0.2.548.dist-info/METADATA,sha256=93aYSeGPOHdZz_kryUoGCFNi20b-9jcIRBYN_SzaZ4I,35289
-agentic_devtools-0.2.548.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-agentic_devtools-0.2.548.dist-info/entry_points.txt,sha256=11ytXmK_Q96uiQI7p9UVP_UVcD_wSJDbfCbGK7IIQDA,13373
-agentic_devtools-0.2.548.dist-info/licenses/LICENSE,sha256=yBEDdICksxhBYLWoERKp9MTqwGnUF6Ryj9BTLwXTc6k,1082
-agentic_devtools-0.2.548.dist-info/RECORD,,
+agentic_devtools-0.2.549.dist-info/METADATA,sha256=SgAlcrdIYSb1HuV3wO4MPoLN8yQ02Fzn13rFGNZnOeM,35289
+agentic_devtools-0.2.549.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+agentic_devtools-0.2.549.dist-info/entry_points.txt,sha256=11ytXmK_Q96uiQI7p9UVP_UVcD_wSJDbfCbGK7IIQDA,13373
+agentic_devtools-0.2.549.dist-info/licenses/LICENSE,sha256=yBEDdICksxhBYLWoERKp9MTqwGnUF6Ryj9BTLwXTc6k,1082
+agentic_devtools-0.2.549.dist-info/RECORD,,